diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/controllers/color-controller.js | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/controllers/color-controller.js')
-rwxr-xr-x | js/controllers/color-controller.js | 16 |
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 | |||
9 | var Montage = require("montage/core/core").Montage, | 9 | var 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 |