mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-26 16:08:34 +02:00
i think its all there man major refactor
This commit is contained in:
parent
d497bea70c
commit
eb0458c299
3 changed files with 12 additions and 0 deletions
|
@ -11078,6 +11078,7 @@ var Command = Backbone.Model.extend({
|
||||||
Errors.filterError(err);
|
Errors.filterError(err);
|
||||||
// errorChanged() will handle status and all of that
|
// errorChanged() will handle status and all of that
|
||||||
this.set('error', err);
|
this.set('error', err);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.parseAll()) {
|
if (this.parseAll()) {
|
||||||
|
@ -11391,10 +11392,13 @@ ParseWaterfall.prototype.processAllInstants = function(commandStr) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
||||||
|
console.log('processing', commandStr, 'with', instantCommands);
|
||||||
_.each(instantCommands, function(tuple) {
|
_.each(instantCommands, function(tuple) {
|
||||||
var regex = tuple[0];
|
var regex = tuple[0];
|
||||||
|
console.log('the regex', regex);
|
||||||
var results = regex.exec(commandStr);
|
var results = regex.exec(commandStr);
|
||||||
if (results) {
|
if (results) {
|
||||||
|
console.log('results', results);
|
||||||
// this will throw a result
|
// this will throw a result
|
||||||
tuple[1](results);
|
tuple[1](results);
|
||||||
}
|
}
|
||||||
|
@ -16445,10 +16449,13 @@ ParseWaterfall.prototype.processAllInstants = function(commandStr) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
||||||
|
console.log('processing', commandStr, 'with', instantCommands);
|
||||||
_.each(instantCommands, function(tuple) {
|
_.each(instantCommands, function(tuple) {
|
||||||
var regex = tuple[0];
|
var regex = tuple[0];
|
||||||
|
console.log('the regex', regex);
|
||||||
var results = regex.exec(commandStr);
|
var results = regex.exec(commandStr);
|
||||||
if (results) {
|
if (results) {
|
||||||
|
console.log('results', results);
|
||||||
// this will throw a result
|
// this will throw a result
|
||||||
tuple[1](results);
|
tuple[1](results);
|
||||||
}
|
}
|
||||||
|
@ -16717,6 +16724,7 @@ var Command = Backbone.Model.extend({
|
||||||
Errors.filterError(err);
|
Errors.filterError(err);
|
||||||
// errorChanged() will handle status and all of that
|
// errorChanged() will handle status and all of that
|
||||||
this.set('error', err);
|
this.set('error', err);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.parseAll()) {
|
if (this.parseAll()) {
|
||||||
|
|
|
@ -43,10 +43,13 @@ ParseWaterfall.prototype.processAllInstants = function(commandStr) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
ParseWaterfall.prototype.processInstant = function(commandStr, instantCommands) {
|
||||||
|
console.log('processing', commandStr, 'with', instantCommands);
|
||||||
_.each(instantCommands, function(tuple) {
|
_.each(instantCommands, function(tuple) {
|
||||||
var regex = tuple[0];
|
var regex = tuple[0];
|
||||||
|
console.log('the regex', regex);
|
||||||
var results = regex.exec(commandStr);
|
var results = regex.exec(commandStr);
|
||||||
if (results) {
|
if (results) {
|
||||||
|
console.log('results', results);
|
||||||
// this will throw a result
|
// this will throw a result
|
||||||
tuple[1](results);
|
tuple[1](results);
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,6 +88,7 @@ var Command = Backbone.Model.extend({
|
||||||
Errors.filterError(err);
|
Errors.filterError(err);
|
||||||
// errorChanged() will handle status and all of that
|
// errorChanged() will handle status and all of that
|
||||||
this.set('error', err);
|
this.set('error', err);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.parseAll()) {
|
if (this.parseAll()) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue