aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-03 17:09:02 -0800
committerNivesh Rajbhandari2012-02-03 17:09:02 -0800
commitfd44b7c326acf413367667690e937709f03601e3 (patch)
tree88fb134773afd0d7082d4bcfc187eb297861d4b4 /js
parent4b8eb7442b41db7e06b639ba4a31bb7664209159 (diff)
downloadninja-fd44b7c326acf413367667690e937709f03601e3.tar.gz
We were only updating the first custom section in the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/data/pi/pi-data.js2
-rw-r--r--js/panels/properties/content.reel/content.js7
2 files changed, 5 insertions, 4 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 1f8870ca..dd75e255 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -288,7 +288,6 @@ exports.PiData = Montage.create( Montage, {
288 type : "color", 288 type : "color",
289 prop: "background", 289 prop: "background",
290 id : "fill", 290 id : "fill",
291 prop : "fill",
292 divider : true 291 divider : true
293 } 292 }
294 ], 293 ],
@@ -462,7 +461,6 @@ exports.PiData = Montage.create( Montage, {
462 type : "color", 461 type : "color",
463 prop: "background", 462 prop: "background",
464 id : "fill", 463 id : "fill",
465 prop : "fill",
466 divider : true 464 divider : true
467 } 465 }
468 ], 466 ],
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 20dc308f..0088447a 100644
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -197,8 +197,11 @@ exports.Content = Montage.create(Component, {
197 197
198 if(control.type !== "color") { 198 if(control.type !== "color") {
199 currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator); 199 currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
200 currentValue ? currentValue = currentValue : currentValue = control.defaultValue; 200 if(currentValue === null)
201 this.customSections[0].content.controls[control.id] = currentValue; 201 {
202 currentValue = control.defaultValue;
203 }
204 this.customSections[i].content.controls[control.id] = currentValue;
202 } 205 }
203 else 206 else
204 { 207 {