diff options
author | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
commit | 5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch) | |
tree | af71b72b828d942ebf11f565b7c9ccff0798343d /js/panels/properties.reel/sections/custom.reel/custom.js | |
parent | 8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff) | |
parent | 526b9d76686323f488f1b26175440172b715d808 (diff) | |
download | ninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz |
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel/custom.js')
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 9c31cf45..ed4616da 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
23 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/native/button.reel").Button; |
24 | 24 | ||
25 | exports.CustomSection = Montage.create(Component, { | 25 | exports.CustomSection = Montage.create(Component, { |
26 | 26 | ||
@@ -115,11 +115,25 @@ exports.CustomSection = Montage.create(Component, { | |||
115 | value: function(event) { | 115 | value: function(event) { |
116 | // Change the stage color for now | 116 | // Change the stage color for now |
117 | //console.log(this, event); | 117 | //console.log(this, event); |
118 | if (event._event.color && event._event.color.css) { | 118 | |
119 | if (event._event.colorMode !== 'gradient' && event._event.color) { | ||
120 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); | ||
121 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); | ||
122 | } else if (event._event.color) { | ||
123 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); | ||
124 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); | ||
125 | } else { | ||
126 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); | ||
127 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); | ||
128 | } | ||
129 | |||
130 | /* | ||
131 | if (event._event.color && event._event.color.css) { | ||
119 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); | 132 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); |
120 | } else { | 133 | } else { |
121 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); | 134 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); |
122 | } | 135 | } |
136 | */ | ||
123 | /* | 137 | /* |
124 | var propEvent = document.createEvent("CustomEvent"); | 138 | var propEvent = document.createEvent("CustomEvent"); |
125 | propEvent.initEvent("propertyChange", true, true); | 139 | propEvent.initEvent("propertyChange", true, true); |