mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
now have visualization function
This commit is contained in:
parent
e8ac126f8f
commit
ca3c0f2b3f
2 changed files with 37 additions and 29 deletions
28
src/main.js
28
src/main.js
|
@ -31,35 +31,11 @@ $(document).ready(function(){
|
||||||
collection: commandCollection
|
collection: commandCollection
|
||||||
});
|
});
|
||||||
|
|
||||||
// make the canvas for us
|
|
||||||
Raphael(10, 10, 200, 200, function() {
|
|
||||||
paper = this;
|
|
||||||
|
|
||||||
// the two major collections that affect everything
|
|
||||||
var commitCollection = new CommitCollection();
|
|
||||||
var branchCollection = new BranchCollection();
|
|
||||||
|
|
||||||
gitVisuals = new GitVisuals({
|
|
||||||
commitCollection: commitCollection,
|
|
||||||
branchCollection: branchCollection
|
|
||||||
});
|
|
||||||
|
|
||||||
gitEngine = new GitEngine({
|
|
||||||
collection: commitCollection,
|
|
||||||
branches: branchCollection
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#commandTextField').focus();
|
$('#commandTextField').focus();
|
||||||
|
|
||||||
// needs to be called before raphael ready
|
var mainVis = new Visualization();
|
||||||
windowResize();
|
|
||||||
events.trigger('raphaelReady');
|
|
||||||
});
|
|
||||||
|
|
||||||
$(window).resize(windowResize);
|
|
||||||
windowResize();
|
|
||||||
setTimeout(windowResize, 50);
|
|
||||||
|
|
||||||
|
// make the canvas for us
|
||||||
if (/\?demo/.test(window.location.href)) {
|
if (/\?demo/.test(window.location.href)) {
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase master; git checkout master; gc; gc; git merge bugFix");
|
events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase master; git checkout master; gc; gc; git merge bugFix");
|
||||||
|
|
|
@ -1,3 +1,35 @@
|
||||||
|
function Visualization(options) {
|
||||||
|
|
||||||
|
var _this = this;
|
||||||
|
Raphael(10, 10, 200, 200, function() {
|
||||||
|
// for some reason raphael calls this function with a predefined
|
||||||
|
// context...
|
||||||
|
// so switch it
|
||||||
|
paper = this;
|
||||||
|
_this.initialize(this);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Visualization.prototype.initialize = function(paper, options) {
|
||||||
|
this.commitCollection = new CommitCollection();
|
||||||
|
this.branchCollection = new BranchCollection();
|
||||||
|
|
||||||
|
gitVisuals = new GitVisuals({
|
||||||
|
commitCollection: this.commitCollection,
|
||||||
|
branchCollection: this.branchCollection
|
||||||
|
});
|
||||||
|
|
||||||
|
gitEngine = new GitEngine({
|
||||||
|
collection: this.commitCollection,
|
||||||
|
branches: this.branchCollection
|
||||||
|
});
|
||||||
|
|
||||||
|
// needs to be called before raphael ready
|
||||||
|
windowResize();
|
||||||
|
events.trigger('raphaelReady');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function GitVisuals(options) {
|
function GitVisuals(options) {
|
||||||
this.commitCollection = options.commitCollection;
|
this.commitCollection = options.commitCollection;
|
||||||
this.branchCollection = options.branchCollection;
|
this.branchCollection = options.branchCollection;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue