Merge branch 'master' into production

app/lib/scripts/ScriptModule.coffee

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

app/lib/surface/Dimmer.coffee

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

app/lib/surface/LankBoss.coffee

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

app/views/editor/modal/VersionsModal.coffee

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

app/views/ladder/LadderView.coffee

@@ -37,7 +37,7 @@ module.exports = class LadderView extends RootView
   constructor: (options, @levelID) ->
     super(options)
     @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 = []
 

app/views/play/level/LevelPlaybackView.coffee

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

app/views/play/level/tome/DocFormatter.coffee

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

app/views/play/level/tome/Spell.coffee

@@ -61,7 +61,7 @@ module.exports = class Spell
 
   setLanguage: (@language) ->
     #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.
     return unless @commentContext
     context = $.extend true, {}, @commentContext

package.json

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