Only replace PDF URL when PDFJS is enabled

Fix #2530 Auditors: @diracdeltas
brave · Jul 17, 2016 · e962ef9 · e962ef9 · diracdeltas · Jul 17, 2016
1 parent 0464ce3
commit e962ef9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -66,7 +66,7 @@ usePasswordManager=Use Brave's password manager
 useOnePassword=Use 1Password (requires 1Password Application)
 useDashlane=Use Dashlane (requires Dashlane Application)
 useLastPass=Use LastPass
-usePDFJS=Use HTML5 PDF reader
+usePDFJS=Use HTML5 PDF reader (requires browser restart)
 enableFlash=Enable Adobe Flash support (requires browser restart)
 enableFlashSubtext=Flash support is experimental and requires Pepper Flash to be installed from
 enableFlashSubtextLinux=Flash support is experimental and requires the pepperflashplugin-nonfree package.

diff --git a/docs/appActions.md b/docs/appActions.md
@@ -282,6 +282,17 @@ Adds a word to the dictionary
 
 
 
+### setPDFJSOrigin(origin) 
+
+Sets PDFJS origin
+
+**Parameters**
+
+**origin**: `string`, The origin of the PDFJS extension. Ends in
+  a slash.
+
+
+
 
 * * *
 

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -55,6 +55,9 @@ const updateNavBarInput = (loc, frameStatePath = activeFrameStatePath()) => {
  * @param {string=} loc - Original URL
  */
 const setPDFLocation = (loc) => {
+  if (!getSetting(settings.PDFJS_ENABLED)) {
+    return loc
+  }
   PDFJS_ORIGIN = PDFJS_ORIGIN || require('./appStoreRenderer').state.get('pdfjsOrigin')
   if (loc && PDFJS_ORIGIN &&
       UrlUtil.isFileType(loc, 'pdf') && !loc.startsWith(PDFJS_ORIGIN)) {