Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified oncomplete so it returns the object it was tweening #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modified oncomplete so it returns the object it was tweening #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20988e
Modified oncomplete so it returns the object is was tweening
Edrem Mar 26, 2016
e4c0e41
Fixed oncomplete not returning an object with :after
Edrem Mar 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flux.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ local function makefsetter(field)
error("expected function or callable", 2)
end
local old = self[field]
self[field] = old and function() old() x() end or x
self[field] = old and function() old(self.obj) x() end or x
return self
end
end
Expand Down Expand Up @@ -167,7 +167,7 @@ function flux:update(deltatime)
if t._onupdate then t._onupdate() end
if p >= 1 then
flux.remove(self, i)
if t._oncomplete then t._oncomplete() end
if t._oncomplete then t._oncomplete(t.obj) end
end
end
end
Expand Down