diff options
| author | Nivesh Rajbhandari | 2012-01-31 15:19:46 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-01-31 15:19:46 -0800 |
| commit | ff700e7921b8e30b89e963c48888c8296ed16f52 (patch) | |
| tree | 8cefe676c82fde5c61b3fc2e4f7d8ae83191c47b | |
| parent | b01b586a26ae47d329bdd5fe005051513711fab7 (diff) | |
| parent | b125c02c3d2e28cc9364d16e23791cd6b540f17c (diff) | |
| download | ninja-ff700e7921b8e30b89e963c48888c8296ed16f52.tar.gz | |
Merge branch 'refs/heads/Jose-Color' into NiveshColor
| -rw-r--r-- | js/panels/Color/colorchippopup.reel/colorchippopup.js | 2 |
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; |