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

fixed error parsing issue

Browse source
This commit is contained in:
Peter Cottle 2012-09-22 15:56:56 -07:00
parent 51bed71e1b
commit 543f5986ae
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/commandModel.js
View file

@ -31,11 +31,9 @@ var Command = Backbone.Model.extend({
this.parse(); this.parse();
} catch (err) { } catch (err) {
if (err instanceof CommandProcessError || if (err instanceof CommandProcessError ||
err instanceof GitError) { err instanceof GitError ||
this.set('status', 'error'); err instanceof CommandResult) {
this.set('error', err); // erroChanged() will handle status and all of that
} else if (err instanceof CommandResult) {
this.set('status', 'finished');
this.set('error', err); this.set('error', err);
} else { } else {
throw err; throw err;
@ -44,13 +42,17 @@ var Command = Backbone.Model.extend({
}, },
errorChanged: function(model, err) { errorChanged: function(model, err) {
this.set('err', err); if (err instanceof CommandProcessError ||
this.set('status', 'error'); err instanceof GitError) {
this.set('status', 'error');
} else if (err instanceof CommandResult) {
this.set('status', 'finished');
}
this.formatError(); this.formatError();
}, },
formatError: function() { formatError: function() {
this.set('result', this.get('err').toResult()); this.set('result', this.get('error').toResult());
}, },
getShortcutMap: function() { getShortcutMap: function() {

1
src/commandViews.js
View file

@ -143,6 +143,7 @@ var CommandView = Backbone.View.extend({
}, },
this.model.toJSON() this.model.toJSON()
); );
console.log('rendering', this.model.toJSON());
this.$el.html(this.template(json)); this.$el.html(this.template(json));
return this; return this;

6
todo.txt
View file

@ -1,3 +1,9 @@
SAFE calling on tree animation -- so it will update when necessary (AnimationArbiter class) SAFE calling on tree animation -- so it will update when necessary (AnimationArbiter class)
Real refs -- by putting in labels and background box and everything. also highlight with head
The Tree.Snapshot() idea
closures on animations
you name it!