aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 11:47:50 -0700
committerJose Antonio Marquez2012-06-26 11:47:50 -0700
commit079192983b3966c3699d42716dae6c1db930a3f1 (patch)
treea6a1ae9049a4f11544bb9417ac951f0f07dc9616 /js
parenta1497ed180e668003c274dda90bfb9ab8bd1963e (diff)
downloadninja-079192983b3966c3699d42716dae6c1db930a3f1.tar.gz
Fixing hex value syncing in popups
Diffstat (limited to 'js')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js4
-rwxr-xr-xjs/panels/color/colorpopup-manager.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 283de5a8..4865d3dd 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -60,7 +60,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
60 value: function () { 60 value: function () {
61 // 61 //
62 this._components = null; 62 this._components = null;
63 this._components = {wheel: null, combo: null, gradient: null}; 63 this._components = {wheel: null, combo: null, gradient: null, hex: null};
64 } 64 }
65 }, 65 },
66 //////////////////////////////////////////////////////////////////// 66 ////////////////////////////////////////////////////////////////////
@@ -153,7 +153,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
153 this.btnGradient.style.display = 'none'; 153 this.btnGradient.style.display = 'none';
154 } 154 }
155 // 155 //
156 this.application.ninja.colorController.colorView.addButton('hexinput', this.inputHex, this.colorManager); 156 this._components.hex = this.application.ninja.colorController.colorView.addButton('hexinput', this.inputHex, this.colorManager);
157 // 157 //
158 this._components.combo.slider.needsDraw = true; 158 this._components.combo.slider.needsDraw = true;
159 this._components.combo.hottext.needsDraw = true; 159 this._components.combo.hottext.needsDraw = true;
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index aca2adc7..655673a2 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -259,6 +259,8 @@ exports.ColorPopupManager = Montage.create(Component, {
259 rgb = this._popupChipBase.colorManager.rgb, 259 rgb = this._popupChipBase.colorManager.rgb,
260 hsl = this._popupChipBase.colorManager.hsl, 260 hsl = this._popupChipBase.colorManager.hsl,
261 alpha = this._popupChipBase.colorManager.alpha.value || this._popupChipBase.colorManager.alpha; 261 alpha = this._popupChipBase.colorManager.alpha.value || this._popupChipBase.colorManager.alpha;
262 //
263 this._popupChipBase._components.hex.value = this._popupChipBase.colorManager.hex;
262 // 264 //
263 if (cvs) { 265 if (cvs) {
264 ctx = cvs.getContext('2d'); 266 ctx = cvs.getContext('2d');
@@ -310,6 +312,8 @@ exports.ColorPopupManager = Montage.create(Component, {
310 rgb = this._popupGradientChipBase.colorManager.rgb, 312 rgb = this._popupGradientChipBase.colorManager.rgb,
311 hsl = this._popupGradientChipBase.colorManager.hsl, 313 hsl = this._popupGradientChipBase.colorManager.hsl,
312 alpha = this._popupGradientChipBase.colorManager.alpha.value || this._popupGradientChipBase.colorManager.alpha; 314 alpha = this._popupGradientChipBase.colorManager.alpha.value || this._popupGradientChipBase.colorManager.alpha;
315 //
316 this._popupGradientChipBase._components.hex.value = this._popupGradientChipBase.colorManager.hex;
313 // 317 //
314 if (cvs) { 318 if (cvs) {
315 ctx = cvs.getContext('2d'); 319 ctx = cvs.getContext('2d');