aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Frisch2012-03-17 20:03:18 -0700
committerValerio Virgillito2012-03-17 23:16:21 -0700
commit6b1467535198f6b85bd2bf045d2c354b812616c2 (patch)
treeca40c8245b908b50dfa066442fec6f33c1f4b468
parent09852e9b9b8e64f003bed5aa57630d8b42c8ac95 (diff)
downloadninja-6b1467535198f6b85bd2bf045d2c354b812616c2.tar.gz
Youtube video is droppable
still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js11
-rwxr-xr-xnode_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html4
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html2
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html6
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html4
5 files changed, 19 insertions, 8 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 49d1179a..dcb69255 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -366,6 +366,17 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
366 el = NJUtils.makeNJElement("div", "Feed Reader", "component"); 366 el = NJUtils.makeNJElement("div", "Feed Reader", "component");
367 el.elementModel.pi = "FeedReaderPi"; 367 el.elementModel.pi = "FeedReaderPi";
368 el.elementModel.isComponent = true; 368 el.elementModel.isComponent = true;
369 break;
370 case "picasa-carousel":
371 el = NJUtils.makeNJElement("div", "Picasa Carousel", "component");
372 el.elementModel.pi = "PicasaCarouselPi";
373 el.elementModel.isComponent = true;
374 break;
375 case "youtube-channel":
376 el = NJUtils.makeNJElement("div", "Youtube Channel", "component");
377 el.elementModel.pi = "YoutubeChannelPi";
378 el.elementModel.isComponent = true;
379 break;
369 380
370 } 381 }
371 382
diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
index 177eb068..4cb48733 100755
--- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
+++ b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
@@ -24,7 +24,7 @@
24 }, 24 },
25 25
26 "picasa-carousel": { 26 "picasa-carousel": {
27 "prototype": "montage/ui/google/picasa-carousel.reel", 27 "prototype": "montage/ui/picasa-carousel.reel",
28 "properties": { 28 "properties": {
29 "element": {"#": "picasa-carousel"} 29 "element": {"#": "picasa-carousel"}
30 }, 30 },
@@ -51,7 +51,7 @@
51 "element": {"#": "searchButton"} 51 "element": {"#": "searchButton"}
52 } 52 }
53 } 53 }
54 54
55 55
56 56
57 } 57 }
diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index e3d9c7a2..1e94f43b 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
@@ -9,7 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "montage/ui/google/picasa-carousel.reel/image.reel", 12 "module": "montage/ui/picasa-carousel.reel/image.reel",
13 "name": "Image", 13 "name": "Image",
14 "properties": { 14 "properties": {
15 "element": {"#": "Image"} 15 "element": {"#": "Image"}
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 73ccf076..fdb452d7 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "prototype": "montage/ui/google/picasa-carousel.reel", 15 "prototype": "montage/ui/picasa-carousel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 17 "element": {"#": "montage-google-picasa-carousel"},
18 "searchResultsList": {"@": "searchResultsList"} 18 "searchResultsList": {"@": "searchResultsList"}
@@ -29,7 +29,7 @@
29 } 29 }
30 }, 30 },
31 "image1": { 31 "image1": {
32 "prototype": "montage/ui/google/picasa-carousel.reel/image.reel", 32 "prototype": "montage/ui/picasa-carousel.reel/image.reel",
33 "properties": { 33 "properties": {
34 "element": {"#": "image"} 34 "element": {"#": "image"}
35 }, 35 },
@@ -170,7 +170,7 @@
170 170
171</head> 171</head>
172<body> 172<body>
173 173
174 <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel"> 174 <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel">
175 <div id="flow" class="flow"> 175 <div id="flow" class="flow">
176 <img id="image" class="image"/> 176 <img id="image" class="image"/>
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index b3858ec9..184ac360 100644
--- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -10,14 +10,14 @@
10 <script type="text/montage-serialization"> 10 <script type="text/montage-serialization">
11 { 11 {
12 "player": { 12 "player": {
13 "prototype": "ui/youtube-player.reel", 13 "prototype": "montage/ui/youtube-player.reel",
14 "properties": { 14 "properties": {
15 "element": {"#": "player"} 15 "element": {"#": "player"}
16 } 16 }
17 }, 17 },
18 18
19 "owner": { 19 "owner": {
20 "prototype": "youtube-channel.reel", 20 "prototype": "montage/ui/youtube-channel.reel",
21 "properties": { 21 "properties": {
22 "element": {"#": "container"}, 22 "element": {"#": "container"},
23 "player": {"@": "player"} 23 "player": {"@": "player"}