aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/content.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 16:54:58 -0800
committerJose Antonio Marquez2012-02-13 16:54:58 -0800
commit5b55cfe0bc333a9a18be6329fdc21b5a6652a15a (patch)
tree80b4329906818890bc0a569bcce2b345fc8b062d /js/panels/properties/content.reel
parentf70701db069a10dc5195605fc378a022125b434f (diff)
parent30b23f8d0343c1af805d62894591001f19c6fb79 (diff)
downloadninja-5b55cfe0bc333a9a18be6329fdc21b5a6652a15a.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/panels/properties/content.reel')
-rwxr-xr-xjs/panels/properties/content.reel/content.js29
1 files changed, 29 insertions, 0 deletions
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 51b776f1..53926c78 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -159,6 +159,35 @@ exports.Content = Montage.create(Component, {
159 this.customPi = stage.elementModel.pi; 159 this.customPi = stage.elementModel.pi;
160 this.displayCustomProperties(stage, stage.elementModel.pi); 160 this.displayCustomProperties(stage, stage.elementModel.pi);
161 } 161 }
162
163 // For now hardcode the background since it is the only custom property
164 // No need to loop through all the properties.
165 var backgroundChip = this.customSections[0].content.controls["background"];
166 backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background");
167
168 /*
169 var customPI = PiData[this.customPi];
170 // Get all the custom section for the custom PI
171 for(var i = 0, customSec; customSec = customPI[i]; i++) {
172
173 // Now set the Fields for the custom PI
174 for(var j = 0, fields; fields = customSec.Section[j]; j++) {
175 for(var k = 0, control; control = fields[k]; k++) {
176
177 var colorChipEl = this.customSections[i].content.controls[control.id];
178 this.foo = colorChipEl;
179 colorChipEl.addEventListener("firstDraw", this, false);
180
181 }
182 }
183 }
184 */
185 }
186 },
187
188 handleFirstDraw: {
189 value: function() {
190 this.foo.chipBtn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 255, g: 0, b: 0}, css: 'rgb(255,0,0)'});
162 } 191 }
163 }, 192 },
164 193