UI refactor to less gloabl

This commit is contained in:
Peter Cottle 2012-11-03 16:05:44 -07:00
parent 1d476af467
commit 4e30d1b511
4 changed files with 18 additions and 22 deletions

View file

@ -22,8 +22,6 @@ function GitEngine(options) {
this.generalArgs = [];
events.on('processCommand', _.bind(this.dispatch, this));
this.init();
}
GitEngine.prototype.init = function() {

View file

@ -128,8 +128,6 @@
</script>
<!-- My files! -->
<script src="main.js"></script>
<script src="async.js"></script>
<script src="constants.js"></script>
<script src="errors.js"></script>
@ -152,5 +150,7 @@
<!-- levels -->
<script src="levels.js"></script>
<!-- on ready -->
<script src="main.js"></script>
</body>
</html>

View file

@ -3,18 +3,14 @@
*/
var events = _.clone(Backbone.Events);
var gitEngine = null;
var gitVisuals = null;
var commandCollection = null;
var commandBuffer = null;
var animationFactory = null;
var ui = null;
var animationFactory = new AnimationFactory();
var paper = null;
$(document).ready(function(){
initUI();
var mainVis = new Visualization({
ui = new UI();
mainVis = new Visualization({
el: $('#canvasWrapper')[0]
});
@ -25,22 +21,21 @@ $(document).ready(function(){
}
});
function initUI() {
function UI() {
// static classes
animationFactory = new AnimationFactory();
commandCollection = new CommandCollection();
this.commandCollection = new CommandCollection();
commandBuffer = new CommandBuffer({
collection: commandCollection
this.commandBuffer = new CommandBuffer({
collection: this.commandCollection
});
commandPromptView = new CommandPromptView({
this.commandPromptView = new CommandPromptView({
el: $('#commandLineBar'),
collection: commandCollection
collection: this.commandCollection
});
commandLineHistoryView = new CommandLineHistoryView({
this.commandLineHistoryView = new CommandLineHistoryView({
el: $('#commandLineHistory'),
collection: commandCollection
collection: this.commandCollection
});
$('#commandTextField').focus();

View file

@ -25,15 +25,18 @@ var Visualization = Backbone.View.extend({
branches: this.branchCollection,
gitVisuals: this.gitVisuals
});
this.gitEngine.init();
this.gitVisuals.assignGitEngine(this.gitEngine);
// needs to be called before raphael ready
this.myResize();
$(window).on('resize', _.bind(this.myResize, this));
this.gitVisuals.drawTreeFirstTime();
},
myResize: function() {
var smaller = 10;
var smaller = 1;
var el = this.el;
var left = el.offsetLeft;