diff options
Diffstat (limited to 'node_modules/montage-google')
3 files changed, 41 insertions, 38 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 6b2e51e2..8e9b3371 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
@@ -6,8 +6,7 @@ | |||
6 | <script type="text/montage-serialization"> | 6 | <script type="text/montage-serialization"> |
7 | { | 7 | { |
8 | "title": { | 8 | "title": { |
9 | "module": "montage/ui/dynamic-text.reel", | 9 | "prototype": "montage/ui/dynamic-text.reel", |
10 | "name": "DynamicText", | ||
11 | "properties": { | 10 | "properties": { |
12 | "element": {"#": "entry-title"} | 11 | "element": {"#": "entry-title"} |
13 | }, | 12 | }, |
@@ -20,8 +19,7 @@ | |||
20 | } | 19 | } |
21 | }, | 20 | }, |
22 | "entryLink": { | 21 | "entryLink": { |
23 | "module": "montage/ui/anchor.reel", | 22 | "prototype": "montage/ui/anchor.reel", |
24 | "name": "Anchor", | ||
25 | "properties": { | 23 | "properties": { |
26 | "element": {"#": "entry-url"} | 24 | "element": {"#": "entry-url"} |
27 | }, | 25 | }, |
@@ -34,8 +32,7 @@ | |||
34 | } | 32 | } |
35 | }, | 33 | }, |
36 | "description": { | 34 | "description": { |
37 | "module": "montage/ui/dynamic-text.reel", | 35 | "prototype": "montage/ui/dynamic-text.reel", |
38 | "name": "DynamicText", | ||
39 | "properties": { | 36 | "properties": { |
40 | "element": {"#": "entry-description"} | 37 | "element": {"#": "entry-description"} |
41 | }, | 38 | }, |
@@ -48,8 +45,7 @@ | |||
48 | } | 45 | } |
49 | }, | 46 | }, |
50 | "owner": { | 47 | "owner": { |
51 | "module": "montage-google/feed-reader/feed-entry.reel", | 48 | "prototype": "montage-google/feed-reader/feed-entry.reel", |
52 | "name": "FeedEntry", | ||
53 | "properties": { | 49 | "properties": { |
54 | "element": {"#": "feed-entry"} | 50 | "element": {"#": "feed-entry"} |
55 | } | 51 | } |
@@ -66,7 +62,7 @@ | |||
66 | margin-top: 0px; | 62 | margin-top: 0px; |
67 | font-size: 24px; | 63 | font-size: 24px; |
68 | line-height: 24px; | 64 | line-height: 24px; |
69 | margin-bottom: 12px; | 65 | margin-bottom: 12px; |
70 | } | 66 | } |
71 | .feed-entry .entry-title { | 67 | .feed-entry .entry-title { |
72 | font-weight: bold; | 68 | font-weight: bold; |
@@ -79,10 +75,10 @@ | |||
79 | 75 | ||
80 | </head> | 76 | </head> |
81 | <body> | 77 | <body> |
82 | <div class="feed-entry" id="feed-entry"> | 78 | <div class="feed-entry" data-montage-id="feed-entry"> |
83 | 79 | ||
84 | <a target="_blank" id="entry-url" class="entry-url"><h2 id="entry-title" class="entry-title"></h2></a> | 80 | <a target="_blank" id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> |
85 | <p id="entry-description" class="entry-description"></p> | 81 | <p data-montage-id="entry-description" class="entry-description"></p> |
86 | </div> | 82 | </div> |
87 | 83 | ||
88 | </body> | 84 | </body> |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 28c0ed1f..99a353b9 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -3,17 +3,16 @@ | |||
3 | <head> | 3 | <head> |
4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
5 | <title>Feed Reader</title> | 5 | <title>Feed Reader</title> |
6 | 6 | ||
7 | <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script> | 7 | <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script> |
8 | 8 | ||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "entriesController": { | 11 | "entriesController": { |
12 | "name": "ArrayController", | 12 | "prototype": "montage/ui/controller/array-controller", |
13 | "module": "montage/ui/controller/array-controller", | ||
14 | "properties": { | 13 | "properties": { |
15 | "selectObjectsOnAddition": true, | 14 | "selectObjectsOnAddition": true, |
16 | "automaticallyOrganizeObjects": true | 15 | "automaticallyOrganizeObjects": true |
17 | }, | 16 | }, |
18 | "bindings": { | 17 | "bindings": { |
19 | "content": { | 18 | "content": { |
@@ -23,10 +22,9 @@ | |||
23 | } | 22 | } |
24 | } | 23 | } |
25 | }, | 24 | }, |
26 | 25 | ||
27 | "feedEntry": { | 26 | "feedEntry": { |
28 | "module": "montage-google/feed-reader/feed-entry.reel", | 27 | "prototype": "montage-google/feed-reader/feed-entry.reel", |
29 | "name": "FeedEntry", | ||
30 | "properties": { | 28 | "properties": { |
31 | "element": {"#": "feed-entry"} | 29 | "element": {"#": "feed-entry"} |
32 | }, | 30 | }, |
@@ -36,17 +34,16 @@ | |||
36 | "boundObjectPropertyPath": "activeFeedEntry", | 34 | "boundObjectPropertyPath": "activeFeedEntry", |
37 | "oneway": true | 35 | "oneway": true |
38 | } | 36 | } |
39 | } | 37 | } |
40 | }, | 38 | }, |
41 | 39 | ||
42 | "owner": { | 40 | "owner": { |
43 | "module": "montage-google/feed-reader/feed-reader.reel", | 41 | "prototype": "montage-google/feed-reader/feed-reader.reel", |
44 | "name": "FeedReader", | ||
45 | "properties": { | 42 | "properties": { |
46 | "element": {"#": "feed-reader"} | 43 | "element": {"#": "feed-reader"} |
47 | } | 44 | } |
48 | } | 45 | } |
49 | 46 | ||
50 | } | 47 | } |
51 | </script> | 48 | </script> |
52 | 49 | ||
@@ -56,23 +53,23 @@ | |||
56 | height: 120px; | 53 | height: 120px; |
57 | width: 380px; | 54 | width: 380px; |
58 | } | 55 | } |
59 | 56 | ||
60 | .feed-entry { | 57 | .feed-entry { |
61 | } | 58 | } |
62 | 59 | ||
63 | 60 | ||
64 | </style> | 61 | </style> |
65 | 62 | ||
66 | 63 | ||
67 | </head> | 64 | </head> |
68 | <body> | 65 | <body> |
69 | <div class="feed-reader" id="feed-reader"> | 66 | <div class="feed-reader" data-montage-id="feed-reader"> |
70 | 67 | ||
71 | <div id="entries"> | 68 | <div data-montage-id="entries"> |
72 | <div class="feed-entry" id="feed-entry"></div> | 69 | <div class="feed-entry" data-montage-id="feed-entry"></div> |
73 | </div> | 70 | </div> |
74 | 71 | ||
75 | 72 | ||
76 | </div> | 73 | </div> |
77 | 74 | ||
78 | </body> | 75 | </body> |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js index 47a831eb..c066220e 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js | |||
@@ -8,6 +8,10 @@ var Montage = require("montage").Montage, | |||
8 | 8 | ||
9 | exports.FeedReader = Montage.create(Component, { | 9 | exports.FeedReader = Montage.create(Component, { |
10 | 10 | ||
11 | _apiLoaded: { | ||
12 | value: false | ||
13 | }, | ||
14 | |||
11 | didCreate: { | 15 | didCreate: { |
12 | value: function() { | 16 | value: function() { |
13 | var self = this; | 17 | var self = this; |
@@ -17,6 +21,8 @@ exports.FeedReader = Montage.create(Component, { | |||