diff options
author | Jose Antonio Marquez Russo | 2012-02-01 17:11:21 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-02-01 17:11:21 -0800 |
commit | 83ac41dd75ec551cdb03252e0bf3081182517d05 (patch) | |
tree | 75781b24936e90c815f13dd5d2158c65fef643e3 /js/controllers/color-controller.js | |
parent | 9c317ebb46e82a00b83eb732c73ae39ce9ef46b9 (diff) | |
parent | 830b011d94d728882286d72e129f7405134957c7 (diff) | |
download | ninja-83ac41dd75ec551cdb03252e0bf3081182517d05.tar.gz |
Merge pull request #2 from mqg734/NiveshColor
Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
Diffstat (limited to 'js/controllers/color-controller.js')
-rw-r--r-- | js/controllers/color-controller.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 925b525d..e3b15f1c 100644 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
@@ -218,6 +218,9 @@ exports.ColorController = Montage.create(Component, { | |||
218 | } else if (mode === 'gradient'){ | 218 | } else if (mode === 'gradient'){ |
219 | color = e._event.value.value; | 219 | color = e._event.value.value; |
220 | } | 220 | } |
221 | color.mode = panelMode; | ||
222 | color.wasSetByCode = true; | ||
223 | color.type = "change"; | ||
221 | //////////////////////////////////////////////////////////// | 224 | //////////////////////////////////////////////////////////// |
222 | //////////////////////////////////////////////////////////// | 225 | //////////////////////////////////////////////////////////// |
223 | // | 226 | // |