mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 00:18:56 +02:00
Sweet, fixed tests
This commit is contained in:
parent
05fdff72f5
commit
d9050fd854
7 changed files with 31 additions and 9 deletions
|
@ -6585,7 +6585,10 @@ var init = function() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$(document).ready(init);
|
if (require('../util').isBrowser()) {
|
||||||
|
// this file gets included via node sometimes as well
|
||||||
|
$(document).ready(init);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* the UI method simply bootstraps the command buffer and
|
* the UI method simply bootstraps the command buffer and
|
||||||
|
@ -13128,6 +13131,12 @@ var ParseWaterfall = function(options) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.initParseWaterfall = function() {
|
ParseWaterfall.prototype.initParseWaterfall = function() {
|
||||||
|
// check for node when testing
|
||||||
|
if (!require('../util').isBrowser()) {
|
||||||
|
this.parseWaterfall = [GitCommands.parse];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// by deferring the initialization here, we dont require()
|
// by deferring the initialization here, we dont require()
|
||||||
// level too early (which barfs our init)
|
// level too early (which barfs our init)
|
||||||
this.parseWaterfall = this.options.parseWaterfall || [
|
this.parseWaterfall = this.options.parseWaterfall || [
|
||||||
|
@ -18413,7 +18422,6 @@ HeadlessGit.prototype.sendCommand = function(value) {
|
||||||
var commandObj = new Command({
|
var commandObj = new Command({
|
||||||
rawStr: commandStr
|
rawStr: commandStr
|
||||||
});
|
});
|
||||||
console.log('dispatching command "', commandStr, '"');
|
|
||||||
this.gitEngine.dispatch(commandObj, Q.defer());
|
this.gitEngine.dispatch(commandObj, Q.defer());
|
||||||
}, this);
|
}, this);
|
||||||
};
|
};
|
||||||
|
@ -18571,7 +18579,10 @@ var init = function() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$(document).ready(init);
|
if (require('../util').isBrowser()) {
|
||||||
|
// this file gets included via node sometimes as well
|
||||||
|
$(document).ready(init);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* the UI method simply bootstraps the command buffer and
|
* the UI method simply bootstraps the command buffer and
|
||||||
|
@ -19012,7 +19023,6 @@ HeadlessGit.prototype.sendCommand = function(value) {
|
||||||
var commandObj = new Command({
|
var commandObj = new Command({
|
||||||
rawStr: commandStr
|
rawStr: commandStr
|
||||||
});
|
});
|
||||||
console.log('dispatching command "', commandStr, '"');
|
|
||||||
this.gitEngine.dispatch(commandObj, Q.defer());
|
this.gitEngine.dispatch(commandObj, Q.defer());
|
||||||
}, this);
|
}, this);
|
||||||
};
|
};
|
||||||
|
@ -21946,6 +21956,12 @@ var ParseWaterfall = function(options) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.initParseWaterfall = function() {
|
ParseWaterfall.prototype.initParseWaterfall = function() {
|
||||||
|
// check for node when testing
|
||||||
|
if (!require('../util').isBrowser()) {
|
||||||
|
this.parseWaterfall = [GitCommands.parse];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// by deferring the initialization here, we dont require()
|
// by deferring the initialization here, we dont require()
|
||||||
// level too early (which barfs our init)
|
// level too early (which barfs our init)
|
||||||
this.parseWaterfall = this.options.parseWaterfall || [
|
this.parseWaterfall = this.options.parseWaterfall || [
|
||||||
|
|
File diff suppressed because one or more lines are too long
1
build/bundle.min.js
vendored
1
build/bundle.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -402,7 +402,7 @@
|
||||||
For a much easier time perusing the source, see the individual files at:
|
For a much easier time perusing the source, see the individual files at:
|
||||||
https://github.com/pcottle/learnGitBranching
|
https://github.com/pcottle/learnGitBranching
|
||||||
-->
|
-->
|
||||||
<script src="build/bundle.min.2b25eb25.js"></script>
|
<script src="build/bundle.js"></script>
|
||||||
|
|
||||||
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
|
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
|
||||||
The downside? No raw logs to parse for analytics, so I have to include
|
The downside? No raw logs to parse for analytics, so I have to include
|
||||||
|
|
|
@ -146,7 +146,10 @@ var init = function() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
$(document).ready(init);
|
if (require('../util').isBrowser()) {
|
||||||
|
// this file gets included via node sometimes as well
|
||||||
|
$(document).ready(init);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* the UI method simply bootstraps the command buffer and
|
* the UI method simply bootstraps the command buffer and
|
||||||
|
|
|
@ -45,7 +45,6 @@ HeadlessGit.prototype.sendCommand = function(value) {
|
||||||
var commandObj = new Command({
|
var commandObj = new Command({
|
||||||
rawStr: commandStr
|
rawStr: commandStr
|
||||||
});
|
});
|
||||||
console.log('dispatching command "', commandStr, '"');
|
|
||||||
this.gitEngine.dispatch(commandObj, Q.defer());
|
this.gitEngine.dispatch(commandObj, Q.defer());
|
||||||
}, this);
|
}, this);
|
||||||
};
|
};
|
||||||
|
|
|
@ -20,6 +20,12 @@ var ParseWaterfall = function(options) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.initParseWaterfall = function() {
|
ParseWaterfall.prototype.initParseWaterfall = function() {
|
||||||
|
// check for node when testing
|
||||||
|
if (!require('../util').isBrowser()) {
|
||||||
|
this.parseWaterfall = [GitCommands.parse];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// by deferring the initialization here, we dont require()
|
// by deferring the initialization here, we dont require()
|
||||||
// level too early (which barfs our init)
|
// level too early (which barfs our init)
|
||||||
this.parseWaterfall = this.options.parseWaterfall || [
|
this.parseWaterfall = this.options.parseWaterfall || [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue