aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js8
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
2 files changed, 6 insertions, 4 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 7208c2da..24eb86ea 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -1421,6 +1421,10 @@ exports.ColorPanelBase = Montage.create(Component, {
1421 // 1421 //
1422 selectInputType: { 1422 selectInputType: {
1423 value: function (type) { 1423 value: function (type) {
1424 if (this.colorManager.input === 'chip') {
1425 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1426 return;
1427 }
1424 //Checking for the type to be formatted as expected, otherwise we unselected all buttons 1428 //Checking for the type to be formatted as expected, otherwise we unselected all buttons
1425 try { 1429 try {
1426 type._event.srcElement.inputType; 1430 type._event.srcElement.inputType;
@@ -1452,10 +1456,6 @@ exports.ColorPanelBase = Montage.create(Component, {
1452 } else if (input === 'fill') { 1456 } else if (input === 'fill') {
1453 other = 'stroke'; 1457 other = 'stroke';
1454 } 1458 }
1455 if (this.colorManager.input === 'chip') {
1456 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
1457 return;
1458 }
1459 //TODO: Change popup to use montage's built in popup 1459 //TODO: Change popup to use montage's built in popup
1460 if (this.colorManager.input === input) { 1460 if (this.colorManager.input === input) {
1461 // 1461 //
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 493cb801..5b20fbf8 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -412,6 +412,7 @@ exports.ColorPopupManager = Montage.create(Component, {
412 this._popupChipBase.props.source = e._event.srcElement; 412 this._popupChipBase.props.source = e._event.srcElement;
413 // 413 //
414 this._popupChipBase.colorManager = ColorModel.create(); 414 this._popupChipBase.colorManager = ColorModel.create();
415 this._popupChipBase.colorManager.input = 'chip';
415 // 416 //
416 if (e._event.srcElement.colorMode === 'gradient'){ 417 if (e._event.srcElement.colorMode === 'gradient'){
417 this._popupChipBase.colorManager.gradient = {value: e._event.srcElement.colorValue}; 418 this._popupChipBase.colorManager.gradient = {value: e._event.srcElement.colorValue};
@@ -497,6 +498,7 @@ exports.ColorPopupManager = Montage.create(Component, {
497 this._popupGradientChipBase.props.source = e._event.srcElement; 498 this._popupGradientChipBase.props.source = e._event.srcElement;
498 // 499 //
499 this._popupGradientChipBase.colorManager = ColorModel.create(); 500 this._popupGradientChipBase.colorManager = ColorModel.create();
501 this._popupGradientChipBase.colorManager.input = 'chip';
500 // 502 //
501 this._popupGradientChipBase.addEventListener('change', this, false); 503 this._popupGradientChipBase.addEventListener('change', this, false);
502 this._popupGradientChipBase.addEventListener('changing', this, false); 504 this._popupGradientChipBase.addEventListener('changing', this, false);