Merge pull request #11906 from brave/file_dialog

New electron dialog changes
brave · Mar 1, 2018 · 020fbc5 · 020fbc5
1 parent 49c8b4b
commit 020fbc5
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 38 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -251,24 +251,22 @@ const onBootStateFile = (state) => {
 
 const promptForRecoveryKeyFile = () => {
   const defaultRecoveryKeyFilePath = path.join(electron.app.getPath('userData'), '/brave_wallet_recovery.txt')
-  let files
   if (process.env.SPECTRON) {
     // skip the dialog for tests
     console.log(`for test, trying to recover keys from path: ${defaultRecoveryKeyFilePath}`)
-    files = [defaultRecoveryKeyFilePath]
+    return defaultRecoveryKeyFilePath
   } else {
     const dialog = electron.dialog
-    files = dialog.showOpenDialog({
-      properties: ['openFile'],
+    const BrowserWindow = electron.BrowserWindow
+    dialog.showDialog(BrowserWindow.getFocusedWindow(), {
+      type: 'select-open-file',
       defaultPath: defaultRecoveryKeyFilePath,
-      filters: [{
-        name: 'TXT files',
-        extensions: ['txt']
-      }]
+      extensions: [['txt']],
+      includeAllFiles: false
+    }, (files) => {
+      return (files && files.length ? files[0] : null)
     })
   }
-
-  return (files && files.length ? files[0] : null)
 }
 
 const logError = (state, err, caller) => {

diff --git a/app/browser/bookmarksExporter.js b/app/browser/bookmarksExporter.js
@@ -34,14 +34,12 @@ const showDialog = (state) => {
   let personal = []
   let other = []
 
-  dialog.showSaveDialog(focusedWindow, {
+  dialog.showDialog(focusedWindow, {
     defaultPath: defaultPath,
-    filters: [{
-      name: 'HTML',
-      extensions: ['html']
-    }]
-  }, (fileName) => {
-    if (fileName) {
+    type: 'select-saveas-file',
+    extensions: [['html']]
+  }, (fileNames) => {
+    if (fileNames && fileNames.length === 1) {
       personal = createBookmarkArray(state)
       other = createBookmarkArray(state, -1, false)
       try {

diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -57,8 +57,8 @@ const createFileSubmenu = () => {
       label: locale.translation('openFile'),
       accelerator: 'CmdOrCtrl+O',
       click: (item, focusedWindow) => {
-        dialog.showOpenDialog(focusedWindow, {
-          properties: ['openFile', 'multiSelections']
+        dialog.showDialog(focusedWindow, {
+          type: 'select-open-multi-file'
         }, (paths) => {
           if (paths) {
             paths.forEach((path) => {

diff --git a/app/browser/reducers/downloadsReducer.js b/app/browser/reducers/downloadsReducer.js
@@ -95,12 +95,12 @@ const downloadsReducer = (state, action) => {
     case appConstants.APP_SELECT_DEFAULT_DOWNLOAD_PATH:
       const focusedWindow = BrowserWindow.getFocusedWindow()
 
-      dialog.showOpenDialog(focusedWindow, {
+      dialog.showDialog(focusedWindow, {
         defaultPath: app.getPath('downloads'),
-        properties: ['openDirectory', 'createDirectory']
-      }, (folder) => {
-        if (Array.isArray(folder) && fs.lstatSync(folder[0]).isDirectory()) {
-          appActions.changeSetting(settings.DOWNLOAD_DEFAULT_PATH, folder[0])
+        type: 'select-folder'
+      }, (paths) => {
+        if (Array.isArray(paths) && fs.lstatSync(paths[0]).isDirectory()) {
+          appActions.changeSetting(settings.DOWNLOAD_DEFAULT_PATH, paths[0])
         }
       })
       break

diff --git a/app/importer.js b/app/importer.js
@@ -59,17 +59,15 @@ exports.importHTML = (selected) => {
   isImportingBookmarks = true
   const state = appStore.getState()
   hasBookmarks = bookmarksState.getBookmarks(state).size > 0 || bookmarkFoldersState.getFolders(state).size > 0
-  const files = dialog.showOpenDialog({
-    properties: ['openFile'],
-    filters: [{
-      name: 'HTML',
-      extensions: ['html', 'htm']
-    }]
+  dialog.showDialog(BrowserWindow.getFocusedWindow(), {
+    type: 'select-open-file',
+    extensions: [['html', 'htm']]
+  }, (files) => {
+    if (files && files.length === 1) {
+      const file = files[0]
+      importer.importHTML(file)
+    }
   })
-  if (files && files.length > 0) {
-    const file = files[0]
-    importer.importHTML(file)
-  }
 }
 
 importer.on('update-supported-browsers', (e, detail) => {

diff --git a/test/unit/app/browser/reducers/downloadsReducerTest.js b/test/unit/app/browser/reducers/downloadsReducerTest.js
@@ -234,7 +234,7 @@ describe('downloadsReducer', function () {
       let options
 
       before(function () {
-        stub = sinon.stub(fakeElectron.dialog, 'showOpenDialog', function (arg1, arg2) {
+        stub = sinon.stub(fakeElectron.dialog, 'showDialog', function (arg1, arg2) {
           options = arg2
         })
         downloadsReducer({}, {actionType: appConstants.APP_SELECT_DEFAULT_DOWNLOAD_PATH})
@@ -244,7 +244,7 @@ describe('downloadsReducer', function () {
         stub.restore()
       })
 
-      it('calls dialog.showOpenDialog', function () {
+      it('calls dialog.showDialog', function () {
         assert(stub.calledOnce)
       })
 
@@ -253,7 +253,7 @@ describe('downloadsReducer', function () {
       })
 
       it('passes the correct properties object', function () {
-        assert.deepEqual(options.properties, ['openDirectory', 'createDirectory'])
+        assert.deepEqual(options.type, 'select-folder')
       })
     })
   })

diff --git a/test/unit/lib/fakeElectron.js b/test/unit/lib/fakeElectron.js
@@ -53,7 +53,7 @@ const fakeElectron = {
     }
   },
   dialog: {
-    showOpenDialog: function () { }
+    showDialog: function () { }
   },
   Menu: {
     setApplicationMenu: (template) => {},