Bookmark manager style update

app/common/lib/faviconUtil.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { isSourceAboutUrl } = require('../../../js/lib/appUrlUtil')
+const {isSourceAboutUrl} = require('../../../js/lib/appUrlUtil')
 const UrlUtil = require('../../../js/lib/urlutil')
 
 module.exports.iconSize = 16

app/extensions/brave/about-bookmarks.html

@@ -7,9 +7,9 @@
     <meta charset="utf-8">
     <meta name="availableLanguages" content="">
     <meta name="defaultLanguage" content="en-US">
-    <meta name='theme-color' content='#035500'>
+    <meta name='theme-color' content='#ff5000'>
     <link rel="shortcut icon"type="image/x-icon" href="data:image/x-icon;,">
-    <title data-l10n-id="bookmarks"></title>
+    <title data-l10n-id="bookmarkManager"></title>
     <script src='js/about.js'></script>
     <script src="ext/l20n.min.js" async></script>
     <link rel="localization" href="locales/{locale}/bookmarks.properties">

app/extensions/brave/locales/en-US/bookmarks.properties

@@ -1,6 +1,8 @@
 bookmarks=Bookmarks
+bookmarkManager=Bookmark Manager
 folders=Folders
 partitionNumber=Session {{partitionNumber}}
 bookmarksToolbar=Bookmarks Toolbar
 otherBookmarks=Other Bookmarks
 bookmarkSearch.placeholder=Search bookmarks
+importBrowserData=Import browser data

app/extensions/brave/locales/en-US/history.properties

@@ -2,7 +2,7 @@ historyTitle=History
 history=History
 clearBrowsingDataNow=Clear browsing data
 removeSelectedItems=Remove selected items
-historySearch=Search history
 time=Time
 title=Title
 domain=Domain
+historySearch.placeholder=Search history

app/renderer/components/bookmarksToolbar.js

@@ -32,28 +32,19 @@ class BookmarkToolbarButton extends ImmutableComponent {
     this.onDragOver = this.onDragOver.bind(this)
     this.onContextMenu = this.onContextMenu.bind(this)
   }
-
-  showBookmarkFolderMenu (e) {
-    e.target = ReactDOM.findDOMNode(this)
-
-    if (e && e.stopPropagation) {
-      e.stopPropagation()
-    }
-
-    const xPos = (e.target.getBoundingClientRect().left | 0) - 2
-    const yPos = (e.target.parentNode.getBoundingClientRect().bottom | 0) - 1
-
-    windowActions.onMouseOverBookmarkFolder(this.props.bookmark.get('folderId'), this.props.sites, this.props.bookmark, xPos, yPos)
+  get activeFrame () {
+    return windowStore.getFrame(this.props.activeFrameKey)
   }
-
   onClick (e) {
     if (!this.props.clickBookmarkItem(this.props.bookmark, e) &&
         this.props.bookmark.get('tags').includes(siteTags.BOOKMARK_FOLDER)) {
       if (this.props.contextMenuDetail) {
         windowActions.setContextMenuDetail()
         return
       }
-      this.showBookmarkFolderMenu(e)
+      e.target = ReactDOM.findDOMNode(this)
+      this.props.showBookmarkFolderMenu(this.props.bookmark, e)
+      return
     }
   }
 
@@ -62,10 +53,12 @@ class BookmarkToolbarButton extends ImmutableComponent {
     if (this.props.selectedFolderId) {
       if (this.isFolder && this.props.selectedFolderId !== this.props.bookmark.get('folderId')) {
         // Auto-expand the menu if user mouses over another folder
-        this.showBookmarkFolderMenu(e)
+        e.target = ReactDOM.findDOMNode(this)
+        this.props.showBookmarkFolderMenu(this.props.bookmark, e)
       } else if (!this.isFolder && this.props.selectedFolderId !== -1) {
         // Hide the currently expanded menu if user mouses over a non-folder
-        windowActions.onMouseOverBookmarkFolder(-1)
+        windowActions.setBookmarksToolbarSelectedFolderId(-1)
+        windowActions.setContextMenuDetail()
       }
     }
   }
@@ -84,7 +77,7 @@ class BookmarkToolbarButton extends ImmutableComponent {
       e.target = ReactDOM.findDOMNode(this)
       if (dnd.isMiddle(e.target, e.clientX)) {
         e.target.getBoundingClientRect
-        this.showBookmarkFolderMenu(e)
+        this.props.showBookmarkFolderMenu(this.props.bookmark, e)
         windowActions.setIsBeingDraggedOverDetail(dragTypes.BOOKMARK, this.props.bookmark, {
           expanded: true
         })
@@ -238,6 +231,7 @@ class BookmarksToolbar extends ImmutableComponent {
     this.onMoreBookmarksMenu = this.onMoreBookmarksMenu.bind(this)
     this.openContextMenu = this.openContextMenu.bind(this)
     this.clickBookmarkItem = this.clickBookmarkItem.bind(this)
+    this.showBookmarkFolderMenu = this.showBookmarkFolderMenu.bind(this)
   }
   get activeFrame () {
     return windowStore.getFrame(this.props.activeFrameKey)
@@ -293,6 +287,10 @@ class BookmarksToolbar extends ImmutableComponent {
   clickBookmarkItem (bookmark, e) {
     return bookmarkActions.clickBookmarkItem(this.bookmarks, bookmark, this.activeFrame, e)
   }
+  showBookmarkFolderMenu (bookmark, e) {
+    windowActions.setBookmarksToolbarSelectedFolderId(bookmark.get('folderId'))
+    contextMenus.onShowBookmarkFolderMenu(this.bookmarks, bookmark, this.activeFrame, e)
+  }
   updateBookmarkData (props) {
     this.bookmarks = siteUtil.getBookmarks(props.sites)
 
@@ -407,11 +405,12 @@ class BookmarksToolbar extends ImmutableComponent {
               ref={(node) => this.bookmarkRefs.push(node)}
               key={i}
               contextMenuDetail={this.props.contextMenuDetail}
+              activeFrameKey={this.props.activeFrameKey}
               draggingOverData={this.props.draggingOverData}
               openContextMenu={this.openContextMenu}
               clickBookmarkItem={this.clickBookmarkItem}
+              showBookmarkFolderMenu={this.showBookmarkFolderMenu}
               bookmark={bookmark}
-              sites={this.bookmarks}
               showFavicon={this.props.showFavicon}
               showOnlyFavicon={this.props.showOnlyFavicon}
               selectedFolderId={this.props.selectedFolderId} />)

docs/windowActions.md

@@ -891,7 +891,7 @@ See `eventStore.js` for an example use-case
 
 
 
-### onMouseOverBookmarkFolder(folderId, bookmarks, bookmark, xPos, yPos) 
+### setBookmarksToolbarSelectedFolderId(folderId) 
 
 Fired when the mouse clicks or hovers over a bookmark folder in the bookmarks toolbar
 
@@ -900,14 +900,6 @@ Fired when the mouse clicks or hovers over a bookmark folder in the bookmarks to
 **folderId**: `number`, from the siteDetail for the bookmark folder
   If set to null, no menu is open. If set to -1, mouse is over a bookmark, not a folder
 
-**bookmarks**: `Object`, all of the users bookmarks
-
-**bookmark**: `Object`, the object representing the selected folder
-
-**xPos**: `number`, x position of the left corner of the context mennu
-
-**yPos**: `number`, y position of the top corner of the context menu
-