Merge pull request #3168 from Imperadeiro98/use-view
Refactor to use view in template for issue #3138
This commit is contained in:
commit
8b00c38350
12 changed files with 16 additions and 50 deletions
app
templates
views
|
@ -2,7 +2,7 @@ extends /templates/core/modal-base
|
||||||
|
|
||||||
block modal-header-content
|
block modal-header-content
|
||||||
h3 Applicant Code for
|
h3 Applicant Code for
|
||||||
span.spl= session.get('levelName')
|
span.spl= view.session.get('levelName')
|
||||||
|
|
||||||
block modal-body-content
|
block modal-body-content
|
||||||
.level-session-code-view
|
.level-session-code-view
|
||||||
|
|
|
@ -7,10 +7,10 @@ block content
|
||||||
.center
|
.center
|
||||||
img(src="/images/pages/careers/recruiting.png")
|
img(src="/images/pages/careers/recruiting.png")
|
||||||
|
|
||||||
if position === 'software-engineer'
|
if view.position === 'software-engineer'
|
||||||
h1.center Software Engineer
|
h1.center Software Engineer
|
||||||
+company-blurb
|
+company-blurb
|
||||||
|
|
||||||
.big-side-margins
|
.big-side-margins
|
||||||
h3 Engineering at CodeCombat
|
h3 Engineering at CodeCombat
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ block content
|
||||||
h3 Upcoming Projects
|
h3 Upcoming Projects
|
||||||
|
|
||||||
.big-text
|
.big-text
|
||||||
p
|
p
|
||||||
strong iPad app
|
strong iPad app
|
||||||
div Bring the CodeCombat experience to the iPad
|
div Bring the CodeCombat experience to the iPad
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ block content
|
||||||
|
|
||||||
+next-steps
|
+next-steps
|
||||||
|
|
||||||
else if position === 'software-engineer-ios'
|
else if view.position === 'software-engineer-ios'
|
||||||
h1.center Software Engineer, iOS
|
h1.center Software Engineer, iOS
|
||||||
+company-blurb
|
+company-blurb
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ block content
|
||||||
|
|
||||||
+next-steps
|
+next-steps
|
||||||
|
|
||||||
else if position === 'game-designer'
|
else if view.position === 'game-designer'
|
||||||
h1.center Game Designer
|
h1.center Game Designer
|
||||||
+company-blurb
|
+company-blurb
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ block content
|
||||||
a(href="/careers/game-designer") Game Designer
|
a(href="/careers/game-designer") Game Designer
|
||||||
br
|
br
|
||||||
p Don't see a position that suits you, but still want to to contribute?
|
p Don't see a position that suits you, but still want to to contribute?
|
||||||
p
|
p
|
||||||
span.spr Please contact us at
|
span.spr Please contact us at
|
||||||
a(href="mailto:careers@codecombat.com") careers@codecombat.com
|
a(href="mailto:careers@codecombat.com") careers@codecombat.com
|
||||||
|
|
||||||
|
|
|
@ -4,14 +4,14 @@ block modal-header-content
|
||||||
h3 Save Changes to Campaign
|
h3 Save Changes to Campaign
|
||||||
|
|
||||||
block modal-body-content
|
block modal-body-content
|
||||||
if !modelsToSave.models.length
|
if !view.modelsToSave.models.length
|
||||||
.alert.alert-info(data-i18n="delta.no_changes") No changes
|
.alert.alert-info(data-i18n="delta.no_changes") No changes
|
||||||
|
|
||||||
for model in modelsToSave.models
|
for model in view.modelsToSave.models
|
||||||
.panel.panel-default
|
.panel.panel-default
|
||||||
.panel-heading
|
.panel-heading
|
||||||
span.panel-title.spr= model.get('name')
|
span.panel-title.spr= model.get('name')
|
||||||
span.text-muted= model.constructor.className
|
span.text-muted= model.constructor.className
|
||||||
.panel-body
|
.panel-body
|
||||||
.delta-view(data-model-id=model.id)
|
.delta-view(data-model-id=model.id)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
extends /templates/core/modal-base
|
extends /templates/core/modal-base
|
||||||
|
|
||||||
block modal-header-content
|
block modal-header-content
|
||||||
if nonUserCodeProblem
|
if view.options.nonUserCodeProblem
|
||||||
h3(data-i18n="play_level.non_user_code_problem_title") Unable to Load Level
|
h3(data-i18n="play_level.non_user_code_problem_title") Unable to Load Level
|
||||||
else
|
else
|
||||||
h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected
|
h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
h4
|
h4
|
||||||
span(data-i18n="play_level.tome_select_a_thang") Select Someone for
|
span.spr(data-i18n="play_level.tome_select_a_thang") Select Someone for
|
||||||
code #{spell.name}(#{(spell.parameters || []).join(", ")})
|
code #{view.spell.name}(#{(view.spell.parameters || []).join(", ")})
|
||||||
|
|
|
@ -7,8 +7,3 @@ module.exports = class CareersView extends RootView
|
||||||
|
|
||||||
constructor: (options, @position) ->
|
constructor: (options, @position) ->
|
||||||
super options
|
super options
|
||||||
|
|
||||||
getRenderData: ->
|
|
||||||
context = super()
|
|
||||||
context.position = @position
|
|
||||||
context
|
|
||||||
|
|
|
@ -13,11 +13,6 @@ module.exports = class SaveCampaignModal extends ModalView
|
||||||
constructor: (options, @modelsToSave) ->
|
constructor: (options, @modelsToSave) ->
|
||||||
super(options)
|
super(options)
|
||||||
|
|
||||||
getRenderData: ->
|
|
||||||
c = super()
|
|
||||||
c.modelsToSave = @modelsToSave
|
|
||||||
c
|
|
||||||
|
|
||||||
afterRender: ->
|
afterRender: ->
|
||||||
@$el.find('.delta-view').each((i, el) =>
|
@$el.find('.delta-view').each((i, el) =>
|
||||||
$el = $(el)
|
$el = $(el)
|
||||||
|
|
|
@ -9,8 +9,3 @@ module.exports = class InfiniteLoopModal extends ModalView
|
||||||
'click #restart-level-infinite-loop-retry-button': -> Backbone.Mediator.publish 'tome:cast-spell', {}
|
'click #restart-level-infinite-loop-retry-button': -> Backbone.Mediator.publish 'tome:cast-spell', {}
|
||||||
'click #restart-level-infinite-loop-confirm-button': -> Backbone.Mediator.publish 'level:restart', {}
|
'click #restart-level-infinite-loop-confirm-button': -> Backbone.Mediator.publish 'level:restart', {}
|
||||||
'click #restart-level-infinite-loop-comment-button': -> Backbone.Mediator.publish 'tome:comment-my-code', {}
|
'click #restart-level-infinite-loop-comment-button': -> Backbone.Mediator.publish 'tome:comment-my-code', {}
|
||||||
|
|
||||||
getRenderData: ->
|
|
||||||
c = super()
|
|
||||||
c.nonUserCodeProblem = @options.nonUserCodeProblem
|
|
||||||
c
|
|
||||||
|
|
|
@ -13,12 +13,6 @@ module.exports = class SpellListEntryThangsView extends CocoView
|
||||||
@spell = options.spell
|
@spell = options.spell
|
||||||
@avatars = []
|
@avatars = []
|
||||||
|
|
||||||
getRenderData: (context={}) ->
|
|
||||||
context = super context
|
|
||||||
context.thangs = @thangs
|
|
||||||
context.spell = @spell
|
|
||||||
context
|
|
||||||
|
|
||||||
afterRender: ->
|
afterRender: ->
|
||||||
super()
|
super()
|
||||||
avatar.destroy() for avatar in @avatars if @avatars
|
avatar.destroy() for avatar in @avatars if @avatars
|
||||||
|
|
|
@ -11,10 +11,6 @@ module.exports = class SaveLoadView extends CocoView
|
||||||
events:
|
events:
|
||||||
'change #save-granularity-toggle input': 'onSaveGranularityChanged'
|
'change #save-granularity-toggle input': 'onSaveGranularityChanged'
|
||||||
|
|
||||||
getRenderData: (context={}) ->
|
|
||||||
context = super(context)
|
|
||||||
context
|
|
||||||
|
|
||||||
afterRender: ->
|
afterRender: ->
|
||||||
super()
|
super()
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,6 @@ module.exports = class PlaySettingsModal extends ModalView
|
||||||
constructor: (options) ->
|
constructor: (options) ->
|
||||||
super options
|
super options
|
||||||
|
|
||||||
getRenderData: (context={}) ->
|
|
||||||
context = super(context)
|
|
||||||
context
|
|
||||||
|
|
||||||
afterRender: ->
|
afterRender: ->
|
||||||
super()
|
super()
|
||||||
return unless @supermodel.finished()
|
return unless @supermodel.finished()
|
||||||
|
|
|
@ -7,18 +7,13 @@ module.exports = class JobProfileCodeModal extends ModalView
|
||||||
template: template
|
template: template
|
||||||
modalWidthPercent: 90
|
modalWidthPercent: 90
|
||||||
plain: true
|
plain: true
|
||||||
|
|
||||||
constructor: (options) ->
|
constructor: (options) ->
|
||||||
super(arguments...)
|
super(arguments...)
|
||||||
@session = options.session
|
@session = options.session
|
||||||
|
|
||||||
getRenderData: ->
|
|
||||||
c = super()
|
|
||||||
c.session = @session
|
|
||||||
c
|
|
||||||
|
|
||||||
afterRender: ->
|
afterRender: ->
|
||||||
super()
|
super()
|
||||||
codeView = new LevelSessionCodeView({session:@session})
|
codeView = new LevelSessionCodeView({session:@session})
|
||||||
@insertSubView(codeView, @$el.find('.level-session-code-view'))
|
@insertSubView(codeView, @$el.find('.level-session-code-view'))
|
||||||
|
|
||||||
|
|
Reference in a new issue