aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
authorhwc4872012-01-30 16:09:00 -0800
committerhwc4872012-01-30 16:09:00 -0800
commitc41d2c2b749b67921f243fb7594ce0cdb1ccce36 (patch)
treecf25c9583b371b41e9d2da7e714bfbd657db22dc /js/panels/Color
parent86a801c057fc3b0580d6130be5740c2ee503444f (diff)
parentf129a23ff0b69f27a05a07badcdbd10fb76b86b4 (diff)
downloadninja-c41d2c2b749b67921f243fb7594ce0cdb1ccce36.tar.gz
Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into working
Diffstat (limited to 'js/panels/Color')
-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;