diff options
| author | Ananya Sen | 2012-02-28 12:34:33 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-28 12:34:33 -0800 |
| commit | 866df4801b9e77a0155ffbfb87adbc79a94ce9a5 (patch) | |
| tree | 411b63963067c60a6574a2f8084fd42876dac764 /js | |
| parent | ada597016685a83f2c9a8b25b28589b9221569c0 (diff) | |
| download | ninja-866df4801b9e77a0155ffbfb87adbc79a94ce9a5.tar.gz | |
reverted null check as per request
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
| -rwxr-xr-x | js/panels/properties/content.reel/content.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js index fa4c56f2..8fa33a75 100755 --- a/js/panels/properties/content.reel/content.js +++ b/js/panels/properties/content.reel/content.js | |||
| @@ -268,12 +268,12 @@ exports.Content = Montage.create(Component, { | |||
| 268 | } | 268 | } |
| 269 | else | 269 | else |
| 270 | { | 270 | { |
| 271 | if (currentValue.color && (currentValue.color.a !== undefined)) | 271 | if (currentValue.color.a !== undefined) |
| 272 | { | 272 | { |
| 273 | this.application.ninja.colorController.colorModel.alpha = | 273 | this.application.ninja.colorController.colorModel.alpha = |
| 274 | {value: currentValue.color.a, wasSetByCode: true, type: 'change'}; | 274 | {value: currentValue.color.a, wasSetByCode: true, type: 'change'}; |
| 275 | } | 275 | } |
| 276 | if(currentValue.color && currentValue.color.mode) | 276 | if(currentValue.color.mode) |
| 277 | { | 277 | { |
| 278 | this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color; | 278 | this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color; |
| 279 | } | 279 | } |