diff options
35 files changed, 359 insertions, 523 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js index 9f007456..8df868a2 100755 --- a/js/components/SliderBase.js +++ b/js/components/SliderBase.js | |||
@@ -268,7 +268,6 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
268 | 268 | ||
269 | _dispatchActionEvent: { | 269 | _dispatchActionEvent: { |
270 | value: function() { | 270 | value: function() { |
271 | // console.log("dispatching event", this._element.id, this._eventType, this._wasSetByCode); | ||
272 | var actionEvent = document.createEvent("CustomEvent"); | 271 | var actionEvent = document.createEvent("CustomEvent"); |
273 | actionEvent.initEvent(this._eventType, true, true); | 272 | actionEvent.initEvent(this._eventType, true, true); |
274 | actionEvent.type = this._eventType; | 273 | actionEvent.type = this._eventType; |
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index b35251ad..efb33292 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -5,22 +5,27 @@ 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 = exports.ElementController = Montage.create(NJComponent, { | 10 | exports.ElementController = Montage.create(Component, { |
11 | 11 | ||
12 | addElement: { | 12 | addElement: { |
13 | value: function(el, styles) { | 13 | value: function(el, styles) { |
14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); |
15 | // Nested elements - | 15 | // Nested elements - TODO make sure the CSS is correct before nesting elements |
16 | // TODO make sure the CSS is correct before nesting elements | ||
17 | // this.application.ninja.currentSelectedContainer.appendChild(el); | 16 | // this.application.ninja.currentSelectedContainer.appendChild(el); |
18 | this.application.ninja.stylesController.setElementStyles(el, styles); | 17 | if(styles) { |
18 | this.application.ninja.stylesController.setElementStyles(el, styles); | ||
19 | } | ||
19 | } | 20 | } |
20 | }, | 21 | }, |
21 | 22 | ||
23 | // Remove the element from the DOM and clear the GLWord. | ||
22 | removeElement: { | 24 | removeElement: { |
23 | value: function(el) { | 25 | value: function(el) { |
26 | if(el.elementModel && el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) { | ||
27 | el.elementModel.shapeModel.GLWorld.clearTree(); | ||
28 | } | ||
24 | el.parentNode.removeChild(el); | 29 | el.parentNode.removeChild(el); |
25 | } | 30 | } |
26 | }, | 31 | }, |
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index ef453bea..c9164e3e 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -72,8 +72,9 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
72 | canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom()); | 72 | canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom()); |
73 | canvas.width = el.width; | 73 | canvas.width = el.width; |
74 | canvas.height = el.height; | 74 | canvas.height = el.height; |
75 | this.application.ninja.elementMediator.replaceElement(el, canvas); | 75 | canvas.elementModel = el.elementModel; |
76 | NJevent("elementDeleted", el); | 76 | this.application.ninja.currentDocument.documentRoot.replaceChild(canvas, el); |
77 | NJevent("elementsRemoved", el); | ||
77 | el = canvas; | 78 | el = canvas; |
78 | this.toggleWebGlMode(el, value); | 79 | this.toggleWebGlMode(el, value); |
79 | el.elementModel.shapeModel.GLWorld.render(); | 80 | el.elementModel.shapeModel.GLWorld.render(); |
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 7152ba93..0467f73c 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js | |||
@@ -59,16 +59,14 @@ exports.PresetsController = Montage.create(Component, { | |||
59 | }, this); | 59 | }, this); |
60 | 60 | ||
61 | selection.forEach(function(element) { | 61 | selection.forEach(function(element) { |
62 | var el = element._element; | ||
63 | |||
64 | if(useTransition) { | 62 | if(useTransition) { |
65 | this.addTransition(el); | 63 | this.addTransition(element); |
66 | } | 64 | } |
67 | 65 | ||
68 | el.classList.add(selectorBase); | 66 | element.classList.add(selectorBase); |
69 | 67 | ||
70 | //// Keep track of elements with presets and don't add duplicates | 68 | //// Keep track of elements with presets and don't add duplicates |
71 | this.setCachedPreset(el, presetData.id, rules); | 69 | this.setCachedPreset(element, presetData.id, rules); |
72 | 70 | ||
73 | }, this); | 71 | }, this); |
74 | 72 | ||
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 53cca029..dbb3f30d 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -6,8 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | 7 | ||
8 | var Montage = require("montage/core/core").Montage, | 8 | var Montage = require("montage/core/core").Montage, |
9 | Component = require("montage/ui/component").Component, | 9 | Component = require("montage/ui/component").Component; |
10 | NJUtils = require("js/lib/NJUtils").NJUtils; | ||
11 | 10 | ||
12 | exports.SelectionController = Montage.create(Component, { | 11 | exports.SelectionController = Montage.create(Component, { |
13 | 12 | ||
@@ -45,13 +44,10 @@ exports.SelectionController = Montage.create(Component, { | |||
45 | value: function() { | 44 | value: function() { |
46 | this.eventManager.addEventListener("openDocument", this, false); | 45 | this.eventManager.addEventListener("openDocument", this, false); |
47 | this.eventManager.addEventListener("elementAdded", this, false); | 46 | this.eventManager.addEventListener("elementAdded", this, false); |
48 | this.eventManager.addEventListener("elementDeleted", this, false); | 47 | this.eventManager.addEventListener("elementsRemoved", this, false); |
49 | this.eventManager.addEventListener("selectAll", this, false); | 48 | this.eventManager.addEventListener("selectAll", this, false); |
50 | this.eventManager.addEventListener("deleteSelection", this, false); | ||
51 | this.eventManager.addEventListener("switchDocument", this, false); | 49 | this.eventManager.addEventListener("switchDocument", this, false); |
52 | this.eventManager.addEventListener("closeDocument", this, false); | 50 | this.eventManager.addEventListener("closeDocument", this, false); |
53 | // defaultEventManager.addEventListener( "undo", this, false); | ||
54 | // defaultEventManager.addEventListener( "redo", this, false); | ||
55 | } | 51 | } |
56 | }, | 52 | }, |
57 | 53 | ||
@@ -67,35 +63,25 @@ exports.SelectionController = Montage.create(Component, { | |||
67 | 63 | ||
68 | initWithDocument: { | 64 | initWithDocument: { |
69 | value: function(currentSelectionArray) { | 65 | value: function(currentSelectionArray) { |
70 | this._selectedItems = []; | ||
71 | this._isDocument = true; | 66 | this._isDocument = true; |
72 | 67 | ||
73 | if(currentSelectionArray) { | 68 | if(currentSelectionArray) { |
74 | if(currentSelectionArray.length >= 1) { | 69 | if(currentSelectionArray.length >= 1) { |
75 | this._selectedItems = currentSelectionArray; | ||
76 | this._isDocument = false; | 70 | this._isDocument = false; |
77 | 71 | ||
78 | |||
79 | |||
80 | this.application.ninja.selectedElements = currentSelectionArray; | 72 | this.application.ninja.selectedElements = currentSelectionArray; |
81 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument}); | 73 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument}); |
82 | |||
83 | |||
84 | |||
85 | } | 74 | } |
86 | } | 75 | } |
87 | 76 | ||
88 | // | ||
89 | this._selectionContainer = this.application.ninja.currentSelectedContainer; | 77 |