diff options
author | Valerio Virgillito | 2012-02-13 15:45:05 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 15:45:05 -0800 |
commit | 0620e2f788861e824d6e49fa319da4d20b18a556 (patch) | |
tree | 53ace12283998ed12b3fde58aeb8ac3617768bf2 /js/panels/properties/sections | |
parent | 38224745a27e039b79c893830c282b2ba558ab51 (diff) | |
parent | 6db8e0b42ee47a7b6f2d0666640262a024fa9aec (diff) | |
download | ninja-0620e2f788861e824d6e49fa319da4d20b18a556.tar.gz |
Merge pull request #37 from mencio/stage-color
Stage color: Adding the stage background color chip to the stage PI
Diffstat (limited to 'js/panels/properties/sections')
-rw-r--r-- | js/panels/properties/sections/custom.reel/custom.js | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js index 992db8e6..a2b9b9fa 100644 --- a/js/panels/properties/sections/custom.reel/custom.js +++ b/js/panels/properties/sections/custom.reel/custom.js | |||
@@ -6,6 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | ||
9 | 10 | ||
10 | //Custom Rows | 11 | //Custom Rows |
11 | var SingleRow = require("js/panels/properties/sections/custom-rows/single-row.reel").SingleRow; | 12 | var SingleRow = require("js/panels/properties/sections/custom-rows/single-row.reel").SingleRow; |
@@ -18,7 +19,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
18 | var TextField = require("js/components/textfield.reel").TextField; | 19 | var TextField = require("js/components/textfield.reel").TextField; |
19 | var FileInput = require("js/components/ui/file-input.reel").FileInput; | 20 | var FileInput = require("js/components/ui/file-input.reel").FileInput; |
20 | var Checkbox = require("js/components/checkbox.reel").Checkbox; | 21 | var Checkbox = require("js/components/checkbox.reel").Checkbox; |
21 | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | |
22 | 23 | ||
23 | exports.CustomSection = Montage.create(Component, { | 24 | exports.CustomSection = Montage.create(Component, { |
24 | 25 | ||
@@ -88,10 +89,8 @@ exports.CustomSection = Montage.create(Component, { | |||
88 | value:{} | 89 | value:{} |
89 | }, | 90 | }, |
90 | 91 | ||
91 | handleChanging: | 92 | handleChanging: { |
92 | { | 93 | value:function(event) { |
93 | value:function(event) | ||
94 | { | ||
95 | var obj = event.currentTarget; | 94 | var obj = event.currentTarget; |
96 | this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); | 95 | this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); |
97 | } | 96 | } |
@@ -106,6 +105,27 @@ exports.CustomSection = Montage.create(Component, { | |||
106 | } | 105 | } |
107 | }, | 106 | }, |
108 | 107 | ||
108 | /** | ||
109 | * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip | ||
110 | */ | ||
111 | handleColorChange: { | ||
112 | value: function(event) { | ||
113 | // Change the stage color for now | ||
114 | //console.log(this, event); | ||
115 | ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); | ||
116 | /* | ||
117 | var propEvent = document.createEvent("CustomEvent"); | ||
118 | propEvent.initEvent("propertyChange", true, true); | ||
119 | propEvent.type = "propertyChange"; | ||
120 | |||
121 | propEvent.prop = "background";//event.prop; | ||
122 | propEvent.value = event._event.color.css; | ||
123 | |||
124 | this.dispatchEvent(propEvent); | ||
125 | */ | ||
126 | } | ||
127 | }, | ||
128 | |||
109 | _dispatchPropEvent: { | 129 | _dispatchPropEvent: { |
110 | value: function(event) { | 130 | value: function(event) { |
111 | // console.log(event); | 131 | // console.log(event); |
@@ -140,6 +160,7 @@ exports.CustomSection = Montage.create(Component, { | |||
140 | case "textbox" : return this.createTextField(fields); | 160 | case "textbox" : return this.createTextField(fields); |
141 | case "file" : return this.createFileInput(fields); | 161 | case "file" : return this.createFileInput(fields); |
142 | case "checkbox" : return this.createCheckbox(fields); | 162 | case "checkbox" : return this.createCheckbox(fields); |
163 | case "chip" : return this.createColorChip(fields); | ||
143 | } | 164 | } |
144 | } | 165 | } |
145 | }, | 166 | }, |
@@ -305,6 +326,26 @@ exports.CustomSection = Montage.create(Component, { | |||
305 | 326 | ||
306 | return obj; | 327 | return obj; |
307 | } | 328 | } |
329 | }, | ||
330 | |||
331 | createColorChip: { | ||
332 | value: function(aField) { | ||
333 | var obj = ColorChip.create(); | ||
334 | |||
335 | obj.chip = true; | ||
336 | obj.iconType = "fillIcon"; | ||
337 | obj.mode = "chip"; | ||
338 | obj.offset = 0; | ||
339 | |||
340 | if (aField.id) obj.id = aField.id; | ||
341 | if (aField.prop) obj.prop = aField.prop; | ||
342 | |||
343 | obj.changeDelegate = this.handleColorChange; | ||
344 | |||
345 | this.controls[aField.id] = obj; | ||
346 | |||
347 | return obj; | ||
348 | } | ||
308 | } | 349 | } |
309 | 350 | ||
310 | }); \ No newline at end of file | 351 | }); \ No newline at end of file |