Merge branch 'master' of github.com:brave/browser-laptop

brave · Feb 11, 2017 · 6cf4f1b · 6cf4f1b
2 parents a169396 + 29efe9c
commit 6cf4f1b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,27 @@
 # Changelog
 
 ## [0.13.3](https://github.com/brave/browser-laptop/releases/v0.13.3dev)
-- TODO
+- Added a way to export bookmarks. ([#1002](https://github.com/brave/browser-laptop/issues/1002))
+- Added preference for background image or gradient for new tab. ([#6965](https://github.com/brave/browser-laptop/issues/6965))
+- Added a preference setting to "always allow" full screen view. ([#5979](https://github.com/brave/browser-laptop/issues/5979))
+- Added Ecosia as search engine. ([#7158](https://github.com/brave/browser-laptop/issues/7158))
+- Added translation for bookmarks manager. ([#7130](https://github.com/brave/browser-laptop/issues/7130))
+- Added new verified state for disabled publishers. ([#6974](https://github.com/brave/browser-laptop/issues/6974))
+- Fixed lookup in dictionary by context menu. ([#7167](https://github.com/brave/browser-laptop/issues/7167))
+- Fixed rapid tab switching. ([#7138](https://github.com/brave/browser-laptop/issues/7138))
+- Fixed various UI issues. ([#7181](https://github.com/brave/browser-laptop/issues/7181))
+- Fixed 'more bookmarks' menu item. ([#7097](https://github.com/brave/browser-laptop/issues/7097))
+- Fixed Brave crash when Brave payment is disabled and enabled frequently. ([#7031](https://github.com/brave/browser-laptop/issues/7031))
+- Fixed stutter/odd jump when tab switching with unloaded tabs. ([#6895](https://github.com/brave/browser-laptop/issues/6895))
+- Fixed disable close button on tabs if tab size is too small. ([#5431](https://github.com/brave/browser-laptop/issues/5431))
+- Fixed viewport regaining focus after closing downloads-bar. ([#3219](https://github.com/brave/browser-laptop/issues/3219))
+- Fixed click target for Audio indicator on/off button. ([#1776](https://github.com/brave/browser-laptop/issues/1776))
+- Fixed three-finger "Look up" tap. ([#1064](https://github.com/brave/browser-laptop/issues/1064))
+- Fixed tabs don't resize with window. ([#100](https://github.com/brave/browser-laptop/issues/100))
+- Upgraded to node 7.4.0. ([#7061](https://github.com/brave/browser-laptop/issues/7061))
+- Upgrade muon to 2.56.2. ([#7173](https://github.com/brave/browser-laptop/issues/7173))
+- Upgrade to Chromium v56. (1 week before potentially) ([#3681](https://github.com/brave/browser-laptop/issues/3681))
+
 
 ## [0.13.2](https://github.com/brave/browser-laptop/releases/v0.13.2dev)
 - Added a way to keep tabs the same size when closing instead of resizing. ([#6088](https://github.com/brave/browser-laptop/issues/6088))

diff --git a/app/browser/bookmarksExporter.js b/app/browser/bookmarksExporter.js
@@ -52,7 +52,7 @@ function createBookmarkArray (sites, parentFolderId, first = true, depth = 1) {
 
   if (first) payload.push(`${indentFirst}<DL><p>`)
 
-  filteredBookmarks.forEach((site) => {
+  filteredBookmarks.toList().sort(siteUtil.siteSort).forEach((site) => {
     if (site.get('tags').includes(siteTags.BOOKMARK) && site.get('location')) {
       title = site.get('customTitle') || site.get('title') || site.get('location')
       payload.push(`${indentNext}<DT><A HREF="${site.get('location')}">${title}</A>`)

diff --git a/app/common/lib/menuUtil.js b/app/common/lib/menuUtil.js
@@ -153,7 +153,7 @@ const isItemValid = (currentItem, previousItem) => {
   }
 
   return currentItem && (typeof currentItem.l10nLabelId === 'string' || typeof currentItem.label === 'string' ||
-    currentItem.type === 'separator' || typeof currentItem.slice === 'function')
+    currentItem.type === 'separator' || typeof currentItem.slice === 'function' || typeof currentItem.labelDataBind === 'string')
 }
 
 const sanitizeTemplateItems = (template) => {

diff --git a/app/extensions/brave/content/scripts/blockFlash.js b/app/extensions/brave/content/scripts/blockFlash.js
@@ -2,7 +2,8 @@
  * 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 adobeRegex = new RegExp('//(get\\.adobe\\.com/([a-z_-]+/)*flashplayer|www\\.macromedia\\.com/go/getflash|www\\.adobe\\.com/go/getflash)', 'i')
+const adobeRegex =
+  new RegExp('//(get\\.adobe\\.com/([a-z_-]+/)*flashplayer|www\\.macromedia\\.com/go/getflash|www\\.adobe\\.com/go/getflash|helpx\\.adobe\\.com/flash-player/([a-z_-]+/)*flash-player)', 'i')
 
 function blockFlashDetection () {
   const handler = {

diff --git a/test/unit/app/common/lib/menuUtilTest.js b/test/unit/app/common/lib/menuUtilTest.js
@@ -257,9 +257,9 @@ describe('menuUtil tests', function () {
     })
     it('checks submenus recursively', function () {
       const template = [separator, {test: 'test'}, {label: 'lol'},
-        { label: 'submenu', submenu: [separator, {label: 'foo'}] }]
+        { label: 'submenu', submenu: [separator, {label: 'foo'}, {labelDataBind: 'zoomLevel'}] }]
       const result = menuUtil.sanitizeTemplateItems(template)
-      const expectedResult = [{label: 'lol'}, {label: 'submenu', submenu: [{label: 'foo'}]}]
+      const expectedResult = [{label: 'lol'}, {label: 'submenu', submenu: [{label: 'foo'}, {labelDataBind: 'zoomLevel'}]}]
 
       assert.deepEqual(result, expectedResult)
     })