aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js4
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js18
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js8
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.js4
-rwxr-xr-xjs/panels/properties.reel/properties.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js6
6 files changed, 24 insertions, 20 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
index 414be8b7..923beca9 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.js
@@ -43,8 +43,8 @@ exports.ColorChipPopup = Montage.create(Component, {
43 // 43 //
44 setNoColor: { 44 setNoColor: {
45 enumerable: true, 45 enumerable: true,
46 value: function (e) { 46 value: function (code) {
47 this.colorManager.applyNoColor(); 47 this.colorManager.applyNoColor(code);
48 } 48 }
49 }, 49 },
50 //////////////////////////////////////////////////////////////////// 50 ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 7a28c55d..7071f590 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -694,7 +694,7 @@ exports.ColorPanelBase = Montage.create(Component, {
694 case 'nocolor': 694 case 'nocolor':
695 this._buttons.nocolor.push(button); 695 this._buttons.nocolor.push(button);
696 button.title = 'No Color'; 696 button.title = 'No Color';
697 button.addEventListener('click', this.setNoColor.bind(this)); 697 button.addEventListener('click', function () {this.setNoColor(false)}.bind(this));
698 break; 698 break;
699 //////////////////////////////////////////////////////// 699 ////////////////////////////////////////////////////////
700 case 'swap': 700 case 'swap':
@@ -746,7 +746,7 @@ exports.ColorPanelBase = Montage.create(Component, {
746 color.wasSetByCode = false; 746 color.wasSetByCode = false;
747 // 747 //
748 if (prev.m === 'nocolor') { 748 if (prev.m === 'nocolor') {
749 this.setNoColor(); 749 this.setNoColor(false);
750 } else { 750 } else {
751 this.colorManager.alpha = { value: alpha, wasSetByCode: true, type: 'change' }; 751 this.colorManager.alpha = { value: alpha, wasSetByCode: true, type: 'change' };
752 this.colorManager[prev.m] = color; 752 this.colorManager[prev.m] = color;
@@ -832,11 +832,11 @@ exports.ColorPanelBase = Montage.create(Component, {
832 //TODO: Add set by code property 832 //TODO: Add set by code property
833 setNoColor: { 833 setNoColor: {
834 enumerable: true, 834 enumerable: true,
835 value: function (e) { 835 value: function (wasSetByCode) {
836 // 836 //
837 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 837 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
838 // 838 //
839 this.colorManager.applyNoColor(); 839 this.colorManager.applyNoColor(wasSetByCode);
840 } 840 }
841 }, 841 },
842 //////////////////////////////////////////////////////////////////// 842 ////////////////////////////////////////////////////////////////////
@@ -879,7 +879,7 @@ exports.ColorPanelBase = Montage.create(Component, {
879 break; 879 break;
880 //////////////////////////////////////////////////////// 880 ////////////////////////////////////////////////////////
881 default: 881 default:
882 this.setNoColor(); 882 this.setNoColor(false);
883 break; 883 break;
884 //////////////////////////////////////////////////////// 884 ////////////////////////////////////////////////////////
885 } 885 }
@@ -911,7 +911,7 @@ exports.ColorPanelBase = Montage.create(Component, {
911 break; 911 break;
912 //////////////////////////////////////////////////////// 912 ////////////////////////////////////////////////////////
913 default: 913 default:
914 this.setNoColor(); 914 this.setNoColor(false);
915 break; 915 break;
916 //////////////////////////////////////////////////////// 916 ////////////////////////////////////////////////////////
917 } 917 }
@@ -1300,7 +1300,7 @@ exports.ColorPanelBase = Montage.create(Component, {
1300 update.type = 'change'; 1300 update.type = 'change';
1301 this.colorManager.hsl = update; 1301 this.colorManager.hsl = update;
1302 } else { 1302 } else {
1303 this.colorManager.applyNoColor(); 1303 this.colorManager.applyNoColor(false);
1304 } 1304 }
1305 } else { 1305 } else {
1306 update = this.colorManager.hexToRgb(color); 1306 update = this.colorManager.hexToRgb(color);
@@ -1309,7 +1309,7 @@ exports.ColorPanelBase = Montage.create(Component, {
1309 update.type = 'change'; 1309 update.type = 'change';
1310 this.colorManager.rgb = update; 1310 this.colorManager.rgb = update;
1311 } else { 1311 } else {
1312 this.colorManager.applyNoColor(); 1312 this.colorManager.applyNoColor(false);
1313 } 1313 }
1314 } 1314 }
1315 } 1315 }
@@ -1553,7 +1553,7 @@ exports.ColorPanelBase = Montage.create(Component, {
1553 this.colorManager.hsv = color.c; 1553 this.colorManager.hsv = color.c;
1554 break; 1554 break;
1555 default: 1555 default:
1556 this.colorManager.applyNoColor(); 1556 this.colorManager.applyNoColor(true);
1557 break; 1557 break;
1558 } 1558 }
1559 // 1559 //
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 4161cb50..ded06797 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -50,8 +50,8 @@ exports.ColorPanelPopup = Montage.create(Component, {
50 //////////////////////////////////////////////////////////////////// 50 ////////////////////////////////////////////////////////////////////
51 // 51 //
52 setNoColor: { 52 setNoColor: {
53 value: function (e) { 53 value: function (code) {
54 if (this.colorManager) this.colorManager.applyNoColor(); 54 if (this.colorManager) this.colorManager.applyNoColor(code);
55 } 55 }
56 }, 56 },
57 //////////////////////////////////////////////////////////////////// 57 ////////////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
308 color.type = 'change'; 308 color.type = 'change';
309 this.colorManager.hsl = color; 309 this.colorManager.hsl = color;
310 } else { 310 } else {
311 this.colorManager.applyNoColor(); 311 this.colorManager.applyNoColor(false);
312 } 312 }
313 } else { 313 } else {
314 color = this.colorManager.hexToRgb(b._event.srcElement.colorValue); 314 color = this.colorManager.hexToRgb(b._event.srcElement.colorValue);
@@ -317,7 +317,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
317 color.type = 'change'; 317 color.type = 'change';
318 this.colorManager.rgb = color; 318 this.colorManager.rgb = color;
319 } else { 319 } else {
320 this.colorManager.applyNoColor(); 320 this.colorManager.applyNoColor(false);
321 } 321 }
322 } 322 }
323 } 323 }
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.js b/js/panels/color/colortoolbar.reel/colortoolbar.js
index 6b8e476b..bf4d307f 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.js
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.js
@@ -108,7 +108,7 @@ exports.ColorToolbar = Montage.create(Component, {
108 color.mode = e._event.colorMode; 108 color.mode = e._event.colorMode;
109 this.application.ninja.colorController.colorModel[e._event.colorMode] = color; 109 this.application.ninja.colorController.colorModel[e._event.colorMode] = color;
110 } else { 110 } else {
111 this.application.ninja.colorController.colorModel.applyNoColor(); 111 this.application.ninja.colorController.colorModel.applyNoColor(false);
112 } 112 }
113 this.application.ninja.colorController.colorModel.input = 'chip'; 113 this.application.ninja.colorController.colorModel.input = 'chip';
114 }.bind(this)); 114 }.bind(this));
@@ -125,7 +125,7 @@ exports.ColorToolbar = Montage.create(Component, {
125 color.mode = e._event.colorMode; 125 color.mode = e._event.colorMode;
126 this.application.ninja.colorController.colorModel[e._event.colorMode] = color; 126 this.application.ninja.colorController.colorModel[e._event.colorMode] = color;
127 } else { 127 } else {
128 this.application.ninja.colorController.colorModel.applyNoColor(); 128 this.application.ninja.colorController.colorModel.applyNoColor(false);
129 } 129 }
130 this.application.ninja.colorController.colorModel.input = 'chip'; 130 this.application.ninja.colorController.colorModel.input = 'chip';
131 }.bind(this)); 131 }.bind(this));
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 43c92b74..fcd0ab01 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -367,7 +367,7 @@ exports.Properties = Montage.create(Component, {
367 } 367 }
368 } else { 368 } else {
369 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'}; 369 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: 'change'};
370 this.application.ninja.colorController.colorModel.applyNoColor(); 370 this.application.ninja.colorController.colorModel.applyNoColor(true);
371 } 371 }
372 } 372 }
373 } 373 }
@@ -397,7 +397,7 @@ exports.Properties = Montage.create(Component, {
397 this.application.ninja.colorController.colorModel.hsv = color.c; 397 this.application.ninja.colorController.colorModel.hsv = color.c;
398 break; 398 break;
399 default: 399 default:
400 this.application.ninja.colorController.colorModel.applyNoColor(); 400 this.application.ninja