| Index: chrome/test/data/extensions/subscribe_page_action/popup.js
|
| ===================================================================
|
| --- chrome/test/data/extensions/subscribe_page_action/popup.js (revision 192805)
|
| +++ chrome/test/data/extensions/subscribe_page_action/popup.js (working copy)
|
| @@ -10,46 +10,49 @@
|
| }
|
|
|
| function main() {
|
| - chrome.tabs.getSelected(null, function(tab) {
|
| - var feeds = chrome.extension.getBackgroundPage().feedData[tab.id];
|
| - if (feeds.length == 1) {
|
| - // Only one feed, no need for a bubble; go straight to the subscribe page.
|
| - preview(feeds[0].href);
|
| - } else {
|
| - var content = document.getElementById('content');
|
| - var heading = document.getElementById('heading');
|
| - heading.innerText =
|
| - chrome.i18n.getMessage("rss_subscription_action_title");
|
| - content.appendChild(document.createElement('br'));
|
| + chrome.tabs.getSelected(function(tab) {
|
| + chrome.storage.local.get(tab.id.toString(), function(result) {
|
| + var feeds = result[tab.id];
|
| + if (feeds.length == 1) {
|
| + // Only one feed, no need for a bubble; go straight to the subscribe
|
| + // page.
|
| + preview(feeds[0].href);
|
| + } else {
|
| + var content = document.getElementById('content');
|
| + var heading = document.getElementById('heading');
|
| + heading.innerText =
|
| + chrome.i18n.getMessage("rss_subscription_action_title");
|
| + content.appendChild(document.createElement('br'));
|
|
|
| - var feed_list = document.createElement('table');
|
| - feed_list.style.width = "400";
|
| - for (var i = 0; i < feeds.length; ++i) {
|
| - // Create an RSS image and the anhor encapsulating it.
|
| - var img_link = feedLink(feeds[i].href);
|
| - var img = document.createElement('img');
|
| - img.src = "feed-icon-16x16.png";
|
| - img_link.appendChild(img);
|
| + var feed_list = document.createElement('table');
|
| + feed_list.style.width = "400";
|
| + for (var i = 0; i < feeds.length; ++i) {
|
| + // Create an RSS image and the anhor encapsulating it.
|
| + var img_link = feedLink(feeds[i].href);
|
| + var img = document.createElement('img');
|
| + img.src = "feed-icon-16x16.png";
|
| + img_link.appendChild(img);
|
|
|
| - // Create a text node and the anchor encapsulating it.
|
| - var text_link = feedLink(feeds[i].href);
|
| - text_link.appendChild(document.createTextNode(feeds[i].title));
|
| + // Create a text node and the anchor encapsulating it.
|
| + var text_link = feedLink(feeds[i].href);
|
| + text_link.appendChild(document.createTextNode(feeds[i].title));
|
|
|
| - // Add the data to a row in the table.
|
| - var tr = document.createElement('tr');
|
| - tr.className = "feedList";
|
| - var td = document.createElement('td');
|
| - td.width = "16";
|
| - td.appendChild(img_link);
|
| - var td2 = document.createElement('td');
|
| - td2.appendChild(text_link);
|
| - tr.appendChild(td);
|
| - tr.appendChild(td2);
|
| - feed_list.appendChild(tr);
|
| + // Add the data to a row in the table.
|
| + var tr = document.createElement('tr');
|
| + tr.className = "feedList";
|
| + var td = document.createElement('td');
|
| + td.width = "16";
|
| + td.appendChild(img_link);
|
| + var td2 = document.createElement('td');
|
| + td2.appendChild(text_link);
|
| + tr.appendChild(td);
|
| + tr.appendChild(td2);
|
| + feed_list.appendChild(tr);
|
| + }
|
| +
|
| + content.appendChild(feed_list);
|
| }
|
| -
|
| - content.appendChild(feed_list);
|
| - }
|
| + });
|
| });
|
| }
|
|
|
|
|