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

omg finally works

Browse source
This commit is contained in:
Peter Cottle 2012-12-17 10:24:55 -08:00
parent aadeab8299
commit f34c606d87
12 changed files with 496 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/app/index.js
View file

@ -10,7 +10,7 @@ var mainVis = null;
///////////////////////////////////////////////////////////////////////
$(document).ready(function(){
var init = function(){
var Visuals = require('../visuals');
ui = new UI();
@ -23,7 +23,9 @@ $(document).ready(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");
}, 500);
}
});
};
$(document).ready(init);
function UI() {
var Collections = require('../models/collections');
@ -53,4 +55,6 @@ exports.getEvents = function() {
exports.getUI = function() {
return ui;
};
exports.init = init;

10
src/js/git/headless.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var GitEngine = require('../git').GitEngine;

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

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var AnimationFactoryModule = require('../visuals/animation/animationFactory');

16
src/js/models/collections.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var Commit = require('../git').Commit;
@ -27,6 +33,12 @@ var CommandEntryCollection = Backbone.Collection.extend({
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
});
if (Backbone.LocalStorage) {
console.log('local storage there');
} else {
console.log('not htere');
}
var CommandBuffer = Backbone.Model.extend({
defaults: {
collection: null

10
src/js/models/commandModel.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var Errors = require('../util/errors');

10
src/js/util/errors.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var MyError = Backbone.Model.extend({

3
src/js/util/index.js
View file

@ -1,4 +1,5 @@
exports.isBrowser = function() {
return (typeof window === undefined);
var inBrowser = String(typeof window) !== 'undefined';
return inBrowser;
};

22
src/js/visuals/animation/animationFactory.js
View file

@ -1,3 +1,17 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var Animation = require('./index').Animation;
var GRAPHICS = require('../../util/constants').GRAPHICS;
/******************
* This class is responsible for a lot of the heavy lifting around creating an animation at a certain state in time.
* The tricky thing is that when a new commit has to be "born," say in the middle of a rebase
@ -8,14 +22,6 @@
* and then essentially animate the entire tree too.
*/
var Animation = require('./index').Animation;
var GRAPHICS = require('../../util/constants').GRAPHICS;
if (!require('../../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
}
// essentially a static class
var AnimationFactory = function() {

12
src/js/visuals/animation/index.js
View file

@ -1,8 +1,14 @@
var GLOBAL = require('../../util/constants').GLOBAL;
if (!require('../../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var Animation = Backbone.Model.extend({

10
src/js/visuals/index.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var GRAPHICS = require('../util/constants').GRAPHICS;

10
src/js/visuals/tree.js
View file

@ -1,6 +1,12 @@
var _;
var Backbone;
// horrible hack to get localStorage Backbone plugin
if (!require('../util').isBrowser()) {
var _ = require('underscore');
var Backbone = require('backbone');
_ = require('underscore');
Backbone = require('backbone');
} else {
Backbone = window.Backbone;
_ = window._;
}
var GRAPHICS = require('../util/constants').GRAPHICS;