diff options
-rwxr-xr-x | js/mediators/element-mediator.js | 71 | ||||
-rwxr-xr-x | js/panels/properties.reel/properties.js | 5 |
2 files changed, 16 insertions, 60 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 738e65fc..6ab33eff 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -138,70 +138,25 @@ exports.ElementMediator = Montage.create(Component, { | |||
138 | }, | 138 | }, |
139 | 139 | ||
140 | /** | 140 | /** |
141 | Set a property change command for an element or array of elements | 141 | Set a property change command for an element or array of elements |
142 | @param els: Array of elements. Can contain 1 or more elements | 142 | @param element: Element |
143 | @param p: Property to set | 143 | @param attribute: Attribute to set |
144 | @param value: Value to be set. This is an array of values corresponding to the array of elements | 144 | @param value: Value to be set. |
145 | @param eventType: Change/Changing. Will be passed to the dispatched event | 145 | @param currentValue: current value |
146 | @param source: String for the source object making the call | 146 | @param source: String for the source object making the call |
147 | @param currentValue *OPTIONAL*: current value array. If not found the current value is calculated | 147 | */ |
148 | @param stageRedraw: *OPTIONAL*: True. If set to false the stage will not redraw the selection/outline | ||
149 | */ | ||
150 | setAttribute: { | 148 | setAttribute: { |
151 | value: function(el, att, value, eventType, source, currentValue) { | 149 | value: function(element, attribute, value, currentValue, source) { |
150 | element.elementModel.controller["setAttribute"](element, attribute, value); | ||
152 | 151 | ||
153 | if(eventType === "Changing") { | 152 | // Add to the undo |
154 | this._setAttribute(el, att, value, eventType, source); | 153 | var undoLabel = "Attribute change"; |
155 | } else { | 154 | document.application.undoManager.add(undoLabel, this.setAttribute, this, element, attribute, currentValue, value, source); |
156 | // Calculate currentValue if not found for each element | ||
157 | if(currentValue === null) { | ||
158 | currentValue = el.getAttribute(att); | ||
159 | } | ||
160 | |||
161 | var command = Montage.create(Command, { | ||
162 | _el: { value: el }, | ||
163 | _att: { value: att }, | ||
164 | _value: { value: value }, | ||
165 | _previous: { value: currentValue }, | ||
166 | _eventType: { value: eventType}, | ||
167 | _source: { value: "undo-redo"}, | ||
168 | description: { value: "Set Attribute"}, | ||
169 | receiver: { value: this}, | ||
170 | |||
171 | execute: { | ||
172 | value: function(senderObject) { | ||
173 | if(senderObject) this._source = senderObject; | ||
174 | this.receiver._setAttribute(this._el, this._att, this._value, this._eventType, this._source); | ||
175 | this._source = "undo-redo"; | ||
176 | return ""; | ||
177 | } | ||
178 | }, | ||
179 | |||
180 | unexecute: { | ||
181 | value: function() { | ||
182 | this.receiver._setAttribute(this._el, this._att, this._previous, this._eventType, this._source); | ||
183 | return ""; | ||
184 | } | ||
185 | } | ||
186 | }); | ||
187 | |||
188 | NJevent("sendToUndo", command); | ||
189 | command.execute(source); | ||
190 | } | ||
191 | 155 | ||
156 | NJevent("attributeChange"); | ||
192 | } | 157 | } |
193 | }, | 158 | }, |
194 | 159 | ||
195 | _setAttribute: { | ||
196 | value: function(el, att, value, eventType, source) { | ||
197 | el.elementModel.controller["setAttribute"](el, att, value); | ||
198 | |||
199 | NJevent("attribute" + eventType, {type : "setAttribute", source: source, data: {"els": el, "prop": att, "value": value}, redraw: null}); | ||
200 | } | ||
201 | }, | ||
202 | |||
203 | |||
204 | |||
205 | /** | 160 | /** |
206 | Set a property change command for an element or array of elements | 161 | Set a property change command for an element or array of elements |
207 | @param els: Array of elements. Can contain 1 or more elements | 162 | @param els: Array of elements. Can contain 1 or more elements |
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 625e3eb6..d9dca538 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -113,13 +113,14 @@ exports.Properties = Montage.create(Component, { | |||
113 | } | 113 | } |
114 | 114 | ||
115 | if(this.application.ninja.selectedElements.length) { | 115 | if(this.application.ninja.selectedElements.length) { |
116 | ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "id", this.elementId.value, "Change", "pi"); | 116 | // ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "id", this.elementId.value, "Change", "pi"); |
117 | ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "id", this.elementId.value, this.application.ninja.selectedElements[0].id, "pi"); | ||
117 | } else { | 118 | } else { |
118 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.id); | 119 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.id); |
119 | } | 120 | } |
120 | } else if(event.target.id === "elementClass") { | 121 | } else if(event.target.id === "elementClass") { |
121 | if(this.application.ninja.selectedElements.length) { | 122 | if(this.application.ninja.selectedElements.length) { |
122 | ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, "Change", "pi"); | 123 | ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, this.application.ninja.selectedElements[0].className, "pi"); |
123 | } else { | 124 | } else { |
124 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass); | 125 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass); |
125 | } | 126 | } |