Fixed the loading screen in the new site-chrome. As a result, found and removed all the extraneous loading logic from MainAccountView.

This commit is contained in:
Scott Erickson 2014-11-25 11:06:34 -08:00
parent 2a135eeaf1
commit b27ac94382
3 changed files with 5 additions and 36 deletions

View file

@ -75,6 +75,7 @@ a
.progress
width: 50%
margin: 0 25%
margin-bottom: 20px
// all loading screens
.loading-container

View file

@ -1,38 +1,6 @@
View = require 'views/kinds/RootView'
RootView = require 'views/kinds/RootView'
template = require 'templates/account/main-account-view'
{me} = require 'lib/auth'
User = require 'models/User'
AuthModalView = require 'views/modal/AuthModal'
RecentlyPlayedCollection = require 'collections/RecentlyPlayedCollection'
ThangType = require 'models/ThangType'
module.exports = class MainAccountView extends View
module.exports = class MainAccountView extends RootView
id: 'main-account-view'
template: template
constructor: (options) ->
super options
return unless me
@wizardType = ThangType.loadUniversalWizard()
@recentlyPlayed = new RecentlyPlayedCollection me.get('_id')
@supermodel.loadModel @wizardType, 'thang'
@supermodel.loadCollection @recentlyPlayed, 'recentlyPlayed'
onLoaded: ->
super()
getRenderData: ->
c = super()
c.subs = {}
enabledEmails = c.me.getEnabledEmails()
c.subs[sub] = 1 for sub in enabledEmails
c.hasEmailNotes = _.any enabledEmails, (sub) -> sub.contains 'Notes'
c.hasEmailNews = _.any enabledEmails, (sub) -> sub.contains('News') and sub isnt 'generalNews'
c.hasGeneralNews = 'generalNews' in enabledEmails
c.wizardSource = @wizardType.getPortraitSource colorConfig: me.get('wizard')?.colorConfig if @wizardType.loaded
c.recentlyPlayed = @recentlyPlayed.models
c
afterRender: ->
super()
@openModalView new AuthModalView if me.isAnonymous()

View file

@ -76,7 +76,7 @@ module.exports = class RootView extends CocoView
@openModalView new ModalClass {}
showLoading: ($el) ->
$el ?= @$el.find('.main-content-area')
$el ?= @$el.find('#site-content-area')
super($el)
afterInsert: ->