diff options
author | Valerio Virgillito | 2012-03-19 15:23:32 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-19 15:23:32 -0700 |
commit | 38a3258239aef114c23fe0ce179257639a74d96b (patch) | |
tree | 8ac886989eac57126bc48099ec395c9f14c9c829 /js | |
parent | e9244d5a0f681ddde5896392c17738add2948687 (diff) | |
parent | f9e31800b1dedd7904e6e23c575c94ed4a72abdb (diff) | |
download | ninja-38a3258239aef114c23fe0ce179257639a74d96b.tar.gz |
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/selection-controller.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index fa82d4cc..5091f99a 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -174,6 +174,11 @@ exports.SelectionController = Montage.create(Component, { | |||
174 | item.elementModel.pi = "YoutubeChannelPi"; | 174 | item.elementModel.pi = "YoutubeChannelPi"; |
175 | item.elementModel.isComponent = true; | 175 | item.elementModel.isComponent = true; |
176 | break; | 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; | ||
177 | } | 182 | } |
178 | } | 183 | } |
179 | 184 | ||