Merge pull request #1300 from notmasteryet/tree-85

Chrome extension: uses encodeURIComponent; fixes download button
13 years ago · a3d7b1d950
1 changed files with 12 additions and 2 deletions
--- a/extensions/chrome/pdfHandler.html
+++ b/extensions/chrome/pdfHandler.html
@ -1,18 +1,28 @@
				@@ -1,18 +1,28 @@
 <!doctype html>
 <script>
+
+function isPdfDownloadable(details) {
+  return details.url.indexOf('pdfjs.action=download') >= 0;
+}
+
 chrome.webRequest.onBeforeRequest.addListener(
  function(details) {
+    if (isPdfDownloadable(details))
+      return;
+
    var viewerPage = 'content/web/viewer.html';
-    var url = chrome.extension.getURL(viewerPage) + '?file=' + details.url;
+    var url = chrome.extension.getURL(viewerPage) +
+      '?file=' + encodeURIComponent(details.url);
    return { redirectUrl: url };
  },
  {
    urls: [
      "http://*/*.pdf",
-      "file://*/*.pdf",
+      "file://*/*.pdf"
    ],
    types: [ "main_frame" ]
  },
  ["blocking"]);
+
 </script>