Permalink
Browse files

modification main

  • Loading branch information...
1 parent 18f0268 commit 23910a60871caca0fa2dd9059e51ef4c844b1143 @Mparaiso committed Feb 18, 2012
Showing with 4 additions and 1 deletion.
  1. +2 −1 js/faviconbuilder.coffee
  2. +2 −0 js/faviconbuilder.js
@@ -304,6 +304,7 @@ class Main
@colorSelectorModel = new App.Models.ColorSelector()
@gridModel = new App.Models.Grid()
@canvasPreviewModel = new App.Models.CanvasPreview($canvasPreview,@gridModel)
+ @factorSelectorModel = new App.Models.FactorSelector($factorSelector)
@menuModel = new App.Models.Menu(new App.Utils.DefaultMenu().items,$menu)
App.Models.Application.favIconGridModel = @gridModel
### CONTROLLERS ###
@@ -313,6 +314,7 @@ class Main
@colorSelectorView = new App.Views.ColorSelector($colorSelector,@colorSelectorModel)
@colorSelectorView.eventDispatcher.addListener("colorchange",@oncolorchange)
@canvasPreviewView = new App.Views.CanvasPreview(@canvasPreviewModel)
+ @factorSelectorView = new App.Views.FactorSelector(@factorSelectorModel)
@gridView = new App.Views.Grid($target,@gridModel)
@gridView.setPenColor(@applicationModel.currentColor)
@menuView = new App.Views.Menu(@menuModel)
@@ -363,4 +365,3 @@ class Main
@applicationView.render()
window?.onload = ->
window?.main = new Main()
-
@@ -600,6 +600,7 @@ Main = (function() {
this.colorSelectorModel = new App.Models.ColorSelector();
this.gridModel = new App.Models.Grid();
this.canvasPreviewModel = new App.Models.CanvasPreview($canvasPreview, this.gridModel);
+ this.factorSelectorModel = new App.Models.FactorSelector($factorSelector);
this.menuModel = new App.Models.Menu(new App.Utils.DefaultMenu().items, $menu);
App.Models.Application.favIconGridModel = this.gridModel;
/* CONTROLLERS
@@ -610,6 +611,7 @@ Main = (function() {
this.colorSelectorView = new App.Views.ColorSelector($colorSelector, this.colorSelectorModel);
this.colorSelectorView.eventDispatcher.addListener("colorchange", this.oncolorchange);
this.canvasPreviewView = new App.Views.CanvasPreview(this.canvasPreviewModel);
+ this.factorSelectorView = new App.Views.FactorSelector(this.factorSelectorModel);
this.gridView = new App.Views.Grid($target, this.gridModel);
this.gridView.setPenColor(this.applicationModel.currentColor);
this.menuView = new App.Views.Menu(this.menuModel);

0 comments on commit 23910a6

Please sign in to comment.