mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 17:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ok demo nice

Browse source
This commit is contained in:
Peter Cottle 2013-01-12 23:26:59 -08:00
parent 22605249ce
commit 4c837f7d92
4 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
build/bundle.js
View file

@ -6457,10 +6457,12 @@ var init = function() {
eventBaton.trigger(
'commandSubmitted',
[
"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 --noOutput; level rebase1 --noFinishDialog --noStartCommand;",
"show goal; delay 1000; hide goal; show solution --force --noReset;",
"git commit; git checkout -b bugFix C1; git commit; git merge master; git checkout master; git commit; git rebase bugFix;",
"delay 1000; reset;",
"level rebase1 --noFinishDialog --noStartCommand --noIntroDialog;",
"delay 2000; show goal; delay 1000; hide goal;",
"git checkout bugFix; git rebase master; git checkout side; git rebase bugFix;",
"git checkout another; git rebase side; git rebase another master;",
"help; levels"
].join(''));
});
@ -6588,7 +6590,7 @@ var Level = Sandbox.extend({
// if there is a multiview in the beginning, open that
// and let it resolve our deferred
if (this.level.startDialog) {
if (this.level.startDialog && !this.testOption('noIntroDialog')) {
new MultiView(_.extend(
{},
this.level.startDialog,
@ -18151,7 +18153,9 @@ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__di
'',
' * git commands (to interact with git)',
' * level commands (to get level hints or solutions)',
' * sandbox commands (like this one)'
' * sandbox commands (like this one)',
'',
'# This dialog is NOT FINISHED **TODO**'
]
}
}];
@ -18353,10 +18357,12 @@ var init = function() {
eventBaton.trigger(
'commandSubmitted',
[
"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 --noOutput; level rebase1 --noFinishDialog --noStartCommand;",
"show goal; delay 1000; hide goal; show solution --force --noReset;",
"git commit; git checkout -b bugFix C1; git commit; git merge master; git checkout master; git commit; git rebase bugFix;",
"delay 1000; reset;",
"level rebase1 --noFinishDialog --noStartCommand --noIntroDialog;",
"delay 2000; show goal; delay 1000; hide goal;",
"git checkout bugFix; git rebase master; git checkout side; git rebase bugFix;",
"git checkout another; git rebase side; git rebase another master;",
"help; levels"
].join(''));
});
@ -18471,7 +18477,9 @@ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__di
'',
' * git commands (to interact with git)',
' * level commands (to get level hints or solutions)',
' * sandbox commands (like this one)'
' * sandbox commands (like this one)',
'',
'# This dialog is NOT FINISHED **TODO**'
]
}
}];
@ -21306,7 +21314,7 @@ var Level = Sandbox.extend({
// if there is a multiview in the beginning, open that
// and let it resolve our deferred
if (this.level.startDialog) {
if (this.level.startDialog && !this.testOption('noIntroDialog')) {
new MultiView(_.extend(
{},
this.level.startDialog,

10
src/js/app/index.js
View file

@ -122,10 +122,12 @@ var init = function() {
eventBaton.trigger(
'commandSubmitted',
[
"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 --noOutput; level rebase1 --noFinishDialog --noStartCommand;",
"show goal; delay 1000; hide goal; show solution --force --noReset;",
"git commit; git checkout -b bugFix C1; git commit; git merge master; git checkout master; git commit; git rebase bugFix;",
"delay 1000; reset;",
"level rebase1 --noFinishDialog --noStartCommand --noIntroDialog;",
"delay 2000; show goal; delay 1000; hide goal;",
"git checkout bugFix; git rebase master; git checkout side; git rebase bugFix;",
"git checkout another; git rebase side; git rebase another master;",
"help; levels"
].join(''));
});

4
src/js/dialogs/sandbox.js
View file

@ -22,7 +22,9 @@ exports.dialog = [{
'',
' * git commands (to interact with git)',
' * level commands (to get level hints or solutions)',
' * sandbox commands (like this one)'
' * sandbox commands (like this one)',
'',
'# This dialog is NOT FINISHED **TODO**'
]
}
}];

2
src/js/level/index.js
View file

@ -59,7 +59,7 @@ var Level = Sandbox.extend({
// if there is a multiview in the beginning, open that
// and let it resolve our deferred
if (this.level.startDialog) {
if (this.level.startDialog && !this.testOption('noIntroDialog')) {
new MultiView(_.extend(
{},
this.level.startDialog,