diff options
| author | Kruti Shah | 2012-06-28 09:24:03 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-28 09:24:03 -0700 |
| commit | 8aef94d26e172785463161899dfcc877b4233bdb (patch) | |
| tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /node_modules/montage-google/feed-reader | |
| parent | deefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff) | |
| parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
| download | ninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz | |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
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; |