diff options
author | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-21 09:53:08 -0700 |
commit | beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7 (patch) | |
tree | 71ee74df0c3a56b680e4aa80f23905fcb1cc84f1 /js/controllers | |
parent | 37cafa09653ff3e2cb88c5b51cdc1f6e066aa3e8 (diff) | |
parent | 31eee2972667d7553974f0857fdc458954219203 (diff) | |
download | ninja-beb72aa033f42d09d54a4ea6cc6b5ca59cc6fae7.tar.gz |
Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-Components
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/selection-controller.js | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index fa82d4cc..9b0e638a 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -155,28 +155,6 @@ exports.SelectionController = Montage.create(Component, { | |||
155 | this._isDocument = true; | 155 | this._isDocument = true; |
156 | } | 156 | } |
157 | 157 | ||
158 | if(item && item.controller && !item.elementModel.isComponent) { | ||
159 | var componentInfo = Montage.getInfoForObject(item.controller); | ||
160 | var componentName = componentInfo.objectName.toLowerCase(); | ||
161 | switch(componentName) { | ||
162 | case "feedreader": | ||
163 | NJUtils.makeElementModel(item, "Feed Reader", "component", false); | ||
164 | item.elementModel.pi = "FeedReaderPi"; | ||
165 | item.elementModel.isComponent = true; | ||
166 | break; | ||
167 | case "map": | ||
168 | NJUtils.makeElementModel(item, "Map", "component", false); | ||
169 | item.elementModel.pi = "MapPi"; | ||
170 | item.elementModel.isComponent = true; | ||
171 | break; | ||
172 | case "youtubechannel": | ||
173 | NJUtils.makeElementModel(item, "Youtube Channel", "component", false); | ||
174 | item.elementModel.pi = "YoutubeChannelPi"; | ||
175 | item.elementModel.isComponent = true; | ||
176 | break; | ||
177 | } | ||
178 | } | ||
179 | |||
180 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | 158 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); |
181 | 159 | ||
182 | } | 160 | } |