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

git log now done, fixed up result rendering

Browse source
This commit is contained in:
Peter Cottle 2012-09-22 21:16:59 -07:00
parent 543f5986ae
commit 9c7ec69e2f
10 changed files with 189 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/commandViews.js
View file

@ -139,11 +139,11 @@ var CommandView = Backbone.View.extend({
var json = _.extend(
{
resultType: '',
result: ''
result: '',
warnings: ''
},
this.model.toJSON()
);
console.log('rendering', this.model.toJSON());
this.$el.html(this.template(json));
return this;
@ -164,6 +164,22 @@ var CommandLineHistoryView = Backbone.View.extend({
this.collection.on('all', this.render, this);
this.collection.on('change', this.scrollDown, this);
events.on('issueWarning', this.addWarning, this);
},
addWarning: function(msg) {
console.log('here', arguments);
var err = new Warning({
msg: msg
});
var command = new Command({
error: err,
rawStr: 'Warning:'
});
this.collection.add(command);
},
scrollDown: function() {