From 67817f0cdbbc78c66005e3ba1117fddbc685b7b6 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Fri, 11 Jan 2013 12:40:25 -0800 Subject: [PATCH] delay update --- build/bundle.js | 4 ++-- src/js/app/index.js | 2 +- todo.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/bundle.js b/build/bundle.js index 771db91c..9ef47fdb 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -6457,7 +6457,7 @@ var init = function() { [ "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;", - "git merge bugFix; levels; level rebase1; show goal; delay 3000;", + "git merge bugFix; levels; level rebase1; show goal; delay 1000;", "git checkout -b win; git commit; help" ].join('')); }); @@ -17677,7 +17677,7 @@ var init = function() { [ "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;", - "git merge bugFix; levels; level rebase1; show goal; delay 3000;", + "git merge bugFix; levels; level rebase1; show goal; delay 1000;", "git checkout -b win; git commit; help" ].join('')); }); diff --git a/src/js/app/index.js b/src/js/app/index.js index f47ccd93..44be4e08 100644 --- a/src/js/app/index.js +++ b/src/js/app/index.js @@ -124,7 +124,7 @@ var init = function() { [ "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;", - "git merge bugFix; levels; level rebase1; show goal; delay 3000;", + "git merge bugFix; levels; level rebase1; show goal; delay 1000;", "git checkout -b win; git commit; help" ].join('')); }); diff --git a/todo.txt b/todo.txt index 3c0dbf9e..2a9b82dc 100644 --- a/todo.txt +++ b/todo.txt @@ -28,6 +28,7 @@ Ideas for cleaning Done things: (I only started this on Dec 17th 2012 to get a better sense of what was done) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +[x] optimistic parsing of level and level builder commands, man that was toughwith circular imports [x] edit dialog [x] level builder dialog builder [x] level builder dialog tester