mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-02-25 22:14:29 -05:00
Fixed #1428.
This commit is contained in:
parent
aa54cc32d1
commit
a284c8eb37
6 changed files with 30 additions and 12 deletions
|
@ -27,3 +27,6 @@
|
||||||
right: 0
|
right: 0
|
||||||
bottom: 0
|
bottom: 0
|
||||||
top: 0px
|
top: 0px
|
||||||
|
|
||||||
|
#patch-component-button
|
||||||
|
display: none
|
||||||
|
|
|
@ -27,3 +27,6 @@
|
||||||
right: 0
|
right: 0
|
||||||
bottom: 0
|
bottom: 0
|
||||||
top: 0px
|
top: 0px
|
||||||
|
|
||||||
|
#patch-system-button
|
||||||
|
display: none
|
||||||
|
|
|
@ -13,6 +13,10 @@ nav.navbar.navbar-default(role='navigation')
|
||||||
span.navbar-brand= editTitle
|
span.navbar-brand= editTitle
|
||||||
|
|
||||||
ul.nav.navbar-nav.navbar-right
|
ul.nav.navbar-nav.navbar-right
|
||||||
|
if !component.hasWriteAccess()
|
||||||
|
li#patch-component-button
|
||||||
|
a(data-i18n="[title]common.submit_patch")
|
||||||
|
span.glyphicon-floppy-disk.glyphicon
|
||||||
li.dropdown
|
li.dropdown
|
||||||
a(data-toggle='dropdown')
|
a(data-toggle='dropdown')
|
||||||
span.glyphicon-chevron-down.glyphicon
|
span.glyphicon-chevron-down.glyphicon
|
||||||
|
@ -27,10 +31,6 @@ nav.navbar.navbar-default(role='navigation')
|
||||||
span.unwatch.secret
|
span.unwatch.secret
|
||||||
span.glyphicon.glyphicon-eye-close
|
span.glyphicon.glyphicon-eye-close
|
||||||
span.spl Unwatch
|
span.spl Unwatch
|
||||||
|
|
||||||
if !component.hasWriteAccess()
|
|
||||||
li#patch-component-button
|
|
||||||
a(data-i18n="common.submit_patch") Submit Patch
|
|
||||||
if !me.get('anonymous')
|
if !me.get('anonymous')
|
||||||
li#create-new-component-button
|
li#create-new-component-button
|
||||||
a(data-i18n="editor.level_component_b_new") Create New Component
|
a(data-i18n="editor.level_component_b_new") Create New Component
|
||||||
|
|
|
@ -11,6 +11,10 @@ nav.navbar.navbar-default(role='navigation')
|
||||||
a(href="#system-patches" data-toggle="tab" data-i18n="resources.patches")#system-patches-tab Patches
|
a(href="#system-patches" data-toggle="tab" data-i18n="resources.patches")#system-patches-tab Patches
|
||||||
|
|
||||||
ul.nav.navbar-nav.navbar-right
|
ul.nav.navbar-nav.navbar-right
|
||||||
|
if !me.isAdmin()
|
||||||
|
li#patch-system-button
|
||||||
|
a(data-i18n="[title]common.submit_patch")
|
||||||
|
span.glyphicon-floppy-disk.glyphicon
|
||||||
li.dropdown
|
li.dropdown
|
||||||
a(data-toggle='dropdown')
|
a(data-toggle='dropdown')
|
||||||
span.glyphicon-chevron-down.glyphicon
|
span.glyphicon-chevron-down.glyphicon
|
||||||
|
@ -24,8 +28,6 @@ nav.navbar.navbar-default(role='navigation')
|
||||||
span.unwatch.secret
|
span.unwatch.secret
|
||||||
span.glyphicon.glyphicon-eye-close
|
span.glyphicon.glyphicon-eye-close
|
||||||
span.spl Unwatch
|
span.spl Unwatch
|
||||||
li#patch-system-button
|
|
||||||
a(data-i18n="common.submit_patch") Submit Patch
|
|
||||||
if me.isAdmin()
|
if me.isAdmin()
|
||||||
li#create-new-system
|
li#create-new-system
|
||||||
a(data-i18n="editor.level_system_btn_new") Create New System
|
a(data-i18n="editor.level_system_btn_new") Create New System
|
||||||
|
|
|
@ -42,6 +42,7 @@ module.exports = class LevelComponentEditView extends CocoView
|
||||||
@buildCodeEditor()
|
@buildCodeEditor()
|
||||||
@patchesView = @insertSubView(new PatchesView(@levelComponent), @$el.find('.patches-view'))
|
@patchesView = @insertSubView(new PatchesView(@levelComponent), @$el.find('.patches-view'))
|
||||||
@$el.find('#component-watch-button').find('> span').toggleClass('secret') if @levelComponent.watching()
|
@$el.find('#component-watch-button').find('> span').toggleClass('secret') if @levelComponent.watching()
|
||||||
|
@updatePatchButton()
|
||||||
|
|
||||||
buildSettingsTreema: ->
|
buildSettingsTreema: ->
|
||||||
data = _.pick @levelComponent.attributes, (value, key) => key in @editableSettings
|
data = _.pick @levelComponent.attributes, (value, key) => key in @editableSettings
|
||||||
|
@ -65,7 +66,7 @@ module.exports = class LevelComponentEditView extends CocoView
|
||||||
# Make sure it validates first?
|
# Make sure it validates first?
|
||||||
for key, value of @componentSettingsTreema.data
|
for key, value of @componentSettingsTreema.data
|
||||||
@levelComponent.set key, value unless key is 'js' # will compile code if needed
|
@levelComponent.set key, value unless key is 'js' # will compile code if needed
|
||||||
null
|
@updatePatchButton()
|
||||||
|
|
||||||
buildConfigSchemaTreema: ->
|
buildConfigSchemaTreema: ->
|
||||||
configSchema = @levelComponent.get 'configSchema'
|
configSchema = @levelComponent.get 'configSchema'
|
||||||
|
@ -91,6 +92,7 @@ module.exports = class LevelComponentEditView extends CocoView
|
||||||
|
|
||||||
onConfigSchemaEdited: =>
|
onConfigSchemaEdited: =>
|
||||||
@levelComponent.set 'configSchema', @configSchemaTreema.data
|
@levelComponent.set 'configSchema', @configSchemaTreema.data
|
||||||
|
@updatePatchButton()
|
||||||
|
|
||||||
buildCodeEditor: ->
|
buildCodeEditor: ->
|
||||||
@destroyAceEditor(@editor)
|
@destroyAceEditor(@editor)
|
||||||
|
@ -108,7 +110,10 @@ module.exports = class LevelComponentEditView extends CocoView
|
||||||
onEditorChange: =>
|
onEditorChange: =>
|
||||||
return if @destroyed
|
return if @destroyed
|
||||||
@levelComponent.set 'code', @editor.getValue()
|
@levelComponent.set 'code', @editor.getValue()
|
||||||
null
|
@updatePatchButton()
|
||||||
|
|
||||||
|
updatePatchButton: ->
|
||||||
|
@$el.find('#patch-component-button').toggle Boolean @levelComponent.hasLocalChanges()
|
||||||
|
|
||||||
endEditing: (e) ->
|
endEditing: (e) ->
|
||||||
Backbone.Mediator.publish 'editor:level-component-editing-ended', component: @levelComponent
|
Backbone.Mediator.publish 'editor:level-component-editing-ended', component: @levelComponent
|
||||||
|
|
|
@ -37,6 +37,7 @@ module.exports = class LevelSystemEditView extends CocoView
|
||||||
@buildConfigSchemaTreema()
|
@buildConfigSchemaTreema()
|
||||||
@buildCodeEditor()
|
@buildCodeEditor()
|
||||||
@patchesView = @insertSubView(new PatchesView(@levelSystem), @$el.find('.patches-view'))
|
@patchesView = @insertSubView(new PatchesView(@levelSystem), @$el.find('.patches-view'))
|
||||||
|
@updatePatchButton()
|
||||||
|
|
||||||
buildSettingsTreema: ->
|
buildSettingsTreema: ->
|
||||||
data = _.pick @levelSystem.attributes, (value, key) => key in @editableSettings
|
data = _.pick @levelSystem.attributes, (value, key) => key in @editableSettings
|
||||||
|
@ -59,7 +60,7 @@ module.exports = class LevelSystemEditView extends CocoView
|
||||||
# Make sure it validates first?
|
# Make sure it validates first?
|
||||||
for key, value of @systemSettingsTreema.data
|
for key, value of @systemSettingsTreema.data
|
||||||
@levelSystem.set key, value unless key is 'js' # will compile code if needed
|
@levelSystem.set key, value unless key is 'js' # will compile code if needed
|
||||||
null
|
@updatePatchButton()
|
||||||
|
|
||||||
buildConfigSchemaTreema: ->
|
buildConfigSchemaTreema: ->
|
||||||
treemaOptions =
|
treemaOptions =
|
||||||
|
@ -76,6 +77,7 @@ module.exports = class LevelSystemEditView extends CocoView
|
||||||
|
|
||||||
onConfigSchemaEdited: =>
|
onConfigSchemaEdited: =>
|
||||||
@levelSystem.set 'configSchema', @configSchemaTreema.data
|
@levelSystem.set 'configSchema', @configSchemaTreema.data
|
||||||
|
@updatePatchButton()
|
||||||
|
|
||||||
buildCodeEditor: ->
|
buildCodeEditor: ->
|
||||||
@destroyAceEditor(@editor)
|
@destroyAceEditor(@editor)
|
||||||
|
@ -92,7 +94,10 @@ module.exports = class LevelSystemEditView extends CocoView
|
||||||
|
|
||||||
onEditorChange: =>
|
onEditorChange: =>
|
||||||
@levelSystem.set 'code', @editor.getValue()
|
@levelSystem.set 'code', @editor.getValue()
|
||||||
null
|
@updatePatchButton()
|
||||||
|
|
||||||
|
updatePatchButton: ->
|
||||||
|
@$el.find('#patch-system-button').toggle Boolean @levelSystem.hasLocalChanges()
|
||||||
|
|
||||||
endEditing: (e) ->
|
endEditing: (e) ->
|
||||||
Backbone.Mediator.publish 'editor:level-system-editing-ended', system: @levelSystem
|
Backbone.Mediator.publish 'editor:level-system-editing-ended', system: @levelSystem
|
||||||
|
|
Loading…
Reference in a new issue