Merge pull request #8352 from NejcZdovc/hotfix/#8351-bookmarks

Moves bookmarks related files into app folder
brave · Apr 17, 2017 · 67f42e8 · 67f42e8
2 parents 85183c6 + c546d7c
commit 67f42e8
Show file tree

Hide file tree

Showing 7 changed files with 656 additions and 599 deletions.
diff --git a/js/components/addEditBookmark.js → ...r/components/bookmarks/addEditBookmark.js b/js/components/addEditBookmark.js → ...r/components/bookmarks/addEditBookmark.js
@@ -3,10 +3,14 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('./immutableComponent')
-const Dialog = require('./dialog')
-const windowActions = require('../actions/windowActions')
-const AddEditBookmarkHanger = require('../../app/renderer/components/addEditBookmarkHanger')
+
+// Components
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
+const Dialog = require('../../../../js/components/dialog')
+const AddEditBookmarkHanger = require('./addEditBookmarkHanger')
+
+// Actions
+const windowActions = require('../../../../js/actions/windowActions')
 
 class AddEditBookmark extends ImmutableComponent {
   constructor () {

diff --git a/...derer/components/addEditBookmarkHanger.js → ...onents/bookmarks/addEditBookmarkHanger.js b/...derer/components/addEditBookmarkHanger.js → ...onents/bookmarks/addEditBookmarkHanger.js
@@ -3,17 +3,25 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('../../../js/components/immutableComponent')
-const Button = require('../../../js/components/button')
-const cx = require('../../../js/lib/classSet')
-const windowActions = require('../../../js/actions/windowActions')
-const appActions = require('../../../js/actions/appActions')
-const KeyCodes = require('../../common/constants/keyCodes')
-const siteTags = require('../../../js/constants/siteTags')
-const settings = require('../../../js/constants/settings')
-const siteUtil = require('../../../js/state/siteUtil')
-const UrlUtil = require('../../../js/lib/urlutil')
-const getSetting = require('../../../js/settings').getSetting
+
+// Components
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
+const Button = require('../../../../js/components/button')
+
+// Actions
+const appActions = require('../../../../js/actions/appActions')
+const windowActions = require('../../../../js/actions/windowActions')
+
+// Constants
+const KeyCodes = require('../../../common/constants/keyCodes')
+const siteTags = require('../../../../js/constants/siteTags')
+const settings = require('../../../../js/constants/settings')
+
+// Utils
+const cx = require('../../../../js/lib/classSet')
+const siteUtil = require('../../../../js/state/siteUtil')
+const UrlUtil = require('../../../../js/lib/urlutil')
+const getSetting = require('../../../../js/settings').getSetting
 
 class AddEditBookmarkHanger extends ImmutableComponent {
   constructor () {