make sure files are file urls

fixes #3296 auditors: @bbondy
brave · Aug 27, 2016 · a38da51 · a38da51 · bbondy · Aug 27, 2016
1 parent c46e7ec
commit a38da51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -13,6 +13,7 @@ const messages = require('../../js/constants/messages')
 const settings = require('../../js/constants/settings')
 const dialog = electron.dialog
 const appActions = require('../../js/actions/appActions')
+const { fileUrl } = require('../../js/lib/appUrlUtil')
 const menuUtil = require('./lib/menuUtil')
 const getSetting = require('../../js/settings').getSetting
 const locale = require('../locale')
@@ -44,7 +45,7 @@ const createFileSubmenu = (CommonMenu) => {
         }, (paths) => {
           if (paths) {
             paths.forEach((path) => {
-              CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_NEW_FRAME, path])
+              CommonMenu.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_NEW_FRAME, fileUrl(path)])
             })
           }
         })

diff --git a/js/lib/appUrlUtil.js b/js/lib/appUrlUtil.js
@@ -7,7 +7,7 @@ const path = require('path')
 const UrlUtil = require('./urlutil')
 const config = require('../constants/config')
 
-function fileUrl (str) {
+module.exports.fileUrl = (str) => {
   var pathName = path.resolve(str).replace(/\\/g, '/')
 
   // Windows drive letter must be prefixed with a slash
@@ -43,8 +43,8 @@ module.exports.getExtensionsPath = function (extensionDir) {
 
 module.exports.getIndexHTML = function () {
   return process.env.NODE_ENV === 'development'
-    ? fileUrl(path.resolve(__dirname, '..', '..') + '/app/extensions/brave/index-dev.html')
-    : fileUrl(path.resolve(__dirname, '..', '..') + '/app/extensions/brave/index.html')
+    ? module.exports.fileUrl(path.resolve(__dirname, '..', '..') + '/app/extensions/brave/index-dev.html')
+    : module.exports.fileUrl(path.resolve(__dirname, '..', '..') + '/app/extensions/brave/index.html')
 }
 
 /**