aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-23 00:14:03 -0700
committerJose Antonio Marquez2012-06-23 00:14:03 -0700
commita177f4d3a534795f4229128be4316e37d51555d9 (patch)
treee6dd48effb5aa8b180eeb4fbe12c71b1b190587c
parenta9e029a21e4801b438dbee1c79c8912e24d637a7 (diff)
downloadninja-a177f4d3a534795f4229128be4316e37d51555d9.tar.gz
Fixing logic for popup value bubbling
Only working for HSV, need to implement HEX and gradient
-rwxr-xr-xjs/panels/color/colorpopup-manager.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 717e6fa2..29f9ec94 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -8,7 +8,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
8// 8//
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 ColorChipPopup = require("js/panels/Color/colorchippopup.reel").ColorChipPopup,
12 ColorPanelPopup = require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup, 11 ColorPanelPopup = require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup,
13 ColorModel = require("js/models/color-model").ColorModel; 12 ColorModel = require("js/models/color-model").ColorModel;
14//////////////////////////////////////////////////////////////////////// 13////////////////////////////////////////////////////////////////////////
@@ -294,6 +293,7 @@ exports.ColorPopupManager = Montage.create(Component, {
294 this.showGradientChipPopup(e); 293 this.showGradientChipPopup(e);
295 return; 294 return;
296 } 295 }
296 //
297 this._colorChipPopupDrawing = true; 297 this._colorChipPopupDrawing = true;
298 //////////////////////////////////////////////////// 298 ////////////////////////////////////////////////////
299 //Initializing events 299 //Initializing events
@@ -586,7 +586,7 @@ exports.ColorPopupManager = Montage.create(Component, {
586 // 586 //
587 handleChange: { 587 handleChange: {
588 value: function (e) { 588 value: function (e) {
589 if (this._popupChipBase && this._popupChipBase.opened && !this._popupGradientChipBase) { 589 if (this._popupChipBase && this._popupChipBase.opened && (!this._popupGradientChipBase || (this._popupGradientChipBase && !this._popupGradientChipBase.opened))) {
590 if (e._event.hsv) { 590 if (e._event.hsv) {
591 this._popupChipBase.colorManager.hsv = {h: e._event.hsv.h, s: e._event.hsv.s, v: e._event.hsv.v, type: e._event.type, wasSetByCode: e._event.wasSetByCode}; 591 this._popupChipBase.colorManager.hsv = {h: e._event.hsv.h, s: e._event.hsv.s, v: e._event.hsv.v, type: e._event.type, wasSetByCode: e._event.wasSetByCode};
592 this.colorChipChange(e); 592 this.colorChipChange(e);