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

ok now it blocks on raphael load

Browse source
This commit is contained in:
Peter Cottle 2012-11-03 13:06:18 -07:00
parent 44322298ba
commit e8ac126f8f
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.js
View file

@ -13,12 +13,9 @@ var animationFactory = null;
var paper = null; var paper = null;
$(document).ready(function(){ $(document).ready(function(){
// static classes
animationFactory = new AnimationFactory(); animationFactory = new AnimationFactory();
// the two major collections that affect everything
var commitCollection = new CommitCollection();
commandCollection = new CommandCollection(); commandCollection = new CommandCollection();
var branchCollection = new BranchCollection();
commandBuffer = new CommandBuffer({ commandBuffer = new CommandBuffer({
collection: commandCollection collection: commandCollection
@ -34,6 +31,14 @@ $(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({ gitVisuals = new GitVisuals({
commitCollection: commitCollection, commitCollection: commitCollection,
branchCollection: branchCollection branchCollection: branchCollection
@ -46,9 +51,6 @@ $(document).ready(function(){
$('#commandTextField').focus(); $('#commandTextField').focus();
// make the canvas for us
Raphael(10, 10, 200, 200, function() {
paper = this;
// needs to be called before raphael ready // needs to be called before raphael ready
windowResize(); windowResize();
events.trigger('raphaelReady'); events.trigger('raphaelReady');
@ -58,7 +60,6 @@ $(document).ready(function(){
windowResize(); windowResize();
setTimeout(windowResize, 50); setTimeout(windowResize, 50);
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");
@ -68,8 +69,6 @@ $(document).ready(function(){
function windowResize() { function windowResize() {
var smaller = 10; var smaller = 10;
if (paper && paper.canvas) {
var el = $('#canvasWrapper')[0]; var el = $('#canvasWrapper')[0];
var left = el.offsetLeft; var left = el.offsetLeft;
@ -77,12 +76,13 @@ function windowResize() {
var width = el.clientWidth - smaller; var width = el.clientWidth - smaller;
var height = el.clientHeight - smaller; var height = el.clientHeight - smaller;
if (paper && paper.canvas) {
$(paper.canvas).css({ $(paper.canvas).css({
left: left + 'px', left: left + 'px',
top: top + 'px' top: top + 'px'
}); });
paper.setSize(width, height); paper.setSize(width, height);
}
events.trigger('canvasResize', width, height); events.trigger('canvasResize', width, height);
} }
}