aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 13:35:15 -0800
committerValerio Virgillito2012-02-09 13:35:15 -0800
commitcebd27bd649d01c8b8713651df3878da14b5e9a8 (patch)
tree3d20d838f2f6892a07cf16c4c959e234f96ee60b /js/mediators
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
parent2092acf520e3f346f15e42c76c2f616e7d094c97 (diff)
downloadninja-cebd27bd649d01c8b8713651df3878da14b5e9a8.tar.gz
Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch
Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/element-mediator.js19
1 files changed, 19 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 9aefbca6..95aec2a3 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -105,6 +105,25 @@ exports.ElementMediator = Montage.create(NJComponent, {
105 } 105 }
106 }, 106 },
107 107
108 deleteElements: {
109 value: function(items) {
110 // Add the Undo/Redo
111 var len, el;
112
113 len = items.length;
114
115 if(len) {
116
117 for(var i = len - 1; i >= 0; i--) {
118 el = items[i]._element || items[i];
119 this._removeElement(el);
120 }
121
122 NJevent( "deleteSelection", items );
123 }
124 }
125 },
126
108 _removeElement: { 127 _removeElement: {
109 value: function(el, rules) { 128 value: function(el, rules) {
110 ElementController.removeElement(el, rules); 129 ElementController.removeElement(el, rules);