codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-01 00:15:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-03 19:34:04 -08:00
commit 966307b758
4 changed files with 8 additions and 4 deletions

0
app/templates/modal/auth-modal-gplus-checklist.jade → app/templates/core/auth-modal-gplus-checklist.jade
View file

2
app/views/core/AuthModal.coffee
View file

@ -152,7 +152,7 @@ module.exports = class AuthModal extends ModalView
@renderGPlusAuthChecklist() @renderGPlusAuthChecklist()
renderGPlusAuthChecklist: -> renderGPlusAuthChecklist: ->
template = require 'templates/modal/auth-modal-gplus-checklist' template = require 'templates/core/auth-modal-gplus-checklist'
el = $(template({steps: @gplusAuthSteps})) el = $(template({steps: @gplusAuthSteps}))
el.i18n() el.i18n()
@$el.find('.modal-body:visible').empty().append(el) @$el.find('.modal-body:visible').empty().append(el)

6
app/views/play/WorldMapView.coffee
View file

@ -119,7 +119,8 @@ module.exports = class WorldMapView extends RootView
@render() @render()
@preloadTopHeroes() unless me.get('heroConfig')?.thangType @preloadTopHeroes() unless me.get('heroConfig')?.thangType
if @requiresSubscription if @requiresSubscription
_.delay (=> @openModalView? new SubscribeModal() unless window.currentModal), 2000 modal = if me.get('anonymous') then AuthModal else SubscribeModal
_.delay (=> @openModalView? new modal() unless window.currentModal), 2000
onSubscribed: -> onSubscribed: ->
@requiresSubscription = false @requiresSubscription = false
@ -205,7 +206,8 @@ module.exports = class WorldMapView extends RootView
@endHighlight() @endHighlight()
else else
if @requiresSubscription if @requiresSubscription
@openModalView new SubscribeModal() modal = if me.get('anonymous') then AuthModal else SubscribeModal
@openModalView new modal()
else if $(e.target).attr('disabled') else if $(e.target).attr('disabled')
Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer' Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer'
return return

4
app/views/play/level/LevelLoadingView.coffee
View file

@ -2,6 +2,7 @@ CocoView = require 'views/core/CocoView'
template = require 'templates/play/level/level_loading' template = require 'templates/play/level/level_loading'
utils = require 'core/utils' utils = require 'core/utils'
SubscribeModal = require 'views/play/modal/SubscribeModal' SubscribeModal = require 'views/play/modal/SubscribeModal'
AuthModal = require 'views/core/AuthModal'
module.exports = class LevelLoadingView extends CocoView module.exports = class LevelLoadingView extends CocoView
id: 'level-loading-view' id: 'level-loading-view'
@ -109,7 +110,8 @@ module.exports = class LevelLoadingView extends CocoView
@$el.find('.subscription-required').show() @$el.find('.subscription-required').show()
onClickStartSubscription: (e) -> onClickStartSubscription: (e) ->
@openModalView new SubscribeModal() modal = if me.get('anonymous') then AuthModal else SubscribeModal
@openModalView new modal()
onSubscribed: -> onSubscribed: ->
document.location.reload() document.location.reload()