mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 03:52:14 +00:00
mass assignment on server #3
This commit is contained in:
parent
3c8d18e55e
commit
ef980102ba
3 changed files with 6 additions and 9 deletions
|
|
@ -35,7 +35,7 @@ get '/', (page, model, next) ->
|
|||
# support legacy Everyauth schema (now using derby-auth, Passport)
|
||||
if username = userObj.auth?.local?.username
|
||||
_view.loginName = username
|
||||
else if fb = userObj.auth.facebook
|
||||
else if fb = userObj.auth?.facebook
|
||||
_view.loginName = if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name
|
||||
|
||||
# Setup Item Store
|
||||
|
|
@ -50,10 +50,7 @@ get '/', (page, model, next) ->
|
|||
_.each ['habitIds','dailyIds','todoIds','rewardIds'], (path) ->
|
||||
unique = _.uniq userObj[path] #remove duplicates
|
||||
#remove empty grey tasks
|
||||
userObj[path] = _.filter(unique, (val) ->
|
||||
console.log {objId:val, taskIds:taskIds}
|
||||
_.contains(taskIds, val)
|
||||
)
|
||||
userObj[path] = _.filter(unique, (val) -> _.contains(taskIds, val))
|
||||
|
||||
# ========== Notifiations ==========
|
||||
unless userObj.notifications.kickstarter
|
||||
|
|
@ -97,7 +94,7 @@ ready (model) ->
|
|||
$('[rel=tooltip]').tooltip()
|
||||
$('[rel=popover]').popover()
|
||||
|
||||
unless (model.get('_mobileDevice') == true) #don't do sortable on mobile
|
||||
unless (model.get('_view.mobileDevice') == true) #don't do sortable on mobile
|
||||
# Make the lists draggable using jQuery UI
|
||||
# Note, have to setup helper function here and call it for each type later
|
||||
# due to variable binding of "type"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ module.exports = (model) ->
|
|||
# Load public/js/* files
|
||||
# TODO use Bower
|
||||
require '../../public/js/jquery.min'
|
||||
require '../../public/js/jquery-ui.min' unless model.get('_mobileDevice')
|
||||
require '../../public/js/jquery-ui.min' unless model.get('_view.mobileDevice')
|
||||
require '../../public/js/bootstrap.min' #http://twitter.github.com/bootstrap/assets/js/bootstrap.min.js
|
||||
require '../../public/js/jquery.cookie' #https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js
|
||||
require '../../public/js/bootstrap-tour' #https://raw.github.com/pushly/bootstrap-tour/master/bootstrap-tour.js
|
||||
|
|
@ -17,7 +17,7 @@ module.exports = (model) ->
|
|||
|
||||
# JS files not needed right away (google charts) or entirely optional (analytics)
|
||||
# Each file getsload asyncronously via $.getScript, so it doesn't bog page-load
|
||||
unless model.get('_mobileDevice')
|
||||
unless model.get('_view.mobileDevice')
|
||||
|
||||
# Addthis
|
||||
$.getScript "https://s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ model = undefined
|
|||
setModel = (m) ->
|
||||
model = m
|
||||
user = model.at('_user')
|
||||
setupNotifications() unless model.get('_mobileDevice')
|
||||
setupNotifications() unless model.get('_view.mobileDevice')
|
||||
|
||||
setupNotifications = ->
|
||||
return unless jQuery? # Only run this in the browser
|
||||
|
|
|
|||
Loading…
Reference in a new issue