aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorEric Guzman2012-03-20 15:03:45 -0700
committerEric Guzman2012-03-20 15:03:45 -0700
commit22dd8732cfd52f6d9db3fca674a375bf3ff13702 (patch)
treef0878c45b3325d86f6d9da9f581ebad5e1603354 /js/controllers
parent36ce3c432a40f01338b0f4731b100d7a7e71a823 (diff)
parent803286628560fd79a57028c65c42c7f19a89c746 (diff)
downloadninja-22dd8732cfd52f6d9db3fca674a375bf3ff13702.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedReaderAnimation
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/selection-controller.js27
1 files changed, 0 insertions, 27 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 5091f99a..9b0e638a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -155,33 +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 case "picasacarousel":
178 NJUtils.makeElementModel(item, "Picasa Carousel", "component", false);
179 item.elementModel.pi = "PicasaCarouselPi";
180 item.elementModel.isComponent = true;
181 break;
182 }
183 }
184
185 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); 158 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
186 159
187 } 160 }