mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 12:02:13 +00:00
just refresh page for now, view.render(model) borks <!--$id--> dom references (maybe need to clear somehow, but view.clear() isn't working as expected)
This commit is contained in:
parent
3325161092
commit
af7fa5633b
1 changed files with 13 additions and 14 deletions
|
|
@ -250,12 +250,11 @@ ready (model) ->
|
||||||
exports.revive = (e, el) ->
|
exports.revive = (e, el) ->
|
||||||
userObj = user.get()
|
userObj = user.get()
|
||||||
revive(userObj)
|
revive(userObj)
|
||||||
user.set 'stats', userObj.stats
|
user.set 'stats', userObj.stats, ->
|
||||||
user.set 'items', userObj.items
|
user.set 'items', userObj.items, ->
|
||||||
|
|
||||||
# Re-render (since we replaced objects en-masse, see https://github.com/lefnire/habitrpg/issues/80)
|
# Re-render (since we replaced objects en-masse, see https://github.com/lefnire/habitrpg/issues/80)
|
||||||
#view.render(model)
|
#view.render(model)
|
||||||
setTimeout (-> window.location.href = window.location.href), 0 # refresh - FIXME view.render() borks the dom
|
window.location.reload(true) # refresh - FIXME view.render() borks the dom
|
||||||
|
|
||||||
exports.reset = (e, el) ->
|
exports.reset = (e, el) ->
|
||||||
userObj = user.get()
|
userObj = user.get()
|
||||||
|
|
@ -266,12 +265,12 @@ ready (model) ->
|
||||||
revive(userObj)
|
revive(userObj)
|
||||||
|
|
||||||
# Set new user
|
# Set new user
|
||||||
model.set "users.#{userObj.id}", userObj
|
model.set "users.#{userObj.id}", userObj, ->
|
||||||
|
|
||||||
# Re-render (since we replaced objects en-masse, see https://github.com/lefnire/habitrpg/issues/80)
|
# Re-render (since we replaced objects en-masse, see https://github.com/lefnire/habitrpg/issues/80)
|
||||||
setupListReferences(model)
|
#setupListReferences(model)
|
||||||
#view.render(model)
|
#view.render(model)
|
||||||
setTimeout (-> window.location.href = window.location.href), 0 # refresh - FIXME view.render() borks the dom
|
window.location.reload(true) # refresh - FIXME view.render() borks the dom
|
||||||
|
|
||||||
exports.closeKickstarterNofitication = (e, el) ->
|
exports.closeKickstarterNofitication = (e, el) ->
|
||||||
user.set('notifications.kickstarter', 'hide')
|
user.set('notifications.kickstarter', 'hide')
|
||||||
|
|
@ -287,15 +286,15 @@ ready (model) ->
|
||||||
after = {hp:userObj.stats.hp, lastCron:userObj.lastCron}
|
after = {hp:userObj.stats.hp, lastCron:userObj.lastCron}
|
||||||
#userObj.stats.hp = before.hp
|
#userObj.stats.hp = before.hp
|
||||||
|
|
||||||
# Don't do anything if same day
|
# Don't do anything if same day or new user
|
||||||
return if before.lastCron == after.lastCron or !before.lastCron?
|
return if before.lastCron == after.lastCron or !before.lastCron?
|
||||||
|
|
||||||
#set necessary references
|
#set necessary references
|
||||||
model.set "users.#{userObj.id}", userObj, ->
|
model.set "users.#{userObj.id}", userObj, ->
|
||||||
#setupListReferences(model)
|
#setupListReferences(model)
|
||||||
view.render(model)
|
#view.render(model)
|
||||||
#setTimeout (-> user.set('stats.hp', after.hp)), 0 # animated
|
#setTimeout (-> user.set('stats.hp', after.hp)), 0 # animated
|
||||||
setTimeout (-> window.location.href = window.location.href), 1 # refresh - FIXME view.render() borks the dom
|
window.location.reload(true)
|
||||||
# browser.setupSortable(model)
|
# browser.setupSortable(model)
|
||||||
# browser.setupTooltips(model)
|
# browser.setupTooltips(model)
|
||||||
# browser.setupTour(model)
|
# browser.setupTour(model)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue