mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
shift some require() statements around, attempt to get things out of
app.coffee top-level scope - working towards mem leak fix
This commit is contained in:
parent
1c2cc06a6e
commit
584759bd25
4 changed files with 13 additions and 24 deletions
|
|
@ -1,6 +1,5 @@
|
|||
_ = require 'underscore'
|
||||
moment = require 'moment'
|
||||
#algos = require './algos'
|
||||
|
||||
###
|
||||
Loads JavaScript files from public/js/*
|
||||
|
|
|
|||
|
|
@ -12,17 +12,7 @@ i18n.localize app,
|
|||
availableLocales: ['en', 'he']
|
||||
defaultLocale: 'en'
|
||||
|
||||
# Custom requires
|
||||
character = require './character'
|
||||
tasks = require './tasks'
|
||||
scoring = require './scoring'
|
||||
helpers = require './helpers'
|
||||
browser = require './browser'
|
||||
party = require './party'
|
||||
items = require './items'
|
||||
profile = require './profile'
|
||||
pets = require './pets'
|
||||
|
||||
helpers.viewHelpers view
|
||||
|
||||
_ = require('underscore')
|
||||
|
|
@ -40,7 +30,7 @@ get '/', (page, model, params, next) ->
|
|||
#if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
|
||||
# return page.redirect 'https://' + req.headers.host + req.url
|
||||
|
||||
party.partySubscribe page, model, params, next, ->
|
||||
require('./party').partySubscribe page, model, params, next, ->
|
||||
user = model.at('_user')
|
||||
user.setNull('apiToken', derby.uuid())
|
||||
|
||||
|
|
@ -48,7 +38,7 @@ get '/', (page, model, params, next) ->
|
|||
tasks = user.get('tasks')
|
||||
_.each tasks, (task, key) -> user.del("tasks.#{key}") unless task?
|
||||
|
||||
items.server(model)
|
||||
require('./items').server(model)
|
||||
model.set '_view', _view
|
||||
|
||||
#refLists
|
||||
|
|
@ -66,15 +56,15 @@ ready (model) ->
|
|||
lastCron = user.get('lastCron')
|
||||
user.set('lastCron', +new Date) if (!lastCron? or lastCron == 'new')
|
||||
|
||||
scoring.cron(model)
|
||||
require('./scoring').cron(model)
|
||||
|
||||
character.app(exports, model)
|
||||
tasks.app(exports, model)
|
||||
items.app(exports, model)
|
||||
party.app(exports, model)
|
||||
profile.app(exports, model)
|
||||
pets.app(exports, model)
|
||||
require('./character').app(exports, model)
|
||||
require('./tasks').app(exports, model)
|
||||
require('./items').app(exports, model)
|
||||
require('./party').app(exports, model)
|
||||
require('./profile').app(exports, model)
|
||||
require('./pets').app(exports, model)
|
||||
require('../server/private').app(exports, model)
|
||||
require('./debug').app(exports, model) if model.get('_view.nodeEnv') != 'production'
|
||||
browser.app(exports, model, app)
|
||||
require('./browser').app(exports, model, app)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
_ = require('underscore')
|
||||
character = require './character'
|
||||
browser = require './browser'
|
||||
|
||||
partyUnsubscribe = (model, cb) ->
|
||||
if window?
|
||||
|
|
@ -69,6 +67,9 @@ module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb)
|
|||
return finished [partyQ, membersQ, selfQ], ['_party', '_partyMembers', '_user']
|
||||
|
||||
module.exports.app = (appExports, model) ->
|
||||
character = require './character'
|
||||
browser = require './browser'
|
||||
|
||||
user = model.at('_user')
|
||||
|
||||
user.on 'set', 'flags.partyEnabled', (captures, args) ->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
async = require 'async'
|
||||
moment = require 'moment'
|
||||
_ = require 'underscore'
|
||||
{ randomVal } = helpers = require './helpers'
|
||||
|
|
|
|||
Loading…
Reference in a new issue