From aeaf11ca43d5d4676a886214ed7354482c957425 Mon Sep 17 00:00:00 2001 From: Rob Wu Date: Sat, 25 Jan 2014 20:09:04 +0100 Subject: [PATCH] [CRX] Fall back to sender.tab.url if !tab.url sender.url is relatively new (Chromium 29) ( https://chromiumcodereview.appspot.com/14301016 ) --- extensions/chromium/extension-router.js | 5 +---- web/pdf_history.js | 4 +++- web/viewer.js | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extensions/chromium/extension-router.js b/extensions/chromium/extension-router.js index 8f53cc118..d3c7d52b1 100644 --- a/extensions/chromium/extension-router.js +++ b/extensions/chromium/extension-router.js @@ -96,10 +96,7 @@ limitations under the License. chrome.runtime.onMessage.addListener(function(message, sender) { if (message === 'showPageAction' && sender.tab) { - if (sender.tab.url === sender.url) { - // Only respond to messages from the top-level frame - showPageAction(sender.tab.id, sender.url); - } + showPageAction(sender.tab.id, sender.tab.url); } }); diff --git a/web/pdf_history.js b/web/pdf_history.js index c63a109a0..79161da25 100644 --- a/web/pdf_history.js +++ b/web/pdf_history.js @@ -145,7 +145,9 @@ var PDFHistory = { // window.history.pushState(stateObj, ''); //#endif //#if CHROME -// chrome.runtime.sendMessage('showPageAction'); +// if (top === window) { +// chrome.runtime.sendMessage('showPageAction'); +// } //#endif } }, diff --git a/web/viewer.js b/web/viewer.js index ef3fc9a7b..9021ec02f 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1573,7 +1573,9 @@ var DocumentOutlineView = function documentOutlineView(outline) { // // Example: chrome-extension://.../http://example.com/file.pdf // var humanReadableUrl = '/' + DEFAULT_URL + location.hash; // history.replaceState(history.state, '', humanReadableUrl); -// chrome.runtime.sendMessage('showPageAction'); +// if (top === window) { +// chrome.runtime.sendMessage('showPageAction'); +// } // } //})(); //#endif