Feedback from @bsclifton

brave · Sep 17, 2016 · ec45bdf · ec45bdf · bsclifton · Sep 18, 2016
1 parent 1b3df70
commit ec45bdf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -61,18 +61,6 @@ const createFileSubmenu = () => {
       }
     },
     CommonMenu.separatorMenuItem,
-    /*
-    {
-      label: locale.translation('importFrom'),
-      visible: false
-      submenu: [
-        {label: 'Google Chrome...'},
-        {label: 'Firefox...'},
-        {label: 'Safari...'}
-      ]
-    },
-    CommonMenu.separatorMenuItem,
-    */
     {
       // this should be disabled when
       // no windows are active

diff --git a/js/components/importBrowserDataPanel.js → ...erer/components/importBrowserDataPanel.js b/js/components/importBrowserDataPanel.js → ...erer/components/importBrowserDataPanel.js
@@ -3,12 +3,12 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const Dialog = require('./dialog')
-const Button = require('./button')
-const SwitchControl = require('./switchControl')
-const windowActions = require('../actions/windowActions')
-const appActions = require('../actions/appActions')
+const ImmutableComponent = require('../../../js/components/immutableComponent')
+const Dialog = require('../../../js/components/dialog')
+const Button = require('../../../js/components/button')
+const SwitchControl = require('../../../js/components/switchControl')
+const windowActions = require('../../../js/actions/windowActions')
+const appActions = require('../../../js/actions/appActions')
 
 class ImportBrowserDataPanel extends ImmutableComponent {
   constructor () {

diff --git a/docs/appActions.md b/docs/appActions.md
@@ -355,7 +355,7 @@ Import browser data specified in selected
 
 **Parameters**
 
-**selected**: `object`, the browser data to import as per doc/state.md's importBroserDataSelected
+**selected**: `object`, the browser data to import as per doc/state.md's importBrowserDataSelected
 
 
 

diff --git a/docs/state.md b/docs/state.md
@@ -516,7 +516,7 @@ WindowStore
       cookies: boolean
     }
   ],
-  importBroserDataSelected: {
+  importBrowserDataSelected: {
     index: string,
     type: number,
     history: boolean,

diff --git a/js/components/main.js b/js/components/main.js
@@ -29,7 +29,7 @@ const BrowserActionButton = require('../../app/renderer/components/browserAction
 const SiteInfo = require('./siteInfo')
 const BraveryPanel = require('./braveryPanel')
 const ClearBrowsingDataPanel = require('./clearBrowsingDataPanel')
-const ImportBrowserDataPanel = require('./importBrowserDataPanel')
+const ImportBrowserDataPanel = require('../../app/renderer/components/importBrowserDataPanel')
 const AutofillAddressPanel = require('./autofillAddressPanel')
 const AutofillCreditCardPanel = require('./autofillCreditCardPanel')
 const AddEditBookmark = require('./addEditBookmark')