diff options
| author | Pushkar Joshi | 2012-02-02 11:19:30 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-02 11:19:30 -0800 |
| commit | 4d4de64472603426a73b26cc98ba8206190949b8 (patch) | |
| tree | 55e57748fe1b6fb55cc463b6fa4a88373e351c8c /js/panels | |
| parent | 0e87c02e74e08c7bf156373b0d2459563e17ecd6 (diff) | |
| parent | 5233508614656c529d6c596f7e2f2c24adce9b69 (diff) | |
| download | ninja-4d4de64472603426a73b26cc98ba8206190949b8.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels')
| -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; |