diff options
| author | Jonathan Duran | 2012-06-06 11:22:43 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-06 11:22:43 -0700 |
| commit | 020a8147088f09547b7e84db2ada7c48f25c089f (patch) | |
| tree | 5ec53061c4437d7a7cd8c983ef8a17aa6cfe0e19 /node_modules/montage-google/feed-reader | |
| parent | b73cc6e348f3eb4cd57b5afeb7a6f5d3633b7e6b (diff) | |
| parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
| download | ninja-020a8147088f09547b7e84db2ada7c48f25c089f.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/montage-google/feed-reader')
| -rw-r--r-- | node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | 3 | ||||
| -rw-r--r-- | node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js | 8 |
2 files changed, 9 insertions, 2 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 8e9b3371..b8b9f39a 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 | |||
| @@ -76,8 +76,7 @@ | |||
| 76 | </head> | 76 | </head> |
| 77 | <body> | 77 | <body> |
| 78 | <div class="feed-entry" data-montage-id="feed-entry"> | 78 | <div class="feed-entry" data-montage-id="feed-entry"> |
| 79 | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-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> | ||
| 81 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
| 82 | </div> | 81 | </div> |
| 83 | 82 | ||
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 c066220e..34533d6d 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 | |||
| @@ -184,6 +184,14 @@ exports.FeedReader = Montage.create(Component, { | |||
| 184 | value: function() { | 184 | value: function() { |
| 185 | 185 | ||
| 186 | } | 186 | } |
| 187 | }, | ||
| 188 | |||
| 189 | serializeProperties: { | ||
| 190 | value: function(serializer) { | ||
| 191 | serializer.set("element", this.element); | ||
| 192 | serializer.set("feedURL", this.feedURL); | ||
| 193 | serializer.set("feedDisplayMode", this.feedDisplayMode); | ||
| 194 | } | ||
| 187 | } | 195 | } |
| 188 | 196 | ||
| 189 | }); | 197 | }); |