aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-07 15:32:05 -0700
committerNivesh Rajbhandari2012-06-07 15:32:05 -0700
commit4a4a4498b0c55111ff49d1dc939fe22cbe31e975 (patch)
tree5c11b7463432f887751713d693fd6d6c9024561c /js/panels/properties.reel/sections
parent21098080e7716379ceefefca5f3cc1850ac78fa7 (diff)
parent2e331fc1daba0f6f29191a36cf7647f6f5dc36ee (diff)
downloadninja-4a4a4498b0c55111ff49d1dc939fe22cbe31e975.tar.gz
Merge branch 'refs/heads/ninja-internal' into BodyPI
Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ae408f11..9df16112 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
400 this.controls[aField.id] = obj; 400 this.controls[aField.id] = obj;
401 401
402 // TODO - Hack for now to reference the color select object to unregister color chips 402 // TODO - Hack for now to reference the color select object to unregister color chips
403 this.controls["background"] = obj; 403 this.controls["background-color"] = obj;
404 404
405 return obj; 405 return obj;
406 } 406 }