aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties
diff options
context:
space:
mode:
authorAnanya Sen2012-02-23 13:52:32 -0800
committerAnanya Sen2012-02-23 13:52:32 -0800
commitec3d07c2fea4e79c68606234074f43d694982e5b (patch)
treedc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/panels/properties
parent7283884c39df537694b21419a3ea9e3ca7793b4b (diff)
parent287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff)
downloadninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/properties')
-rwxr-xr-xjs/panels/properties/content.reel/content.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 53926c78..9b6416c7 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -163,7 +163,7 @@ exports.Content = Montage.create(Component, {
163 // For now hardcode the background since it is the only custom property 163 // For now hardcode the background since it is the only custom property
164 // No need to loop through all the properties. 164 // No need to loop through all the properties.
165 var backgroundChip = this.customSections[0].content.controls["background"]; 165 var backgroundChip = this.customSections[0].content.controls["background"];
166 backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background"); 166 backgroundChip.color = ElementsMediator.getProperty(stage, "background");
167 167
168 /* 168 /*
169 var customPI = PiData[this.customPi]; 169 var customPI = PiData[this.customPi];