Separators on Bookmarks-bar are Vertical rather than Horizontal

_locales/zh_CN/messages.json

@@ -132,13 +132,13 @@
     "message": "密码"
   },
   "LabelBookmarksfile": {
-    "message": "书签路径"
+    "message": "书签文件"
   },
   "DescriptionBookmarksfile": {
     "message": "相对于WebDAV URL的书签路径(所有路径必须已经存在).例如:personal_stuff/bookmarks.xbel "
   },
  "DescriptionBookmarksfilegoogle": {
-   "message": "书签文件的文件名，该文件将存放在 Google Drive 中（确保该名称在 Google Drive 中是唯一的）。"
+   "message": " Google 云盘内保存的书签文件的名称。不要输入完整的文件路径，只输入文件名即可。请确保该名称在你的 Google 云盘内是唯一的。"
  },
   "DescriptionBookmarksfilegit": {
     "message": "相对于你的 Git 存储库根目录的书签文件路径 (路径中的所有文件夹必须都已存在)。如，personal_stuff/bookmarks.xbel"

manifest-firefox-override.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/sh
+
+# Local development workaround for Firefox.
+#
+# Once you build this extension (with `npm install` and `npm run build`, as per <README.md>), to
+# load it, visit Firefox special URL about:debugging#/runtime/this-firefox. Click button "Load
+# Temporary Add-on..." That button shows a file/folder picker.
+#
+# Problem: The file picker does allow you to select `manifest.firefox.json`, BUT it will not load
+# it. It loads `manifest.json` (from the directory where you selected `manifest.firefox.json`)
+# instead. (Indeed, a Firefox defect - but life is too short for us to waste it on Mozilla's
+# bugzilla....)
+#
+# Firefox doesn't allow to use symlinks to workaround the above problem (see
+# https://bugzilla.mozilla.org/show_bug.cgi?id=803999 - symlinks are a security problem).
+#
+# Workaround: This script
+# 1. copies manifest.firefox.json over manifest.json
+# 2. prevents that change from being accidentally committed to GIT.
+
+# Enter the directory where this script is (in case we call it from somewhere else).
+cd "${0%/*}"
+
+# Invoking `/usr/bin/cp` directly, in case there's an alias that warns about overriding existing
+# files.
+/usr/bin/cp manifest.firefox.json manifest.json
+
+# See also
+# https://stackoverflow.com/questions/13630849/git-difference-between-assume-unchanged-and-skip-worktree
+git update-index --skip-worktree manifest.json

package.json

@@ -4,8 +4,11 @@
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "NODE_OPTIONS=--max-old-space-size=5000 gulp",
+    "build-win": "SET NODE_OPTIONS=--max-old-space-size=5000 & gulp",
     "build-release": "NODE_OPTIONS=--max-old-space-size=5000 gulp release",
+    "build-release-win": "SET NODE_OPTIONS=--max-old-space-size=5000 & gulp release",
     "watch": "NODE_OPTIONS=--max-old-space-size=5000 gulp watch",
+    "watch-win": "SET NODE_OPTIONS=--max-old-space-size=5000 & gulp watch",
     "test": "node --unhandled-rejections=strict test/selenium-runner.js",
     "lint": "eslint --ext .js,.vue src",
     "lint:fix": "eslint --ext .js,.vue src --fix"

src/lib/browser/BrowserTree.ts

@@ -40,7 +40,11 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
     await this.absoluteRootPromise
     const allAccounts = await (await Account.getAccountClass()).getAllAccounts()
 
-    const recurse = (node, parentId?, rng?) => {
+    const recurse = (node, parentId?, isOnToolbar?, rng?) => {
+      const TITLE_BOOKMARKS_BAR = 'Bookmarks Bar',
+            TITLE_OTHER_BOOKMARKS = 'Other Bookmarks',
+            TITLE_BOOKMARKS_MENU = 'Bookmarks Menu',
+            TITLE_MOBILE_BOOKMARKS = 'Mobile Bookmarks'
       if (
         allAccounts.some(
           acc => acc.getData().localRoot === node.id && String(node.id) !== String(this.rootId) && !acc.getData().nestedSync
@@ -49,22 +53,23 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
         // This is the root folder of a different account and the user doesn't want nested sync
         return
       }
-      let overrideTitle, isRoot
+      let overrideTitle, isRoot, isToolbar
       if (node.parentId === this.absoluteRoot.id && !isVivaldiBrowser) {
         switch (node.id) {
           case '1': // Chrome
           case 'toolbar_____': // Firefox
-            overrideTitle = 'Bookmarks Bar'
+            overrideTitle = TITLE_BOOKMARKS_BAR
+            isToolbar = true
             break
           case '2': // Chrome
           case 'unfiled_____': // Firefox
-            overrideTitle = 'Other Bookmarks'
+            overrideTitle = TITLE_OTHER_BOOKMARKS
             break
           case 'menu________': // Firefox
-            overrideTitle = 'Bookmarks Menu'
+            overrideTitle = TITLE_BOOKMARKS_MENU
             break
           case 'mobile______': // Firefox
-            overrideTitle = 'Mobile Bookmarks'
+            overrideTitle = TITLE_MOBILE_BOOKMARKS
         }
         if (overrideTitle) {
           Logger.log(
@@ -91,7 +96,7 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
           title: parentId ? overrideTitle || node.title : undefined,
           children: node.children
             .map((child) => {
-              return recurse(child, node.id, rng)
+              return recurse(child, node.id, isToolbar, rng)
             })
             .filter(child => !!child) // filter out `undefined` from nested accounts
         })
@@ -103,10 +108,12 @@ export default class BrowserTree implements IResource<typeof ItemLocation.LOCAL>
           location: ItemLocation.LOCAL,
           id: node.id,
           parentId,
-          title: '-----',
+          title: isOnToolbar ? '' : '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯',
           // If you have more than a quarter million separators in one folder, call me
           // Floccus breaks down much earlier atm
-          url: `https://separator.floccus.org/?id=${rng.int(0,1000000)}`,
+          url: 'https://separator.floccus.org/' +
+               (isOnToolbar ? 'vertical.html' : '') +
+               `?id=${rng.int(0,1000000)}`,
         })
       } else {
         return new Tree.Bookmark({

src/test/test.js

@@ -2319,6 +2319,10 @@ describe('Floccus', function() {
               title: 'foo',
               parentId: barFolder.id
             })
+            const bookmarksBar = await browser.bookmarks.create({
+              title: 'Bookmarks Bar',
+              parentId: localRoot
+            })
             await browser.bookmarks.create({
               title: 'url',
               url: 'http://ur.l/',
@@ -2337,6 +2341,15 @@ describe('Floccus', function() {
               type: 'separator',
               parentId: fooFolder.id
             })
+            await browser.bookmarks.create({
+              title: 'url3',
+              url: 'http://ur3.l',
+              parentId: bookmarksBar.id
+            })
+            await browser.bookmarks.create({
+              type: 'separator',
+              parentId: bookmarksBar.id
+            })
 
             await account.sync() // propagate to server
             expect(account.getData().error).to.not.be.ok
@@ -2352,11 +2365,16 @@ describe('Floccus', function() {
                       new Folder({title: 'foo',
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'}),
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=731368'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=731368'})
                         ]}),
                     ]}),
+                  new Folder({title: 'Bookmarks Bar',
+                    children: [
+                      new Bookmark({title: 'url3',url: 'http://ur3.l'}),
+                      new Bookmark({title: '', url: 'https://separator.floccus.org/vertical.html?id=591710'})
+                    ]})
                 ]}),
               false
             )
@@ -2369,11 +2387,16 @@ describe('Floccus', function() {
                       new Folder({title: 'foo',
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'}),
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=731368'})
-                        ]}),
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=731368'})
+                        ]})
                     ]}),
+                  new Folder({title: 'Bookmarks Bar',
+                    children: [
+                      new Bookmark({title: 'url3',url: 'http://ur3.l'}),
+                      new Bookmark({title: '', url: 'https://separator.floccus.org/vertical.html?id=591710'})
+                    ]})
                 ]}),
               false
             )
@@ -2401,10 +2424,15 @@ describe('Floccus', function() {
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'})
                         ]}),
-                      new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=379999'})
+                      new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=379999'})
                     ]}),
+                  new Folder({title: 'Bookmarks Bar',
+                    children: [
+                      new Bookmark({title: 'url3',url: 'http://ur3.l'}),
+                      new Bookmark({title: '', url: 'https://separator.floccus.org/vertical.html?id=591710'})
+                    ]})
                 ]}),
               false
             )
@@ -2419,10 +2447,15 @@ describe('Floccus', function() {
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=731368'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=731368'})
                         ]}),
-                      new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'})
+                      new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'})
                     ]}),
+                  new Folder({title: 'Bookmarks Bar',
+                    children: [
+                      new Bookmark({title: 'url3',url: 'http://ur3.l'}),
+                      new Bookmark({title: '', url: 'https://separator.floccus.org/vertical.html?id=591710'})
+                    ]})
                 ]}),
               false
             )
@@ -2482,9 +2515,9 @@ describe('Floccus', function() {
                       new Folder({title: 'foo',
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'}),
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=731368'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=731368'})
                         ]}),
                     ]}),
                 ]}),
@@ -2499,9 +2532,9 @@ describe('Floccus', function() {
                       new Folder({title: 'foo',
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'}),
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=731368'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=731368'})
                         ]}),
                     ]}),
                 ]}),
@@ -2528,7 +2561,7 @@ describe('Floccus', function() {
                         children: [
                           new Bookmark({title: 'url', url: 'http://ur.l/'}),
                           new Bookmark({title: 'url2',url: 'http://ur2.l'}),
-                          new Bookmark({title: '-----', url: 'https://separator.floccus.org/?id=467366'})
+                          new Bookmark({title: '⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯', url: 'https://separator.floccus.org/?id=467366'})
                         ]}),
                     ]}),
 

src/ui/components/AccountCard.vue

@@ -74,10 +74,10 @@
             </template>
             <template v-if="status === 'scheduled'">
               <v-btn
-                  :color="statusType"
-                  class="float-right"
-                  x-small
-                  @click="onForceSync">
+                :color="statusType"
+                class="float-right"
+                x-small
+                @click="onForceSync">
                 {{ t('LabelScheduledforcesync') }}
               </v-btn>
             </template>

src/ui/components/OptionsGoogleDrive.vue

@@ -92,8 +92,8 @@
       </v-card-title>
       <v-card-text>
         <OptionAutoSync
-            :value="enabled"
-            @input="$emit('update:enabled', $event)" />
+          :value="enabled"
+          @input="$emit('update:enabled', $event)" />
         <OptionSyncInterval
           :value="syncInterval"
           @input="$emit('update:syncInterval', $event)" />