aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/color-controller.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 16:06:56 -0700
committerValerio Virgillito2012-05-16 16:06:56 -0700
commit92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch)
treee385beee8f2694596f6305bf90eb7eb4521de2e2 /js/controllers/color-controller.js
parentbdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/controllers/color-controller.js')
-rwxr-xr-xjs/controllers/color-controller.js16
1 files changed, 0 insertions, 16 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index c6d664cf..d4737aad 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -9,7 +9,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component, 10 Component = require("montage/ui/component").Component,
11 ColorModel = require("js/models/color-model").ColorModel, 11 ColorModel = require("js/models/color-model").ColorModel,
12 ColorToolbar = require("js/panels/Color/colortoolbar.reel").ColorToolbar,
13 ColorPanelBase = require("js/panels/Color/colorpanelbase.reel").ColorPanelBase, 12 ColorPanelBase = require("js/panels/Color/colorpanelbase.reel").ColorPanelBase,
14 ElementsMediator = require("js/mediators/element-mediator").ElementMediator, 13 ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
15 ColorPopupManager = require("js/panels/Color/colorpopup-manager").ColorPopupManager, 14 ColorPopupManager = require("js/panels/Color/colorpopup-manager").ColorPopupManager,
@@ -368,20 +367,5 @@ exports.ColorController = Montage.create(Component, {
368 //Must be a valid CSS or null will be returned 367 //Must be a valid CSS or null will be returned
369 return color; 368 return color;
370 } 369 }
371 },
372 ////////////////////////////////////////////////////////////////////
373 ////////////////////////////////////////////////////////////////////
374 ////////////////////////////////////////////////////////////////////
375 //TODO: Remove, add via toolbar repetition
376 createToolbar: {
377 enumerable: true,
378 value: function () {
379 this.colorToolbar = ColorToolbar.create();
380 this.colorToolbar.element = document.getElementById("colortoolbar");
381 this.colorToolbar.needsDraw = true;
382 }
383 } 370 }
384 ////////////////////////////////////////////////////////////////////
385 ////////////////////////////////////////////////////////////////////
386 ////////////////////////////////////////////////////////////////////
387}); \ No newline at end of file 371}); \ No newline at end of file