aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/content.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-03 09:57:41 -0800
committerAnanya Sen2012-02-03 09:57:41 -0800
commitc093dd13a84ce6eb3e00a672c38a808093c5d966 (patch)
tree5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/panels/properties/content.reel
parent79b0173eeca079dec42ff1480182656dbe3af44f (diff)
parent8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff)
downloadninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/properties/content.reel')
-rwxr-xr-xjs/panels/properties/content.reel/content.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index fe6faef8..3cedee6d 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -182,8 +182,11 @@ exports.Content = Montage.create(Component, {
182 182
183 if(control.prop !== "border-color" && control.prop !== "background-color") { 183 if(control.prop !== "border-color" && control.prop !== "background-color") {
184 var currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator); 184 var currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
185 currentValue ? currentValue = currentValue : currentValue = control.defaultValue; 185 if(currentValue === null)
186 this.customSections[0].content.controls[control.id] = currentValue; 186 {
187 currentValue = control.defaultValue;
188 }
189 this.customSections[i].content.controls[control.id] = currentValue;
187 } 190 }
188 } 191 }
189 } 192 }