diff --git a/build/bundle.js b/build/bundle.js index dfd4e226..e244a02c 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -6440,7 +6440,7 @@ var Level = Sandbox.extend({ this.initGoalData(options); this.initName(options); - Sandbox.prototype.initialize.apply(this, [options]); + Level.__super__.initialize.apply(this, [options]); this.startOffCommand(); }, @@ -6472,13 +6472,13 @@ var Level = Sandbox.extend({ takeControl: function() { Main.getEventBaton().stealBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.takeControl.apply(this); + Level.__super__.takeControl.apply(this); }, releaseControl: function() { Main.getEventBaton().releaseBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.releaseControl.apply(this); + Level.__super__.releaseControl.apply(this); }, startOffCommand: function() { @@ -6737,7 +6737,7 @@ var Level = Sandbox.extend({ reset: function() { this.gitCommandsIssued = 0; this.solved = false; - Sandbox.prototype.reset.apply(this, arguments); + Level.__super__.reset.apply(this, arguments); }, startLevel: function(command, deferred) { @@ -9875,7 +9875,7 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({ markdowns: markdowns }; - ConfirmCancelTerminal.prototype.initialize.apply(this, [options]); + NextLevelConfirm.__super__.initialize.apply(this, [options]); } }); @@ -18355,7 +18355,7 @@ var Level = Sandbox.extend({ this.initGoalData(options); this.initName(options); - Sandbox.prototype.initialize.apply(this, [options]); + Level.__super__.initialize.apply(this, [options]); this.startOffCommand(); }, @@ -18387,13 +18387,13 @@ var Level = Sandbox.extend({ takeControl: function() { Main.getEventBaton().stealBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.takeControl.apply(this); + Level.__super__.takeControl.apply(this); }, releaseControl: function() { Main.getEventBaton().releaseBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.releaseControl.apply(this); + Level.__super__.releaseControl.apply(this); }, startOffCommand: function() { @@ -18652,7 +18652,7 @@ var Level = Sandbox.extend({ reset: function() { this.gitCommandsIssued = 0; this.solved = false; - Sandbox.prototype.reset.apply(this, arguments); + Level.__super__.reset.apply(this, arguments); }, startLevel: function(command, deferred) { @@ -20588,7 +20588,7 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({ markdowns: markdowns }; - ConfirmCancelTerminal.prototype.initialize.apply(this, [options]); + NextLevelConfirm.__super__.initialize.apply(this, [options]); } }); diff --git a/src/js/level/index.js b/src/js/level/index.js index 44f59784..435e067e 100644 --- a/src/js/level/index.js +++ b/src/js/level/index.js @@ -40,7 +40,7 @@ var Level = Sandbox.extend({ this.initGoalData(options); this.initName(options); - Sandbox.prototype.initialize.apply(this, [options]); + Level.__super__.initialize.apply(this, [options]); this.startOffCommand(); }, @@ -72,13 +72,13 @@ var Level = Sandbox.extend({ takeControl: function() { Main.getEventBaton().stealBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.takeControl.apply(this); + Level.__super__.takeControl.apply(this); }, releaseControl: function() { Main.getEventBaton().releaseBaton('processLevelCommand', this.processLevelCommand, this); - Sandbox.prototype.releaseControl.apply(this); + Level.__super__.releaseControl.apply(this); }, startOffCommand: function() { @@ -337,7 +337,7 @@ var Level = Sandbox.extend({ reset: function() { this.gitCommandsIssued = 0; this.solved = false; - Sandbox.prototype.reset.apply(this, arguments); + Level.__super__.reset.apply(this, arguments); }, startLevel: function(command, deferred) { diff --git a/src/js/views/index.js b/src/js/views/index.js index 668d1e80..6c3de14b 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -386,7 +386,7 @@ var NextLevelConfirm = ConfirmCancelTerminal.extend({ markdowns: markdowns }; - ConfirmCancelTerminal.prototype.initialize.apply(this, [options]); + NextLevelConfirm.__super__.initialize.apply(this, [options]); } }); diff --git a/todo.txt b/todo.txt index 6487638c..1146e399 100644 --- a/todo.txt +++ b/todo.txt @@ -1,10 +1,9 @@ Big Things ~~~~~~~~~~~~~~~~~~~~~~~~~ [ ] levels dropdown selection? -[ ] git demonstration view +[ ] git demonstration view -- shouldnt be too bad [ ] level builder? :OOO -[ ] rebase bug... ugh Medium things: ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -22,6 +21,7 @@ Minor Bugs to fix: Big Bugs to fix: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +[ ] rebase bug... ugh /************************************* ** Publish Things **