From 079192983b3966c3699d42716dae6c1db930a3f1 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 26 Jun 2012 11:47:50 -0700 Subject: Fixing hex value syncing in popups --- js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 4 ++-- js/panels/color/colorpopup-manager.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'js') 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, { value: function () { // this._components = null; - this._components = {wheel: null, combo: null, gradient: null}; + this._components = {wheel: null, combo: null, gradient: null, hex: null}; } }, //////////////////////////////////////////////////////////////////// @@ -153,7 +153,7 @@ exports.ColorPanelPopup = Montage.create(Component, { this.btnGradient.style.display = 'none'; } // - this.application.ninja.colorController.colorView.addButton('hexinput', this.inputHex, this.colorManager); + this._components.hex = this.application.ninja.colorController.colorView.addButton('hexinput', this.inputHex, this.colorManager); // this._components.combo.slider.needsDraw = true; 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, { rgb = this._popupChipBase.colorManager.rgb, hsl = this._popupChipBase.colorManager.hsl, alpha = this._popupChipBase.colorManager.alpha.value || this._popupChipBase.colorManager.alpha; + // + this._popupChipBase._components.hex.value = this._popupChipBase.colorManager.hex; // if (cvs) { ctx = cvs.getContext('2d'); @@ -310,6 +312,8 @@ exports.ColorPopupManager = Montage.create(Component, { rgb = this._popupGradientChipBase.colorManager.rgb, hsl = this._popupGradientChipBase.colorManager.hsl, alpha = this._popupGradientChipBase.colorManager.alpha.value || this._popupGradientChipBase.colorManager.alpha; + // + this._popupGradientChipBase._components.hex.value = this._popupGradientChipBase.colorManager.hex; // if (cvs) { ctx = cvs.getContext('2d'); -- cgit v1.2.3