mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-28 00:40:07 +02:00
removed all globals in git.js
This commit is contained in:
parent
b31d550184
commit
4e9e48ab4b
1 changed files with 9 additions and 7 deletions
16
src/git.js
16
src/git.js
|
@ -15,7 +15,6 @@ function GitEngine(options) {
|
||||||
this.commitCollection = options.collection;
|
this.commitCollection = options.collection;
|
||||||
|
|
||||||
this.gitVisuals = options.gitVisuals;
|
this.gitVisuals = options.gitVisuals;
|
||||||
console.log('git visuals is', this.gitVisuals);
|
|
||||||
|
|
||||||
// global variable to keep track of the options given
|
// global variable to keep track of the options given
|
||||||
// along with the command call.
|
// along with the command call.
|
||||||
|
@ -203,7 +202,8 @@ GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
|
||||||
var commit = new Commit(_.extend(
|
var commit = new Commit(_.extend(
|
||||||
commitJSON,
|
commitJSON,
|
||||||
{
|
{
|
||||||
parents: parentObjs
|
parents: parentObjs,
|
||||||
|
gitVisuals: this.gitVisuals
|
||||||
}
|
}
|
||||||
));
|
));
|
||||||
createdSoFar[objID] = commit;
|
createdSoFar[objID] = commit;
|
||||||
|
@ -314,7 +314,8 @@ GitEngine.prototype.makeCommit = function(parents, id, options) {
|
||||||
|
|
||||||
var commit = new Commit(_.extend({
|
var commit = new Commit(_.extend({
|
||||||
parents: parents,
|
parents: parents,
|
||||||
id: id
|
id: id,
|
||||||
|
gitVisuals: this.gitVisuals
|
||||||
},
|
},
|
||||||
options || {}
|
options || {}
|
||||||
));
|
));
|
||||||
|
@ -1445,7 +1446,8 @@ var Commit = Backbone.Model.extend({
|
||||||
author: 'Peter Cottle',
|
author: 'Peter Cottle',
|
||||||
createTime: null,
|
createTime: null,
|
||||||
commitMessage: null,
|
commitMessage: null,
|
||||||
visNode: null
|
visNode: null,
|
||||||
|
gitVisuals: null
|
||||||
},
|
},
|
||||||
|
|
||||||
getLogEntry: function() {
|
getLogEntry: function() {
|
||||||
|
@ -1498,12 +1500,12 @@ var Commit = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
addNodeToVisuals: function() {
|
addNodeToVisuals: function() {
|
||||||
var visNode = gitVisuals.addNode(this.get('id'), this);
|
var visNode = this.get('gitVisuals').addNode(this.get('id'), this);
|
||||||
this.set('visNode', visNode);
|
this.set('visNode', visNode);
|
||||||
},
|
},
|
||||||
|
|
||||||
addEdgeToVisuals: function(parent) {
|
addEdgeToVisuals: function(parent) {
|
||||||
gitVisuals.addEdge(this.get('id'), parent.get('id'));
|
this.get('gitVisuals').addEdge(this.get('id'), parent.get('id'));
|
||||||
},
|
},
|
||||||
|
|
||||||
isMainParent: function(parent) {
|
isMainParent: function(parent) {
|
||||||
|
@ -1511,7 +1513,7 @@ var Commit = Backbone.Model.extend({
|
||||||
return index === 0;
|
return index === 0;
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize: function() {
|
initialize: function(options) {
|
||||||
this.validateAtInit();
|
this.validateAtInit();
|
||||||
this.addNodeToVisuals();
|
this.addNodeToVisuals();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue