aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 13:39:56 -0700
committerJose Antonio Marquez2012-06-26 13:39:56 -0700
commit9ebf80d943b894242d90cf62bc3078c6a83041ad (patch)
tree849990db2c27cf8f127f9452c9b3e782ad73b34b
parent2a74d2c18960cb52db125f21e880cc4876a1c3fb (diff)
downloadninja-9ebf80d943b894242d90cf62bc3078c6a83041ad.tar.gz
Fixing gradient/solid color toggle
Also added a null value setter fix for no color hex
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js4
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index b3045db1..db46ced7 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -482,12 +482,14 @@ exports.ColorPanelBase = Montage.create(Component, {
482 this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height); 482 this.ctx.clearRect(0, 0, this.cvs.width, this.cvs.height);
483 if (m === 'gradient') { 483 if (m === 'gradient') {
484 this.style.backgroundImage = c.css; 484 this.style.backgroundImage = c.css;
485 this.style.backgroundColor = 'transparent';
485 } else { 486 } else {
486 this.style.backgroundColor = c.css; 487 this.style.backgroundColor = c.css;
488 this.style.backgroundImage = 'none';
487 } 489 }
488 } else { 490 } else {
489 this.drawNoColor(this, this.cvs); 491 this.drawNoColor(this, this.cvs);
490 }9 492 }
491 this.colorValue = c; 493 this.colorValue = c;
492 this.colorMode = m; 494 this.colorMode = m;
493 this.otherInput = false; 495 this.otherInput = false;
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index caccf977..5be652c9 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -605,6 +605,7 @@ exports.ColorPopupManager = Montage.create(Component, {
605 if (e._event.gradient && !e._event.wasSetByCode) { 605 if (e._event.gradient && !e._event.wasSetByCode) {
606 // 606 //
607 this._popupChipBtn.color('gradient', e._event.gradient); 607 this._popupChipBtn.color('gradient', e._event.gradient);
608 this._popupChipBase._components.hex.value = null;
608 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { 609 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) {
609 this.colorChipChange(e); 610 this.colorChipChange(e);
610 } 611 }
@@ -617,6 +618,7 @@ exports.ColorPopupManager = Montage.create(Component, {
617 } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){ 618 } else if (!this._popupBase || (this._popupBase && !this._popupBase.opened)){
618 if (e._event.gradient && !e._event.wasSetByCode) { 619 if (e._event.gradient && !e._event.wasSetByCode) {
619 this._popupChipBtn.color('gradient', e._event.gradient); 620 this._popupChipBtn.color('gradient', e._event.gradient);
621 this._popupChipBase._components.hex.value = null;
620 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) { 622 } else if (!isNaN(e._target._xStart) && !e._event.wasSetByCode) {
621 this.colorGradientChipChange(e); 623 this.colorGradientChipChange(e);
622 } 624 }