aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Frisch2012-03-17 19:28:30 -0700
committerFrançois Frisch2012-03-17 19:28:30 -0700
commit09852e9b9b8e64f003bed5aa57630d8b42c8ac95 (patch)
treede6f15ae7557a17f105386729952f35783f67647
parenta086ca62423a09807e2f3a79107249bc31d5e908 (diff)
downloadninja-09852e9b9b8e64f003bed5aa57630d8b42c8ac95.tar.gz
Integrating picasa carousel and youtube channel
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js16
-rw-r--r--node_modules/components-data/map.json4
-rw-r--r--node_modules/components-data/picasa-carousel.json15
-rw-r--r--node_modules/components-data/youtube-channel.json16
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/index.html2
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html (renamed from node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.html)0
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js (renamed from node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.js)0
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css (renamed from node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.css)0
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html (renamed from node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.html)0
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js (renamed from node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.js)0
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html (renamed from node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.html)2
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.js (renamed from node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.js)4
12 files changed, 50 insertions, 9 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 92d21bc3..49d1179a 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -26,19 +26,29 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
26 "text": "Widgets", 26 "text": "Widgets",
27 "children": [ 27 "children": [
28 { 28 {
29 "text": "Feed Reader",
30 "dataFile" : "node_modules/components-data/feed-reader.json",
31 "component": "feedreader"
32 },
33 {
29 "text": "Map", 34 "text": "Map",
30 "dataFile" : "node_modules/components-data/map.json", 35 "dataFile" : "node_modules/components-data/map.json",
31 "component": "map" 36 "component": "map"
32 }, 37 },
33 { 38 {
34 "text": "Feed Reader", 39 "text": "Picasa Carousel",
35 "dataFile" : "node_modules/components-data/feed-reader.json", 40 "dataFile" : "node_modules/components-data/picasa-carousel.json",
36 "component": "feedreader" 41 "component": "picasa-carousel"
37 }, 42 },
38 { 43 {
39 "text": "Search Bar", 44 "text": "Search Bar",
40 "dataFile" : "node_modules/components-data/searchfield.json", 45 "dataFile" : "node_modules/components-data/searchfield.json",
41 "component": "searchfield" 46 "component": "searchfield"
47 },
48 {
49 "text": "Youtube Channel",
50 "dataFile" : "node_modules/components-data/youtube-channel.json",
51 "component": "youtube-channel"
42 } 52 }
43 ] 53 ]
44 }, 54 },
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index 071fa73a..796b2fad 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -9,13 +9,13 @@
9 { 9 {
10 "name": "category", 10 "name": "category",
11 "type": "string", 11 "type": "string",
12 "default": null, 12 "default": "",
13 "possibleValues": ["restaurant", "hospital", "cafe", "museum"] 13 "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
14 }, 14 },
15 { 15 {
16 "name": "center", 16 "name": "center",
17 "type": "string", 17 "type": "string",
18 "default": null 18 "default": ""
19 } 19 }
20 20
21 ] 21 ]
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
new file mode 100644
index 00000000..34fe0e8f
--- /dev/null
+++ b/node_modules/components-data/picasa-carousel.json
@@ -0,0 +1,15 @@
1{
2 "component": "picasa-carousel",
3
4 "module": "montage/ui/picasa-carousel.reel",
5
6 "name": "PicasaCarousel",
7
8 "properties": [
9 {
10 "name": "queryParameter",
11 "type": "string",
12 "default": ""
13 }
14 ]
15} \ No newline at end of file
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
new file mode 100644
index 00000000..8affffba
--- /dev/null
+++ b/node_modules/components-data/youtube-channel.json
@@ -0,0 +1,16 @@
1{
2 "component": "youtube-channel",
3
4 "module": "montage/ui/youtube-channel.reel",
5
6 "name": "YoutubeChannel",
7
8 "properties": [
9 {
10 "name": "channelUrl",
11 "type": "string",
12 "default": ""
13 }
14
15 ]
16} \ No newline at end of file
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html
index 71baba29..b313d5d8 100755
--- a/node_modules/montage/examples/youtube-channel-example/index.html
+++ b/node_modules/montage/examples/youtube-channel-example/index.html
@@ -12,7 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "player": { 14 "player": {
15 "prototype": "youtube-channel.reel", 15 "prototype": "montage/ui/youtube-channel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "player"} 17 "element": {"#": "player"}
18 } 18 }
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index e3d9c7a2..e3d9c7a2 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.js b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
index 0bced41b..0bced41b 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
index cab6d1bb..cab6d1bb 100755
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 73ccf076..73ccf076 100755
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index 25d363b0..25d363b0 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
diff --git a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index 8514f5ce..b3858ec9 100644
--- a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -10,7 +10,7 @@
10 <script type="text/montage-serialization"> 10 <script type="text/montage-serialization">
11 { 11 {
12 "player": { 12 "player": {
13 "prototype": "montage/ui/youtube-player.reel", 13 "prototype": "ui/youtube-player.reel",
14 "properties": { 14 "properties": {
15 "element": {"#": "player"} 15 "element": {"#": "player"}
16 } 16 }
diff --git a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.js b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js
index 1f5aa2d1..fd642290 100644
--- a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js
@@ -5,8 +5,8 @@
5 </copyright> */ 5 </copyright> */
6/*global require,exports*/ 6/*global require,exports*/
7var Montage = require("montage").Montage, 7var Montage = require("montage").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("ui/component").Component,
9 Uuid = require("montage/core/uuid").Uuid; 9 Uuid = require("core/uuid").Uuid;
10 10
11 11
12var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, { 12var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {