From 1d0efc758bc9404eebbc8b8d592de9dbb329899e Mon Sep 17 00:00:00 2001
From: François Frisch
Date: Sat, 17 Mar 2012 11:21:22 -0700
Subject: Adding feed reader and map
---
.../feed-reader/feed-reader.reel/feed-reader.html | 83 ++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
(limited to 'node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html')
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
new file mode 100644
index 00000000..a3523001
--- /dev/null
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -0,0 +1,83 @@
+
+
+
+
+ Feed Reader
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
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
---
.../feed-reader/feed-reader.reel/feed-reader.html | 26 +++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
(limited to 'node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html')
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
index a3523001..646fd01e 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -53,7 +53,15 @@
"module": "montage/ui/feed-reader/feed-reader.reel",
"name": "FeedReader",
"properties": {
- "element": {"#": "feed-reader"}
+ "element": {"#": "feed-reader"},
+ "repetition": {"@": "repetition"}
+ },
+ "bindings": {
+ "items": {
+ "boundObject": {"@": "repetition"},
+ "boundObjectPropertyPath": "objects",
+ "oneway": true
+ }
}
}
@@ -61,8 +69,20 @@
--
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---
.../feed-reader/feed-reader.reel/feed-reader.html | 38 ++++------------------
1 file changed, 6 insertions(+), 32 deletions(-)
(limited to 'node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html')
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
index 646fd01e..e5251e0a 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -23,17 +23,7 @@
}
}
},
-
- "repetition": {
- "module": "montage/ui/repetition.reel",
- "name": "Repetition",
- "properties": {
- "element": {"#": "entries"},
- "contentController": {"@": "entriesController"},
- "isSelectionEnabled": true,
- "orientation": "vertical"
- }
- },
+
"feedEntry": {
"module": "montage/ui/feed-reader/feed-entry.reel",
"name": "FeedEntry",
@@ -42,27 +32,19 @@
},
"bindings": {
"entry": {
- "boundObject": {"@": "repetition"},
- "boundObjectPropertyPath": "objectAtCurrentIteration",
+ "boundObject": {"@": "owner"},
+ "boundObjectPropertyPath": "activeFeedEntry",
"oneway": true
}
- }
+ }
},
"owner": {
"module": "montage/ui/feed-reader/feed-reader.reel",
"name": "FeedReader",
"properties": {
- "element": {"#": "feed-reader"},
- "repetition": {"@": "repetition"}
- },
- "bindings": {
- "items": {
- "boundObject": {"@": "repetition"},
- "boundObjectPropertyPath": "objects",
- "oneway": true
- }
- }
+ "element": {"#": "feed-reader"}
+ }
}
}
@@ -74,16 +56,8 @@
}
.feed-entry {
- display: none;
- }
-
- .montage-hidden {
- display: none;
}
- .active {
- display: block;
- }
--
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
---
node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html')
diff --git a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
index e5251e0a..21f3d4ee 100644
--- a/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage/ui/feed-reader/feed-reader.reel/feed-reader.html
@@ -52,7 +52,9 @@