mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Basic dialog intl support for level dialogs, Issue #42

Browse source
This commit is contained in:
Peter Cottle 2013-02-23 13:32:45 -08:00
parent 2837315c7d
commit 2617357460
21 changed files with 1716 additions and 1388 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/js/git/index.js
View file

@ -622,7 +622,7 @@ GitEngine.prototype.resolveID = function(idOrTarget) {
};
GitEngine.prototype.resolveRelativeRef = function(commit, relative) {
var regex = /([~^])(\d*)/g;
var regex = /([~\^])(\d*)/g;
var matches;
while (matches = regex.exec(relative)) {
@ -631,9 +631,8 @@ GitEngine.prototype.resolveRelativeRef = function(commit, relative) {
if (matches[1] == '^') {
next = commit.getParent(num-1);
}
else {
while(next && num--) {
} else {
while (next && num--) {
next = next.getParent(0);
}
}
@ -663,7 +662,7 @@ GitEngine.prototype.resolveStringRef = function(ref) {
// Attempt to split ref string into a reference and a string of ~ and ^ modifiers.
var startRef = null;
var relative = null;
var regex = /^([a-zA-Z0-9]+)(([~^]\d*)*)/;
var regex = /^([a-zA-Z0-9]+)(([~\^]\d*)*)/;
var matches = regex.exec(ref);
if (matches) {
startRef = matches[1];
@ -1661,10 +1660,11 @@ var Commit = Backbone.Model.extend({
},
getParent: function(parentNum) {
if (this && this.attributes && this.attributes.parents)
if (this && this.attributes && this.attributes.parents) {
return this.attributes.parents[parentNum];
else
} else {
return null;
}
},
isMainParent: function(parent) {