From 54eb5672a5f43fb157aa7ecb88b0ba8a06296b86 Mon Sep 17 00:00:00 2001
From: François Frisch
Date: Sun, 18 Mar 2012 22:25:35 -0700
Subject: using channel name rather than url
---
.../montage/examples/youtube-channel-example/index.html | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'node_modules/montage/examples')
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html
index b313d5d8..f3a0592a 100755
--- a/node_modules/montage/examples/youtube-channel-example/index.html
+++ b/node_modules/montage/examples/youtube-channel-example/index.html
@@ -14,7 +14,8 @@
"player": {
"prototype": "montage/ui/youtube-channel.reel",
"properties": {
- "element": {"#": "player"}
+ "element": {"#": "player"},
+ "channel": "drive"
}
},
@@ -23,12 +24,6 @@
"properties": {
"element": {"#": "url"},
"value": "http://www.youtube.com/TEDEducation"
- },
- "bindings": {
- "value": {
- "boundObject": {"@": "player"},
- "boundObjectPropertyPath": "channelUrl"
- }
}
}
}
@@ -37,7 +32,7 @@
--
cgit v1.2.3
From 9d364be255900e9bde02c4b254d145ec41fc78fb Mon Sep 17 00:00:00 2001
From: Kishore Subramanian
Date: Mon, 19 Mar 2012 10:36:49 -0700
Subject: Changes to the Demo
- Feed Reader now shows one entry at a time
- Category dropdown removed form the Map. It is included as part of the example code
- Changed the categories that do not return results
---
.../examples/feed-reader/images/47-fuel.png | Bin 0 -> 3091 bytes
.../feed-reader/images/80-shopping-cart.png | Bin 0 -> 2963 bytes
.../examples/feed-reader/images/88-beer-mug.png | Bin 0 -> 3087 bytes
.../examples/feed-reader/main.reel/main.html | 26 +++++++++++++++++++++
.../montage/examples/feed-reader/main.reel/main.js | 10 ++++++++
5 files changed, 36 insertions(+)
create mode 100644 node_modules/montage/examples/feed-reader/images/47-fuel.png
create mode 100644 node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
create mode 100644 node_modules/montage/examples/feed-reader/images/88-beer-mug.png
(limited to 'node_modules/montage/examples')
diff --git a/node_modules/montage/examples/feed-reader/images/47-fuel.png b/node_modules/montage/examples/feed-reader/images/47-fuel.png
new file mode 100644
index 00000000..617d7640
Binary files /dev/null and b/node_modules/montage/examples/feed-reader/images/47-fuel.png differ
diff --git a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
new file mode 100644
index 00000000..51a5f86f
Binary files /dev/null and b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png differ
diff --git a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
new file mode 100644
index 00000000..b0fdd99a
Binary files /dev/null and b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png differ
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
index 8ea9a79b..ef4fc92a 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -79,6 +79,13 @@
"element": {"#": "map"}
}
},
+
+ "types": {
+ "prototype": "montage/ui/select-input.reel",
+ "properties": {
+ "element": {"#": "types"}
+ }
+ },
"owner": {
"module": "main.reel",
@@ -92,6 +99,10 @@
"mapCenter": {
"boundObject": {"@": "mapCenter"},
"boundObjectPropertyPath": "value"
+ },
+ "mapCategory": {
+ "boundObject": {"@": "types"},
+ "boundObjectPropertyPath": "value"
}
}
}
@@ -140,6 +151,10 @@
visibility: hidden;
}
+ #map, #feed-reader {
+ margin-top: 10px;
+ }
+
@@ -168,6 +183,17 @@
Map
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.js b/node_modules/montage/examples/feed-reader/main.reel/main.js
index bea5f91a..06d8fdba 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.js
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.js
@@ -13,6 +13,16 @@ exports.Main = Montage.create(Component, {
distinct: true
},
+ mapCategory: {
+ get: function() {
+ return this._mapCategory;
+ },
+ set: function(value) {
+ this._mapCategory = value;
+ this.map.category = value;
+ }
+ },
+
feedReader: {value: null},
map: {value: null},
--
cgit v1.2.3
From ec58642a7b31165890eb5bef7d95ce59dd0c34a0 Mon Sep 17 00:00:00 2001
From: Kishore Subramanian
Date: Mon, 19 Mar 2012 14:14:29 -0700
Subject: Changes to Map and FeedReader
- Added traffic property to Map
- Support for show/hide traffic in the example
- Changed FeedReader to use only one DIV. No longer uses Repetition
- Support multiple modes in the Feed reader - timed/animated---
.../examples/feed-reader/main.reel/main.html | 32 ++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
(limited to 'node_modules/montage/examples')
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
index ef4fc92a..50bac601 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -44,7 +44,9 @@
"module": "montage/ui/feed-reader/feed-reader.reel",
"name": "FeedReader",
"properties": {
- "element": {"#": "feed-reader"}
+ "element": {"#": "feed-reader"},
+ "feedDisplayMode": "timed",
+ "interval": "5"
}
},
@@ -76,7 +78,14 @@
"map": {
"prototype": "montage/ui/map.reel",
"properties": {
- "element": {"#": "map"}
+ "element": {"#": "map"},
+ "traffic": false
+ },
+ "bindings": {
+ "traffic": {
+ "boundObject": {"@": "traffic"},
+ "boundObjectPropertyPath": "checked"
+ }
}
},
@@ -86,6 +95,12 @@
"element": {"#": "types"}
}
},
+ "traffic": {
+ "prototype": "montage/ui/checkbox.reel",
+ "properties": {
+ "element": {"#": "traffic"}
+ }
+ },
"owner": {
"module": "main.reel",
@@ -155,6 +170,18 @@
margin-top: 10px;
}
+ /*
+ .feed-reader .feed-entry {
+ visibility:hidden;
+ opacity:0;
+ transition:visibility 0s linear 0.5s,opacity 0.5s linear;
+ }
+ .feed-reader .feed-entry .active {
+ visibility:visible;
+ opacity:1;
+ transition-delay:0s;
+ }
+ */
@@ -194,6 +221,7 @@
+ Show Traffic
Map
--
cgit v1.2.3
From e438756a18e4ae46cd4713e81f0bc4a1d2ddea15 Mon Sep 17 00:00:00 2001
From: Stuart Knightley
Date: Mon, 19 Mar 2012 15:13:28 -0700
Subject: Update Youtube channel to have three thumbnails
---
.../montage/examples/youtube-channel-example/index.html | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'node_modules/montage/examples')
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html
index f3a0592a..132d0d5a 100755
--- a/node_modules/montage/examples/youtube-channel-example/index.html
+++ b/node_modules/montage/examples/youtube-channel-example/index.html
@@ -15,7 +15,7 @@
"prototype": "montage/ui/youtube-channel.reel",
"properties": {
"element": {"#": "player"},
- "channel": "drive"
+ "channelUrl": "http://www.youtube.com/TEDEducation"
}
},
@@ -24,6 +24,12 @@
"properties": {
"element": {"#": "url"},
"value": "http://www.youtube.com/TEDEducation"
+ },
+ "bindings": {
+ "value": {
+ "boundObject": {"@": "player"},
+ "boundObjectPropertyPath": "channelUrl"
+ }
}
}
}
@@ -32,7 +38,7 @@
--
cgit v1.2.3
From 64f2a4b6c0ca9e47996ab9bcec05b51d1e1194e4 Mon Sep 17 00:00:00 2001
From: Kishore Subramanian
Date: Tue, 20 Mar 2012 09:42:29 -0700
Subject: Animation for the Feed reader
---
.../examples/feed-reader/main.reel/main.html | 42 ++++++++++++++++++++--
1 file changed, 39 insertions(+), 3 deletions(-)
(limited to 'node_modules/montage/examples')
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
index 50bac601..1313219f 100644
--- a/node_modules/montage/examples/feed-reader/main.reel/main.html
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -45,8 +45,8 @@
"name": "FeedReader",
"properties": {
"element": {"#": "feed-reader"},
- "feedDisplayMode": "timed",
- "interval": "5"
+ "feedDisplayMode": "animation",
+ "interval": "3"
}
},
@@ -170,6 +170,7 @@
margin-top: 10px;
}
+
/*
.feed-reader .feed-entry {
visibility:hidden;
@@ -182,7 +183,42 @@
transition-delay:0s;
}
*/
+
+ @-webkit-keyframes rotateWithAlphaKeyframes {
+ 0% {
+ opacity: 0;
+ -webkit-transform: perspective(1000) rotateY(95deg);
+ }
+ 1% {
+ opacity: 0;
+ -webkit-transform: perspective(1000) rotateY(-90deg);
+ }
+ 15% {
+ opacity: 1;
+ -webkit-transform: perspective(1000) rotateY(0deg);
+ }
+ 85% {
+ opacity: 1;
+ -webkit-transform: perspective(1000) rotateY(0deg);
+ }
+ 100% {
+ opacity: 0;
+ -webkit-transform: perspective(1000) rotateY(95deg);
+ }
+ }
+
+ .rotateWithAlphaAnimation {
+ -webkit-animation-name: rotateWithAlphaKeyframes;
+ -webkit-animation-duration: 5s;
+ -webkit-animation-iteration-count: infinite;
+ -webkit-animation-direction: normal;
+ -webkit-animation-timing-function: ease-out;
+ -webkit-transform-origin: 200% 50%;
+ -webkit-transform-style: preserve-3d;
+ -webkit-transform: perspective(1000);
+ }
+
@@ -201,7 +237,7 @@
-
+