mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-23 04:04:38 +02:00
ammend on root node fixed
This commit is contained in:
parent
7ab6f26bef
commit
ba07683591
3 changed files with 20 additions and 3 deletions
|
@ -8,7 +8,7 @@ var CommandPromptView = Backbone.View.extend({
|
|||
this.commandCursor = this.$('#prompt span.cursor')[0];
|
||||
|
||||
// this is evil, but we will refer to HTML outside the document
|
||||
// and attach a click event listener
|
||||
// and attach a click event listener so we can focus / unfocus
|
||||
$(document).delegate('#commandLineHistory', 'click', _.bind(function() {
|
||||
this.focus();
|
||||
}, this));
|
||||
|
@ -18,7 +18,7 @@ var CommandPromptView = Backbone.View.extend({
|
|||
this.blur();
|
||||
}, this));
|
||||
|
||||
// hacky timeout focus
|
||||
// hacky timeout focus TODO
|
||||
setTimeout(_.bind(function() {
|
||||
this.focus();
|
||||
}, this), 100);
|
||||
|
|
|
@ -418,7 +418,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
|
|||
return commit;
|
||||
}
|
||||
|
||||
var pQueue = [].concat(commit.get('parents'));
|
||||
var pQueue = [].concat(commit.get('parents') || []);
|
||||
pQueue.sort(this.idSortFunc);
|
||||
numBack--;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue