From 6d58c928ae3e891efdefadeed6e873a7095e0193 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Mon, 18 Nov 2013 09:51:13 -0800 Subject: [PATCH] Revert "level compare sttings progress" This reverts commit 8d23d92456b840255261c69329df3f3515745f0b. --- src/js/level/builder.js | 36 ------------------------------------ todo.txt | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/src/js/level/builder.js b/src/js/level/builder.js index 66b7c0bf..69721c4b 100644 --- a/src/js/level/builder.js +++ b/src/js/level/builder.js @@ -53,7 +53,6 @@ var LevelBuilder = Level.extend({ this.startDialogObj = undefined; this.definedGoal = false; - this.compareLevelSettings = undefined; // we wont be using this stuff, and its to delete to ensure we overwrite all functions that // include that functionality @@ -281,34 +280,6 @@ var LevelBuilder = Level.extend({ }); } - if (this.compareLevelSettings === undefined) { - var askForCompare = Q.defer(); - chain = chain.then(function() { - return askForCompare.promise; - }); - - var askForCompareView = new ConfirmCancelTerminal({ - markdowns: [ - 'You havent specified compare settings, would you like to?' - ] - }); - askForCompareView.getPromise() - .then(_.bind(function() { - // oh boy this is complex - var whenEditedDialog = Q.defer(); - // the undefined here is the command that doesnt need resolving just yet... - this.editDialog(undefined, whenEditedDialog); - return whenEditedDialog.promise; - }, this)) - .fail(function() { - // default compare settings - }) - .done(function() { - askForCompare.resolve(); - }); - - } - if (this.startDialogObj === undefined) { var askForStartDeferred = Q.defer(); chain = chain.then(function() { @@ -358,13 +329,6 @@ var LevelBuilder = Level.extend({ if (this.startDialogObj) { compiledLevel.startDialog = {'en_US': this.startDialogObj}; } - - if (this.compareLevelSettings) { - // merge in the object - _.each(Object.keys(this.compareLevelSettings), function(key) { - compiledLevel[key] = this.compareLevelSettings[key]; - }); - } return compiledLevel; }, diff --git a/todo.txt b/todo.txt index 843af612..f4712147 100644 --- a/todo.txt +++ b/todo.txt @@ -4,6 +4,7 @@ Big Things Origin things: ~~~~~~~~~~~~~~~~~~~~~~~~~~ +[ ] polish visual layout?? needed? Medium things: ~~~~~~~~~~~~~~~~~~~~~~~~~~~