diff options
author | Eric Guzman | 2012-04-04 11:36:22 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 11:36:22 -0700 |
commit | af52148777d554dc6e55a736574b82e4916f1fea (patch) | |
tree | 39705d138b489d2e90722238c850320fd6b6a8e9 /js/mediators/element-mediator.js | |
parent | b7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Conflicts:
js/controllers/presets-controller.js
Diffstat (limited to 'js/mediators/element-mediator.js')
-rwxr-xr-x | js/mediators/element-mediator.js | 218 |
1 files changed, 63 insertions, 155 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index d62fa1f8..09f2aeed 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -5,147 +5,82 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
8 | NJComponent = require("js/lib/nj-base").NJComponent; | 8 | Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | var ElementController = require("js/controllers/elements/element-controller").ElementController, | 10 | var ElementController = require("js/controllers/elements/element-controller").ElementController, |
11 | Command = require("js/controllers/undo-controller").Command, | 11 | Command = require("js/controllers/undo-controller").Command, |
12 | GroupCommand = require("js/controllers/undo-controller").GroupCommand, | ||
13 | NJUtils = require("js/lib/NJUtils").NJUtils; | 12 | NJUtils = require("js/lib/NJUtils").NJUtils; |
14 | 13 | ||
15 | exports.ElementMediator = Montage.create(NJComponent, { | 14 | exports.ElementMediator = Montage.create(Component, { |
16 | 15 | ||
17 | deleteDelegate: { | ||
18 | value: null | ||
19 | }, | ||
20 | 16 | ||
21 | deserializedFromTemplate: { | 17 | addDelegate: { |
22 | value: function () { | 18 | enumerable: false, |
23 | this.eventManager.addEventListener("elementAdding", this, false); | 19 | value: null |
24 | this.eventManager.addEventListener("deleting", this, false); | ||
25 | } | ||
26 | }, | 20 | }, |
27 | 21 | ||
28 | // TODO use the specific controller to be able to subclass the functionality | 22 | deleteDelegate: { |
29 | handleElementAdding: { | 23 | enumerable: false, |
30 | value: function(event) { | 24 | value: null |
31 | this.addElement(event.detail.el, event.detail.data); | ||
32 | } | ||
33 | }, | 25 | }, |
34 | 26 | ||
35 | handleDeleting: { | 27 | addElements: { |
36 | value: function(event) { | 28 | value: function(elements, rules, notify) { |
37 | if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) { | 29 | if(Array.isArray(elements)) { |
38 | this.deleteDelegate.handleDelete(); | 30 | elements.forEach(function(element) { |
31 | element = element; | ||
32 | ElementController.addElement(element, rules); | ||
33 | }); | ||
39 | } else { | 34 | } else { |
40 | // Add the Undo/Redo | 35 | ElementController.addElement(elements, rules); |
41 | var els = [], | ||
42 | len = this.application.ninja.selectedElements.length; | ||
43 | 36 | ||
44 | if(len) { | 37 | // TODO - Check with webgl branch - Props seem to be already there. |
45 | for(var i = 0; i<len; i++) { | 38 | var prop3d = this.get3DProperties(elements); |
46 | els.push(this.application.ninja.selectedElements[i]); | 39 | if(prop3d) { |
47 | } | 40 | elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true); |
48 | |||
49 | for(i=0; i<len; i++) { | ||
50 | this._removeElement(els[i]._element); | ||
51 | } | ||
52 | |||
53 | NJevent( "deleteSelection", els ); | ||
54 | } | 41 | } |
55 | } | 42 | } |
56 | } | ||
57 | }, | ||
58 | |||
59 | addElement: { | ||
60 | value: function(el, rules, noEvent) { | ||
61 | var command = Montage.create(Command, { | ||
62 | _el: { value: el }, | ||
63 | _rules: { value: rules }, | ||
64 | _noEvent: { value: noEvent }, | ||
65 | 43 | ||
66 | description: { value: "Adding Element"}, | 44 | if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") { |
45 | this.addDelegate['onAddElements'].call(this.addDelegate, elements); | ||
46 | } | ||
67 | 47 | ||
68 | receiver: { value: this}, | 48 | var undoLabel = "add element"; |
69 | 49 | ||
70 | execute: { | 50 | document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify); |
71 | value: function() { | ||
72 | this.receiver._addElement(this._el, this._rules, this._noEvent); | ||
73 | return this._el; | ||
74 | } | ||
75 | }, | ||
76 | |||
77 | unexecute: { | ||
78 | value: function() { | ||
79 | this.receiver._removeElement(this._el, this._rules, this._noEvent); | ||
80 | return this._el; | ||
81 | } | ||
82 | } | ||
83 | }); | ||
84 | 51 | ||
85 | NJevent("sendToUndo", command); | 52 | this.application.ninja.documentController.activeDocument.needsSave = true; |
86 | command.execute(); | ||
87 | } | ||
88 | }, | ||
89 | 53 | ||
90 | _addElement: { | 54 | if(notify || notify === undefined) { |
91 | value: function(el, rules, noEvent) { | 55 | NJevent("elementAdded", elements); |
92 | ElementController.addElement(el, rules); | ||
93 | var p3d = this.get3DProperties(el); | ||
94 | if(p3d) { | ||
95 | el.elementModel.controller["set3DProperties"](el, [p3d], 0, true); | ||
96 | } | ||
97 | if(!noEvent) { | ||
98 | this.application.ninja.documentController.activeDocument.needsSave = true; | ||
99 | NJevent("elementAdded", el); | ||
100 | } | 56 | } |
101 | } | 57 | } |
102 | }, | 58 | }, |
103 | 59 | ||
104 | deleteElements: { | 60 | removeElements: { |
105 | value: function(items) { | 61 | value: function(elements, notify /* Used for the add undo */) { |
106 | // Add the Undo/Redo | ||
107 | var len, el; | ||
108 | 62 | ||
109 | len = items.length; | 63 | if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) { |
64 | return this.deleteDelegate.handleDelete(); | ||
65 | // this.handleDelete.call(deleteDelegate); | ||
66 | } | ||
110 | 67 | ||
111 | if(len) { | 68 | if(Array.isArray(elements)) { |
69 | elements = Array.prototype.slice.call(elements, 0); | ||
70 | elements.forEach(function(element) { | ||
71 | ElementController.removeElement(element); | ||
72 | }); | ||
73 | } else { | ||
74 | ElementController.removeElement(elements); | ||
75 | } | ||
112 | 76 | ||
113 | for(var i = len - 1; i >= 0; i--) { | 77 | var undoLabel = "add element"; |
114 | el = items[i]._element || items[i]; | ||
115 | this._removeElement(el); | ||
116 | } | ||
117 | 78 | ||
118 | NJevent( "deleteSelection", items ); | 79 | document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify); |
119 | } | ||
120 | } | ||
121 | }, | ||
122 | 80 | ||
123 | _removeElement: { | ||
124 | value: function(el, rules) { | ||
125 | ElementController.removeElement(el, rules); | ||
126 | this.application.ninja.documentController.activeDocument.needsSave = true; | 81 | this.application.ninja.documentController.activeDocument.needsSave = true; |
127 | NJevent("elementDeleted", el); | ||
128 | } | ||
129 | }, | ||
130 | |||
131 | replaceElement: { | ||
132 | value: function(el, el2) { | ||
133 | el2.elementModel = el.elementModel; | ||
134 | this.application.ninja.currentDocument.documentRoot.replaceChild(el2, el); | ||
135 | } | ||
136 | }, | ||
137 | 82 | ||
138 | getNJProperty: { | 83 | NJevent("elementsRemoved", elements); |
139 | value: function(el, p) { | ||
140 | if(el.elementModel) { | ||
141 | if(el.elementModel.hasOwnProperty(p)) { | ||
142 | return el.elementModel[p]; | ||
143 | } else { | ||
144 | console.log("Element Model does not have ", p); | ||
145 | } | ||
146 | } else { | ||
147 | console.log("Element has no Model -- Create one"); | ||
148 | } | ||
149 | } | 84 | } |
150 | }, | 85 | }, |
151 | 86 | ||
@@ -204,9 +139,7 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
204 | } else { | 139 | } else { |
205 | // Calculate currentValue if not found for each element | 140 | // Calculate currentValue if not found for each element |
206 | if(currentValue === null) { | 141 | if(currentValue === null) { |
207 | console.log("Here"); | 142 | currentValue = el.getAttribute(att); |
208 | var item = el._element || el; | ||
209 | currentValue = item.getAttribute(att); | ||
210 | } | 143 | } |
211 | 144 | ||
212 | var command = Montage.create(Command, { | 145 | var command = Montage.create(Command, { |
@@ -245,9 +178,7 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
245 | 178 | ||
246 | _setAttribute: { | 179 | _setAttribute: { |
247 | value: function(el, att, value, eventType, source) { | 180 | value: function(el, att, value, eventType, source) { |
248 | var item = el._element || el; | 181 | el.elementModel.controller["setAttribute"](el, att, value); |
249 | |||
250 | item.elementModel.controller["setAttribute"](item, att, value); | ||
251 | 182 | ||
252 | NJevent("attribute" + eventType, {type : "setAttribute", source: source, data: {"els": el, "prop": att, "value": value}, redraw: null}); | 183 | NJevent("attribute" + eventType, {type : "setAttribute", source: source, data: {"els": el, "prop": att, "value": value}, redraw: null}); |
253 | } | 184 | } |
@@ -274,7 +2 |