diff options
-rwxr-xr-x | js/controllers/selection-controller.js | 27 | ||||
-rwxr-xr-x | js/lib/NJUtils.js | 32 | ||||
-rw-r--r-- | node_modules/components-data/feed-reader.json | 6 |
3 files changed, 36 insertions, 29 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 | } |
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js index 4f1082f9..904aa41e 100755 --- a/js/lib/NJUtils.js +++ b/js/lib/NJUtils.js | |||
@@ -96,15 +96,45 @@ exports.NJUtils = Object.create(Object.prototype, { | |||
96 | value: function(el, selection, controller, isShape) { | 96 | value: function(el, selection, controller, isShape) { |
97 | var p3d = Montage.create(Properties3D).init(el); | 97 | var p3d = Montage.create(Properties3D).init(el); |
98 | var shapeProps = null; | 98 | var shapeProps = null; |
99 | var pi = controller + "Pi"; | ||
100 | |||
99 | if(isShape) { | 101 | if(isShape) { |
100 | shapeProps = Montage.create(ShapeModel); | 102 | shapeProps = Montage.create(ShapeModel); |
101 | } | 103 | } |
102 | 104 | ||
105 | if(el.controller) { | ||
106 | |||
107 | var componentInfo = Montage.getInfoForObject(el.controller); | ||
108 | var componentName = componentInfo.objectName.toLowerCase(); | ||
109 | |||
110 | controller = "component"; | ||
111 | isShape = false; | ||
112 | |||
113 | switch(componentName) { | ||
114 | case "feedreader": | ||
115 | selection = "Feed Reader"; | ||
116 | pi = "FeedReaderPi"; | ||
117 | break; | ||
118 | case "map": | ||
119 | selection = "Map"; | ||
120 | pi = "MapPi"; | ||
121 | break; | ||
122 | case "youtubechannel": | ||
123 | selection = "Youtube Channel"; | ||
124 | pi = "YoutubeChannelPi"; | ||
125 | break; | ||
126 | case "picasacarousel": | ||
127 | selection = "Picasa Carousel"; | ||
128 | pi = "PicasaCarouselPi"; | ||
129 | break; | ||
130 | } | ||
131 | } | ||
132 | |||
103 | el.elementModel = Montage.create(ElementModel, { | 133 | el.elementModel = Montage.create(ElementModel, { |
104 | type: { value: el.nodeName}, | 134 | type: { value: el.nodeName}, |
105 | selection: { value: selection}, | 135 | selection: { value: selection}, |
106 | controller: { value: ControllerFactory.getController(controller)}, | 136 | controller: { value: ControllerFactory.getController(controller)}, |
107 | pi: { value: controller + "Pi"}, | 137 | pi: { value: pi}, |
108 | props3D: { value: p3d}, | 138 | props3D: { value: p3d}, |
109 | shapeModel: { value: shapeProps} | 139 | shapeModel: { value: shapeProps} |
110 | }); | 140 | }); |
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 923222db..b2b240b2 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
@@ -16,5 +16,9 @@ | |||
16 | "type": "string", | 16 | "type": "string", |
17 | "default": "timer" | 17 | "default": "timer" |
18 | } | 18 | } |
19 | ] | 19 | ], |
20 | "defaultStyles": { | ||
21 | "width":"350px", | ||
22 | "height":"250px" | ||
23 | } | ||
20 | } \ No newline at end of file | 24 | } \ No newline at end of file |