aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-01-30 15:49:09 -0800
committerValerio Virgillito2012-01-30 15:49:09 -0800
commitf129a23ff0b69f27a05a07badcdbd10fb76b86b4 (patch)
tree542867131d6e945577415dae8b87546d844758d1 /js
parentadcb6e2534e305102cde748265047fdffe2bd03b (diff)
parentb125c02c3d2e28cc9364d16e23791cd6b540f17c (diff)
downloadninja-f129a23ff0b69f27a05a07badcdbd10fb76b86b4.tar.gz
Merge pull request #5 from joseeight/Color
IKNINJA-1083
Diffstat (limited to 'js')
-rw-r--r--js/panels/Color/colorchippopup.reel/colorchippopup.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
index 03e14b28..05bcb447 100644
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.js
@@ -109,7 +109,7 @@ exports.ColorChipPopup = Montage.create(Component, {
109 this.cc_hexinput.labelFunction = this._hexLabel.bind(this); 109 this.cc_hexinput.labelFunction = this._hexLabel.bind(this);
110 this.cc_hexinput.inputFunction = this._hexInput.bind(this); 110 this.cc_hexinput.inputFunction = this._hexInput.bind(this);
111 // 111 //
112 if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue.a) { 112 if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
113 this.combo.slider.value = Math.round(this.application.ninja.colorController.colorView.currentChip.colorValue.a*100); 113 this.combo.slider.value = Math.round(this.application.ninja.colorController.colorView.currentChip.colorValue.a*100);
114 } else { 114 } else {
115 this.combo.slider.value = 100; 115 this.combo.slider.value = 100;