codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-26 22:44:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-01-30 07:52:03 -08:00
commit 0594d138ee
9 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/scripts/ScriptModule.coffee
View file

@ -8,7 +8,7 @@ module.exports = class ScriptModule extends CocoClass
constructor: (@noteGroup) -> constructor: (@noteGroup) ->
super() super()
if not @noteGroup.prepared if not @noteGroup.prepared
@analyzeNoteGroup(noteGroup) @analyzeNoteGroup(@noteGroup)
@noteGroup.notes ?= [] @noteGroup.notes ?= []
@noteGroup.prepared = true @noteGroup.prepared = true

1
app/lib/surface/Dimmer.coffee
View file

@ -48,7 +48,6 @@ module.exports = class Dimmer extends CocoClass
@updateDimMask() if @on @updateDimMask() if @on
setSprites: (@sprites) -> setSprites: (@sprites) ->
console.log
dim: -> dim: ->
@on = true @on = true

2
app/lib/surface/LankBoss.coffee
View file

@ -35,7 +35,7 @@ module.exports = class LankBoss extends CocoClass
@camera = @options.camera @camera = @options.camera
@webGLStage = @options.webGLStage @webGLStage = @options.webGLStage
@surfaceTextLayer = @options.surfaceTextLayer @surfaceTextLayer = @options.surfaceTextLayer
@world = options.world @world = @options.world
@options.thangTypes ?= [] @options.thangTypes ?= []
@lanks = {} @lanks = {}
@lankArray = [] # Mirror @lanks, but faster for when we just need to iterate @lankArray = [] # Mirror @lanks, but faster for when we just need to iterate

3
app/views/editor/modal/VersionsModal.coffee
View file

@ -12,8 +12,7 @@ class VersionsViewCollection extends CocoCollection
initialize: (@url, @levelID, @model) -> initialize: (@url, @levelID, @model) ->
super() super()
@url = url + levelID + '/versions' @url = url + @levelID + '/versions'
@model = model
module.exports = class VersionsModal extends ModalView module.exports = class VersionsModal extends ModalView
template: template template: template

2
app/views/ladder/LadderView.coffee
View file

@ -37,7 +37,7 @@ module.exports = class LadderView extends RootView
constructor: (options, @levelID) -> constructor: (options, @levelID) ->
super(options) super(options)
@level = @supermodel.loadModel(new Level(_id: @levelID), 'level').model @level = @supermodel.loadModel(new Level(_id: @levelID), 'level').model
@sessions = @supermodel.loadCollection(new LevelSessionsCollection(levelID), 'your_sessions').model @sessions = @supermodel.loadCollection(new LevelSessionsCollection(@levelID), 'your_sessions').model
@teams = [] @teams = []

2
app/views/play/level/LevelPlaybackView.coffee
View file

@ -390,7 +390,7 @@ class HoverPopup extends $.fn.popover.Constructor
calculatedOffset = calculatedOffset =
top: pos.top - actualHeight top: pos.top - actualHeight
left: pos.left + pos.width / 2 - actualWidth / 2 left: pos.left + pos.width / 2 - actualWidth / 2
this.applyPlacement(calculatedOffset, 'top') @applyPlacement(calculatedOffset, 'top')
getPosition: -> getPosition: ->
top: @$element.offset().top top: @$element.offset().top

2
app/views/play/level/tome/DocFormatter.coffee
View file

@ -38,7 +38,7 @@ safeJSONStringify = (input, maxDepth) ->
module.exports = class DocFormatter module.exports = class DocFormatter
constructor: (@options) -> constructor: (@options) ->
@doc = _.cloneDeep options.doc @doc = _.cloneDeep @options.doc
@fillOutDoc() @fillOutDoc()
fillOutDoc: -> fillOutDoc: ->

2
app/views/play/level/tome/Spell.coffee
View file

@ -61,7 +61,7 @@ module.exports = class Spell
setLanguage: (@language) -> setLanguage: (@language) ->
#console.log 'setting language to', @language, 'so using original source', @languages[language] ? @languages.javascript #console.log 'setting language to', @language, 'so using original source', @languages[language] ? @languages.javascript
@originalSource = @languages[language] ? @languages.javascript @originalSource = @languages[@language] ? @languages.javascript
# Translate comments chosen spoken language. # Translate comments chosen spoken language.
return unless @commentContext return unless @commentContext
context = $.extend true, {}, @commentContext context = $.extend true, {}, @commentContext

2
package.json
View file

@ -52,7 +52,7 @@
"underscore.string": "2.3.x", "underscore.string": "2.3.x",
"async": "0.2.x", "async": "0.2.x",
"connect": "2.7.x", "connect": "2.7.x",
"coffee-script": "1.7.x", "coffee-script": "1.9.x",
"graceful-fs": "~2.0.1", "graceful-fs": "~2.0.1",
"node-force-domain": "~0.1.0", "node-force-domain": "~0.1.0",
"mailchimp-api": "2.0.x", "mailchimp-api": "2.0.x",