mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 07:58:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tagSupport' Pull Request #137 Issue #134

Browse source 
Conflicts:
	src/js/git/index.js
This commit is contained in:
Peter Cottle 2013-10-27 12:37:48 -07:00
commit ebfd5e84d2
10 changed files with 647 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/visuals/visualization.js
View file

@ -5,6 +5,7 @@ var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone'
var Collections = require('../models/collections');
var CommitCollection = Collections.CommitCollection;
var BranchCollection = Collections.BranchCollection;
var TagCollection = Collections.TagCollection;
var EventBaton = require('../util/eventBaton').EventBaton;
var GitVisuals = require('../visuals').GitVisuals;
@ -43,10 +44,12 @@ var Visualization = Backbone.View.extend({
this.commitCollection = new CommitCollection();
this.branchCollection = new BranchCollection();
this.tagCollection = new TagCollection();
this.gitVisuals = new GitVisuals({
commitCollection: this.commitCollection,
branchCollection: this.branchCollection,
tagCollection: this.tagCollection,
paper: this.paper,
noClick: this.options.noClick,
isGoalVis: this.options.isGoalVis,
@ -58,6 +61,7 @@ var Visualization = Backbone.View.extend({
this.gitEngine = new GitEngine({
collection: this.commitCollection,
branches: this.branchCollection,
tags: this.tagCollection,
gitVisuals: this.gitVisuals,
eventBaton: this.eventBaton
});