aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJon Reid2012-05-22 10:40:40 -0700
committerJon Reid2012-05-22 10:40:40 -0700
commitd43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js/controllers
parent1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff)
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/controllers')
-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