From 180f728f833f4c9347fe5cc1cc14a35d9fb04c07 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 9 Feb 2012 11:43:33 -0800 Subject: Squashed commit of the following: commit fe0d1578305db78eb5a744c354dbbb3cec67be2a Author: Kruti Shah Date: Thu Feb 9 11:43:53 2012 -0800 Removing a flag Signed-off-by: Kruti Shah commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62 Author: Kruti Shah Date: Thu Feb 9 11:42:39 2012 -0800 Timeline : Selection Handling depending on layer selected Signed-off-by: Kruti Shah commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945 Merge: ad214f9 f6ad57e Author: Kruti Shah Date: Thu Feb 9 09:54:42 2012 -0800 Merge branch 'refs/heads/Timeline' into Timeline_updated Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea Author: Kruti Shah Date: Thu Feb 9 09:40:14 2012 -0800 Timeline : When element selected the corresponding layer highlights Signed-off-by: Kruti Shah Signed-off-by: Jonathan Duran --- js/mediators/element-mediator.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'js/mediators/element-mediator.js') 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, { } }, + deleteElements: { + value: function(items) { + // Add the Undo/Redo + var len, el; + + len = items.length; + + if(len) { + + for(var i = len - 1; i >= 0; i--) { + el = items[i]._element || items[i]; + this._removeElement(el); + } + + NJevent( "deleteSelection", items ); + } + } + }, + _removeElement: { value: function(el, rules) { ElementController.removeElement(el, rules); -- cgit v1.2.3