leave default path to muon and fix import bookmark cancel

brave · Nov 16, 2017 · b42dd08 · b42dd08
1 parent 9685490
commit b42dd08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/app/browser/bookmarksExporter.js b/app/browser/bookmarksExporter.js
@@ -39,7 +39,7 @@ const showDialog = (state) => {
     type: 'select-saveas-file',
     extensions: ['html']
   }, (fileNames) => {
-    if (fileNames.length === 1) {
+    if (fileNames && fileNames.length === 1) {
       personal = createBookmarkArray(state)
       other = createBookmarkArray(state, -1, false)
       fs.writeFileSync(fileNames[0], createBookmarkHTML(personal, other))

diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -57,10 +57,9 @@ const createFileSubmenu = () => {
       label: locale.translation('openFile'),
       accelerator: 'CmdOrCtrl+O',
       click: (item, focusedWindow) => {
-        const defaultPath = getSetting(settings.DOWNLOAD_DEFAULT_PATH) || app.getPath('downloads')
         dialog.showDialog(focusedWindow, {
-          type: 'select-open-multi-file',
-          defaultPath
+          title: locale.translation('openFile'),
+          type: 'select-open-multi-file'
         }, (paths) => {
           if (paths) {
             paths.forEach((path) => {

diff --git a/app/importer.js b/app/importer.js
@@ -59,11 +59,9 @@ exports.importHTML = (selected) => {
   isImportingBookmarks = true
   const state = appStore.getState()
   hasBookmarks = bookmarksState.getBookmarks(state).size > 0 || bookmarkFoldersState.getFolders(state).size > 0
-  const defaultPath = getSetting(settings.DOWNLOAD_DEFAULT_PATH) || app.getPath('downloads')
   dialog.showDialog({
     type: 'select-open-file',
-    extensions: ['html', 'htm'],
-    defaultPath
+    extensions: ['html', 'htm']
   }, (files) => {
     if (files && files.length === 1) {
       const file = files[0]