diff options
author | John Mayhew | 2012-02-14 09:26:31 -0800 |
---|---|---|
committer | John Mayhew | 2012-02-14 09:26:31 -0800 |
commit | 65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b (patch) | |
tree | 6113587f513fe191fb3538bdce1dc4874e583c93 /js/panels/properties/content.reel | |
parent | be18a677863925963551ce3e88a4a4d254f3870c (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/panels/properties/content.reel')
-rw-r--r-- | js/panels/properties/content.reel/content.js | 29 |
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 0088447a..1ec6d769 100644 --- a/js/panels/properties/content.reel/content.js +++ b/js/panels/properties/content.reel/content.js | |||
@@ -150,6 +150,35 @@ exports.Content = Montage.create(Component, { | |||
150 | this.customPi = stage.elementModel.pi; | 150 | this.customPi = stage.elementModel.pi; |
151 | this.displayCustomProperties(stage, stage.elementModel.pi); | 151 | this.displayCustomProperties(stage, stage.elementModel.pi); |
152 | } | 152 | } |
153 | |||
154 | // For now hardcode the background since it is the only custom property | ||
155 | // No need to loop through all the properties. | ||
156 | var backgroundChip = this.customSections[0].content.controls["background"]; | ||
157 | backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background"); | ||
158 | |||
159 | /* | ||
160 | var customPI = PiData[this.customPi]; | ||
161 | // Get all the custom section for the custom PI | ||
162 | for(var i = 0, customSec; customSec = customPI[i]; i++) { | ||
163 | |||
164 | // Now set the Fields for the custom PI | ||
165 | for(var j = 0, fields; fields = customSec.Section[j]; j++) { | ||
166 | for(var k = 0, control; control = fields[k]; k++) { | ||
167 | |||
168 | var colorChipEl = this.customSections[i].content.controls[control.id]; | ||
169 | this.foo = colorChipEl; | ||
170 | colorChipEl.addEventListener("firstDraw", this, false); | ||
171 | |||
172 | } | ||
173 | } | ||
174 | } | ||
175 | */ | ||
176 | } | ||
177 | }, | ||
178 | |||
179 | handleFirstDraw: { | ||
180 | value: function() { | ||
181 | this.foo.chipBtn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 255, g: 0, b: 0}, css: 'rgb(255,0,0)'}); | ||
153 | } | 182 | } |
154 | }, | 183 | }, |
155 | 184 | ||