aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/examples
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-19 14:46:38 -0700
committerValerio Virgillito2012-03-19 14:46:38 -0700
commite9244d5a0f681ddde5896392c17738add2948687 (patch)
tree06d1d6a65c2e9a05dd6063c1974f2174922c37d3 /node_modules/montage/examples
parente9c3c7d758fc59ad7b731730dd935170844d9538 (diff)
parentdd382088b4990c4e39f77d793c1a6bd7e3c52aca (diff)
downloadninja-e9244d5a0f681ddde5896392c17738add2948687.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
Diffstat (limited to 'node_modules/montage/examples')
-rw-r--r--node_modules/montage/examples/feed-reader/images/47-fuel.pngbin0 -> 3091 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/80-shopping-cart.pngbin0 -> 2963 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/images/88-beer-mug.pngbin0 -> 3087 bytes
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.html58
-rw-r--r--node_modules/montage/examples/feed-reader/main.reel/main.js10
-rwxr-xr-xnode_modules/montage/examples/youtube-channel-example/index.html11
6 files changed, 69 insertions, 10 deletions
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
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/47-fuel.png
Binary files 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
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
Binary files 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
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
Binary files 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..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 @@
44 "module": "montage/ui/feed-reader/feed-reader.reel", 44 "module": "montage/ui/feed-reader/feed-reader.reel",
45 "name": "FeedReader", 45 "name": "FeedReader",
46 "properties": { 46 "properties": {
47 "element": {"#": "feed-reader"} 47 "element": {"#": "feed-reader"},
48 "feedDisplayMode": "timed",
49 "interval": "5"
48 } 50 }
49 }, 51 },
50 52
@@ -76,9 +78,29 @@
76 "map": { 78 "map": {
77 "prototype": "montage/ui/map.reel", 79 "prototype": "montage/ui/map.reel",
78 "properties": { 80 "properties": {
79 "element": {"#": "map"} 81 "element": {"#": "map"},
82 "traffic": false
83 },
84 "bindings": {
85 "traffic": {
86 "boundObject": {"@": "traffic"},
87 "boundObjectPropertyPath": "checked"
88 }
89 }
90 },
91
92 "types": {
93 "prototype": "montage/ui/select-input.reel",
94 "properties": {
95 "element": {"#": "types"}
80 } 96 }
81 }, 97 },
98 "traffic": {
99 "prototype": "montage/ui/checkbox.reel",
100 "properties": {
101 "element": {"#": "traffic"}
102 }
103 },
82 104
83 "owner": { 105 "owner": {
84 "module": "main.reel", 106 "module": "main.reel",
@@ -92,6 +114,10 @@
92 "mapCenter": { 114 "mapCenter": {
93 "boundObject": {"@": "mapCenter"}, 115 "boundObject": {"@": "mapCenter"},
94 "boundObjectPropertyPath": "value" 116 "boundObjectPropertyPath": "value"
117 },
118 "mapCategory": {
119 "boundObject": {"@": "types"},
120 "boundObjectPropertyPath": "value"
95 } 121 }
96 } 122 }
97 } 123 }
@@ -140,6 +166,22 @@
140 visibility: hidden; 166 visibility: hidden;
141 } 167 }
142 168
169 #map, #feed-reader {
170 margin-top: 10px;
171 }
172
173 /*
174 .feed-reader .feed-entry {
175 visibility:hidden;
176 opacity:0;
177 transition:visibility 0s linear 0.5s,opacity 0.5s linear;
178 }
179 .feed-reader .feed-entry .active {
180 visibility:visible;
181 opacity:1;
182 transition-delay:0s;
183 }
184 */
143 185
144 </style> 186 </style>
145 187
@@ -168,6 +210,18 @@
168 <form> 210 <form>
169 Location: <input type="text" value="Paris, France" id="map-center" required /> 211 Location: <input type="text" value="Paris, France" id="map-center" required />
170 <input type="button" id="btn-map" class="btn primary" value="OK"></button> 212 <input type="button" id="btn-map" class="btn primary" value="OK"></button>
213 <div>
214 Show:
215 <select data-montage-id="types">
216 <option value=''>Select a Category</option>
217 <option value='grocery_or_supermarket'>Groceries/Supermarkets</option>
218 <option value='hospital'>Hospitals</option>
219 <option value='restaurant'>Restaurants</option>
220 <option value='bar'>Bars</option>
221 <option value='gas_station'>Gas Stations</option>
222 </select>
223 </div>
224 <input type="checkbox" id="traffic">Show Traffic</input>
171 </form> 225 </form>
172 </div> 226 </div>
173 <div id="map">Map</div> 227 <div id="map">Map</div>
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, {
13 distinct: true 13 distinct: true
14 }, 14 },
15 15
16 mapCategory: {
17 get: function() {
18 return this._mapCategory;
19 },
20 set: function(value) {
21 this._mapCategory = value;
22 this.map.category = value;
23 }
24 },
25
16 feedReader: {value: null}, 26 feedReader: {value: null},
17 27
18 map: {value: null}, 28 map: {value: null},
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 @@
14 "player": { 14 "player": {
15 "prototype": "montage/ui/youtube-channel.reel", 15 "prototype": "montage/ui/youtube-channel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "player"} 17 "element": {"#": "player"},
18 "channel": "drive"
18 } 19 }
19 }, 20 },
20 21
@@ -23,12 +24,6 @@
23 "properties": { 24 "properties": {
24 "element": {"#": "url"}, 25 "element": {"#": "url"},
25 "value": "http://www.youtube.com/TEDEducation" 26 "value": "http://www.youtube.com/TEDEducation"
26 },
27 "bindings": {
28 "value": {
29 "boundObject": {"@": "player"},
30 "boundObjectPropertyPath": "channelUrl"
31 }
32 } 27 }
33 } 28 }
34 } 29 }
@@ -37,7 +32,7 @@
37<body> 32<body>
38 <div class="youtube-channel-example"> 33 <div class="youtube-channel-example">
39 <div id="title">Youtube Channel</div> 34 <div id="title">Youtube Channel</div>
40 <input type="text" data-montage-id="url" placeholder="Channel URL" class="youtube-channel-example-url"> 35 <input type="text" data-montage-id="url" placeholder="Channel Name" class="youtube-channel-example-url">
41 <div data-montage-id="player"></div> 36 <div data-montage-id="player"></div>
42 </div> 37 </div>
43</body> 38</body>