From 866df4801b9e77a0155ffbfb87adbc79a94ce9a5 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 28 Feb 2012 12:34:33 -0800
Subject: reverted null check as per request
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
js/panels/properties/content.reel/content.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/panels/properties/content.reel')
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, {
}
else
{
- if (currentValue.color && (currentValue.color.a !== undefined))
+ if (currentValue.color.a !== undefined)
{
this.application.ninja.colorController.colorModel.alpha =
{value: currentValue.color.a, wasSetByCode: true, type: 'change'};
}
- if(currentValue.color && currentValue.color.mode)
+ if(currentValue.color.mode)
{
this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
}
--
cgit v1.2.3