Merge pull request #5084 from brave/show-bookmark-history-url-suggestion

bbondy · web-flow · commit ce20fe5ed49a · 2016-10-24T11:35:46.000-04:00
Show bookmarks in history auto-complete
diff --git a/js/components/urlBarSuggestions.js b/js/components/urlBarSuggestions.js
@@ -297,8 +297,11 @@ class UrlBarSuggestions extends ImmutableComponent {
           const title = site.get('title') || ''
           const location = site.get('location') || ''
           return (title.toLowerCase().includes(urlLocationLower) ||
-            location.toLowerCase().includes(urlLocationLower)) &&
-            (!site.get('tags') || site.get('tags').size === 0)
+                  location.toLowerCase().includes(urlLocationLower))
+          // Note: Bookmkark sites are now included in history. This will allow
+          // sites to appear in the auto-complete regardless of their bookmark
+          // status. If history is turned off, bookmarked sites will appear
+          // in the bookmark section.
         }
       }))
     }

Original file line number	Diff line number	Diff line change
`@@ -297,8 +297,11 @@ class UrlBarSuggestions extends ImmutableComponent {`
`297`	`297`	`const title = site.get('title') \|\| ''`
`298`	`298`	`const location = site.get('location') \|\| ''`
`299`	`299`	`return (title.toLowerCase().includes(urlLocationLower) \|\|`
`300`		`- location.toLowerCase().includes(urlLocationLower)) &&`
`301`		`- (!site.get('tags') \|\| site.get('tags').size === 0)`
	`300`	`+ location.toLowerCase().includes(urlLocationLower))`
	`301`	`+ // Note: Bookmkark sites are now included in history. This will allow`
	`302`	`+ // sites to appear in the auto-complete regardless of their bookmark`
	`303`	`+ // status. If history is turned off, bookmarked sites will appear`
	`304`	`+ // in the bookmark section.`
`302`	`305`	`}`
`303`	`306`	`}))`
`304`	`307`	`}`