diff options
author | Valerio Virgillito | 2012-06-27 15:35:39 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-27 15:35:39 -0700 |
commit | d764ea70f75841cbe959733b471509b5a61d8b9c (patch) | |
tree | 9026664bc951d188102bf1a1bcc803632c313921 /node_modules/montage-google/feed-reader | |
parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
parent | 913f5cdce07072e7ba6ba8063a3bd19e7eb00a46 (diff) | |
download | ninja-d764ea70f75841cbe959733b471509b5a61d8b9c.tar.gz |
Merge pull request #344 from mencio/google-components-fixes
Google components fixes
Diffstat (limited to 'node_modules/montage-google/feed-reader')
3 files changed, 1 insertions, 5 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 332b2932..66471eab 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 | |||
@@ -45,7 +45,6 @@ | |||
45 | } | 45 | } |
46 | }, | 46 | }, |
47 | "owner": { | 47 | "owner": { |
48 | "prototype": "feed-reader/feed-entry.reel", | ||
49 | "properties": { | 48 | "properties": { |
50 | "element": {"#": "feed-entry"} | 49 | "element": {"#": "feed-entry"} |
51 | } | 50 | } |
@@ -76,6 +75,7 @@ | |||
76 | </head> | 75 | </head> |
77 | <body> | 76 | <body> |
78 | <div class="feed-entry" data-montage-id="feed-entry"> | 77 | <div class="feed-entry" data-montage-id="feed-entry"> |
78 | |||
79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> |
80 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
81 | </div> | 81 | </div> |
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 4d6792a1..a5c1346f 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 | |||
@@ -38,7 +38,6 @@ | |||
38 | }, | 38 | }, |
39 | 39 | ||
40 | "owner": { | 40 | "owner": { |
41 | "prototype": "feed-reader/feed-reader.reel", | ||
42 | "properties": { | 41 | "properties": { |
43 | "element": {"#": "feed-reader"} | 42 | "element": {"#": "feed-reader"} |
44 | } | 43 | } |
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 34533d6d..3c139c60 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 | |||
@@ -16,11 +16,8 @@ exports.FeedReader = Montage.create(Component, { | |||
16 | value: function() { | 16 | value: function() { |
17 | var self = this; | 17 | var self = this; |
18 | var apiInit = function() { | 18 | var apiInit = function() { |
19 | console.log('google api initialized'); | ||
20 | |||
21 | google.load("feeds", "1", { | 19 | google.load("feeds", "1", { |
22 | callback: function() { | 20 | callback: function() { |
23 | console.log('google feeds api loaded'); | ||
24 | self._apiLoaded = true; | 21 | self._apiLoaded = true; |
25 | self.feedURL = self._feedURL; | 22 | self.feedURL = self._feedURL; |
26 | self.needsDraw = true; | 23 | self.needsDraw = true; |