mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
more
This commit is contained in:
parent
a229bc2f41
commit
b566ebf6f6
6 changed files with 10 additions and 8 deletions
|
@ -12,7 +12,7 @@ var Command = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
validateAtInit: function() {
|
validateAtInit: function() {
|
||||||
if (!this.get('rawStr')) {
|
if (this.get('rawStr') === null) {
|
||||||
throw new Error('Give me a string!');
|
throw new Error('Give me a string!');
|
||||||
}
|
}
|
||||||
if (!this.get('createTime')) {
|
if (!this.get('createTime')) {
|
||||||
|
|
|
@ -70,10 +70,7 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
_.each(value.split(';'), _.bind(function(command) {
|
_.each(value.split(';'), _.bind(function(command) {
|
||||||
command = command.replace(/^(\s+)/, '');
|
command = command.replace(/^(\s+)/, '');
|
||||||
command = command.replace(/(\s+)$/, '');
|
command = command.replace(/(\s+)$/, '');
|
||||||
console.log('the command is', command);
|
this.addToCollection(command);
|
||||||
if (command.length) {
|
|
||||||
this.addToCollection(command);
|
|
||||||
}
|
|
||||||
}, this));
|
}, this));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,10 @@ GitEngine.prototype.init = function() {
|
||||||
this.commit();
|
this.commit();
|
||||||
|
|
||||||
// update tree
|
// update tree
|
||||||
events.trigger('treeRefresh');
|
// TODO make async, not async
|
||||||
|
setTimeout(function() {
|
||||||
|
events.trigger('treeRefresh');
|
||||||
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
GitEngine.prototype.getDetachedHead = function() {
|
GitEngine.prototype.getDetachedHead = function() {
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
Learn Git Branching
|
Learn Git Branching
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="terminal" class="box flex1 vertical">
|
<div id="terminal" class="box flex1 horizontal">
|
||||||
<div id="commandDisplay">
|
<div id="commandDisplay" class="box vertical flex1">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -247,5 +247,6 @@ p.commandLine span.prompt {
|
||||||
box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3) inset;
|
box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3) inset;
|
||||||
border: 1px solid #6287A4;
|
border: 1px solid #6287A4;
|
||||||
border-radius: 0 0 5px 5px;
|
border-radius: 0 0 5px 5px;
|
||||||
|
-webkit-box-align: start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,6 +129,7 @@ var VisEdge = Backbone.Model.extend({
|
||||||
genGraphics: function(paper) {
|
genGraphics: function(paper) {
|
||||||
var pathString = this.getBezierCurve();
|
var pathString = this.getBezierCurve();
|
||||||
var path = cutePath(paper, pathString);
|
var path = cutePath(paper, pathString);
|
||||||
|
path.toBack();
|
||||||
this.set('path', path);
|
this.set('path', path);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue