diff options
author | Jonathan Duran | 2012-02-09 11:43:33 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-09 11:43:33 -0800 |
commit | 180f728f833f4c9347fe5cc1cc14a35d9fb04c07 (patch) | |
tree | c07bb92cc1e2cfc6b23fcd0956b049786379421a /js/mediators | |
parent | 9d398be7bab02d7c53ac0a52d1d041da27af09e7 (diff) | |
download | ninja-180f728f833f4c9347fe5cc1cc14a35d9fb04c07.tar.gz |
Squashed commit of the following:
commit fe0d1578305db78eb5a744c354dbbb3cec67be2a
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 11:43:53 2012 -0800
Removing a flag
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 11:42:39 2012 -0800
Timeline : Selection Handling depending on layer selected
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945
Merge: ad214f9 f6ad57e
Author: Kruti Shah <kruti.shah@motorola.com>
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 <kruti.shah@motorola.com>
commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 09:40:14 2012 -0800
Timeline : When element selected the corresponding layer highlights
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/element-mediator.js | 19 |
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); |