Merge branch 'dev'

addon/actions/misc.js

@@ -2,8 +2,11 @@
  * Handle click on browser-action button
  */
 function initToolbarButton() {
-  browser.browserAction.onClicked.addListener(async () => {
-    browser.sidebarAction.open()
+  createSettingsMenu()
+
+  browser.browserAction.onClicked.addListener(async (_, info) => {
+    if (info && info.button === 1) return browser.runtime.openOptionsPage()
+    else browser.sidebarAction.open()
   })
 }
 
@@ -35,10 +38,14 @@ async function loadPermissions() {
 
 function onMenuHidden() {
   browser.menus.removeAll()
+  createSettingsMenu()
+}
 
+function createSettingsMenu() {
   browser.menus.create({
     id: 'open_settings',
     title: 'Open settings',
+    icons: { '16': 'assets/logo-native.svg' },
     onclick: () => browser.runtime.openOptionsPage(),
     contexts: ['browser_action'],
   })

addon/actions/snapshots.js

@@ -76,6 +76,15 @@ async function createSnapshot() {
     lastSnapTime: currentSnapshot.time,
   })
 
+  if (this.settings.snapNotify) {
+    let win = await browser.windows.getCurrent({ populate: false })
+    browser.runtime.sendMessage({
+      windowId: win.id,
+      instanceType: 'sidebar',
+      action: 'notifyAboutNewSnapshot',
+    })
+  }
+
   return currentSnapshot
 }
 function createSnapshotDebounced(delay = 750) {

addon/background.js

@@ -1,4 +1,5 @@
 import Actions, { injectInActions } from './actions.js'
+import { DEFAULT_SETTINGS } from './defaults.js'
 
 void (async function main() {
   const state = injectInActions()
@@ -22,8 +23,8 @@ void (async function main() {
   await Actions.loadContainers()
 
   // Load settings
-  let { settings } = await browser.storage.local.get({ settings: null })
-  state.settings = settings ? settings : {}
+  let { settings } = await browser.storage.local.get({ settings: {} })
+  state.settings = Utils.normalizeObject(settings, DEFAULT_SETTINGS)
 
   await Actions.loadTabs(state.windows, state.tabsMap)
   await Actions.backupTabsData()

addon/defaults.js

@@ -1,42 +1,21 @@
 import { translate } from './locales/dict.js'
 
+// prettier-ignore
 export const SETTINGS_OPTIONS = {
   autoHideCtxMenuOpts: [250, 500, 1000, 'none'],
   navMidClickActionOpts: ['rm_all', 'none'],
   groupLayoutOpts: ['grid', 'list'],
   scrollThroughTabsOpts: ['panel', 'global', 'none'],
   discardFoldedDelayUnitOpts: ['sec', 'min'],
   tabDoubleClickOpts: [
-    'reload',
-    'duplicate',
-    'pin',
-    'mute',
-    'clear_cookies',
-    'exp',
-    'new_after',
-    'new_child',
-    'close',
-    'none',
+    'reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'exp', 'new_after', 'new_child',
+    'close', 'none',
   ],
   tabLongLeftClickOpts: [
-    'reload',
-    'duplicate',
-    'pin',
-    'mute',
-    'clear_cookies',
-    'new_after',
-    'new_child',
-    'none',
+    'reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'new_after', 'new_child', 'none',
   ],
   tabLongRightClickOpts: [
-    'reload',
-    'duplicate',
-    'pin',
-    'mute',
-    'clear_cookies',
-    'new_after',
-    'new_child',
-    'none',
+    'reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'new_after', 'new_child', 'none',
   ],
   tabsPanelLeftClickActionOpts: ['prev', 'expand', 'parent', 'none'],
   tabsPanelDoubleClickActionOpts: ['collapse', 'tab', 'none'],
@@ -59,7 +38,7 @@ export const SETTINGS_OPTIONS = {
   midClickBookmarkOpts: ['open_new_tab', 'edit', 'delete'],
   warnOnMultiTabCloseOpts: ['any', 'collapsed', 'none'],
   warnOnMultiBookmarkDeleteOpts: ['any', 'collapsed', 'none'],
-  navBarLayoutOpts: ['horizontal', 'vertical'],
+  navBarLayoutOpts: ['horizontal', 'vertical', 'hidden'],
   stateStorageOpts: ['global', 'session'],
   autoFoldTabsExceptOpts: [1, 2, 3, 4, 5, 'none'],
 }
@@ -94,6 +73,7 @@ export const DEFAULT_SETTINGS = {
   activateLastTabOnPanelSwitching: true,
   skipEmptyPanels: false,
   showTabRmBtn: true,
+  showTabCtx: true,
   hideInact: false,
   activateAfterClosing: 'next',
   activateAfterClosingPrevRule: 'visible',
@@ -153,6 +133,7 @@ export const DEFAULT_SETTINGS = {
   groupCSS: false,
 
   // Snapshots
+  snapNotify: true,
   snapInterval: 0,
   snapIntervalUnit: 'min',
   snapLimit: 0,

addon/locales/en.notifications.js

@@ -6,4 +6,7 @@ export default {
     message: [' bookmark was removed', ' bookmarks were removed'],
     plur: [1],
   },
+  'notif.bookmarks_sort': { message: 'Sorting bookmarks...' },
+  'notif.snapshot_created': { message: 'Snapshot created' },
+  'notif.view_snapshot': { message: 'View' },
 }

addon/locales/en.settings.js

@@ -57,6 +57,7 @@ export default {
   'settings.nav_bar_layout': { message: 'Layout' },
   'settings.nav_bar_layout_horizontal': { message: 'horizontal' },
   'settings.nav_bar_layout_vertical': { message: 'vertical' },
+  'settings.nav_bar_layout_hidden': { message: 'hidden' },
   'settings.nav_bar_inline': { message: 'Show navigation bar in one line' },
   'settings.hide_settings_btn': { message: 'Hide settings button' },
   'settings.hide_add_btn': { message: 'Hide "Create panel" button' },
@@ -100,6 +101,7 @@ export default {
   },
   'settings.skip_empty_panels': { message: 'Skip empty panels on switching' },
   'settings.show_tab_rm_btn': { message: 'Show close button on mouse hover' },
+  'settings.show_tab_ctx': { message: 'Show color mark of container' },
   'settings.hide_inactive_panel_tabs': { message: 'Hide tabs of inactive panels' },
   'settings.activate_after_closing': { message: 'After closing current tab activate' },
   'settings.activate_after_closing_next': { message: 'next tab' },
@@ -236,6 +238,7 @@ export default {
 
   // --- Snapshots
   'settings.snapshots_title': { message: 'Snapshots' },
+  'settings.snap_notify': { message: 'Show notification after snapshot creation' },
   'settings.snap_interval': { message: 'Auto-snapshots interval' },
   'settings.snap_interval_min': { message: ['minute', 'minutes'], plur: [1] },
   'settings.snap_interval_hr': { message: ['hour', 'hours'], plur: [1] },
@@ -289,6 +292,7 @@ export default {
   // --- Keybindings
   'settings.kb_title': { message: 'Keybindings' },
   'settings.reset_kb': { message: 'Reset Keybindings' },
+  'settings.toggle_kb': { message: 'Enable/Disable Keybindings' },
 
   // --- Permissions
   'settings.permissions_title': { message: 'Permissions' },

addon/locales/en.styles.js

@@ -94,4 +94,16 @@ export default {
 
   'styles.css_sidebar': { message: 'Sidebar' },
   'styles.css_group': { message: 'Group page' },
+  'styles.css_placeholder': { message: 'Write custom CSS here...' },
+  'styles.css_selectors_instruction': {
+    message: `NOTE: To get currently available css-selectors use debugger:
+  - Enter "about:debugging" in the URL bar
+  - In the left-hand menu, click This Firefox (or This Nightly)
+  - Click Inspect next to Sidebery extension
+  - Select frame to inspect
+    - Click on the rectangular icon (with three sections) in top-right area of the debugger page
+    - Select "/sidebar/index.html" for sidebar frame
+    - Select "/group/group.html" for group page frame
+  - Browse "Inspector" tab`,
+  },
 }

addon/locales/ru.notifications.js

@@ -6,4 +6,7 @@ export default {
     message: [' закладка была удалена', ' закладки было удалено', ' закладок было удалено'],
     plur: [/^(1|(\d*?)[^1]1)$/, /^([234]|(\d*?)[^1][234])$/],
   },
+  'notif.bookmarks_sort': { message: 'Сортировка закладок...' },
+  'notif.snapshot_created': { message: 'Снепшот создан' },
+  'notif.view_snapshot': { message: 'Посмотреть' },
 }

addon/locales/ru.settings.js

@@ -57,6 +57,7 @@ export default {
   'settings.nav_bar_layout': { message: 'Расположение' },
   'settings.nav_bar_layout_horizontal': { message: 'горизонтальное' },
   'settings.nav_bar_layout_vertical': { message: 'вертикальное' },
+  'settings.nav_bar_layout_hidden': { message: 'скрытое' },
   'settings.nav_bar_inline': { message: 'В одну строку' },
   'settings.hide_settings_btn': { message: 'Скрывать кнопку "Настройки"' },
   'settings.hide_add_btn': { message: 'Скрывать кнопку "Создать панель"' },
@@ -101,6 +102,7 @@ export default {
   },
   'settings.skip_empty_panels': { message: 'Пропускать пустые контейнеры при переключении' },
   'settings.show_tab_rm_btn': { message: 'Показывать кнопку закрытия таба при наведении курсора' },
+  'settings.show_tab_ctx': { message: 'Показывать цветовую метку контейнера' },
   'settings.hide_inactive_panel_tabs': { message: 'Скрывать табы неактивных панелей' },
   'settings.activate_after_closing': { message: 'После закрытия текущей вкладки активировать' },
   'settings.activate_after_closing_next': { message: 'следующую' },
@@ -255,6 +257,7 @@ export default {
 
   // --- Snapshots
   'settings.snapshots_title': { message: 'Снепшоты' },
+  'settings.snap_notify': { message: 'Показать уведомление после создания снепшота' },
   'settings.snap_interval': { message: 'Интервал авто-снепшотов' },
   'settings.snap_interval_min': {
     message: ['минута', 'минуты', 'минут'],
@@ -330,6 +333,7 @@ export default {
   // --- Keybindings
   'settings.kb_title': { message: 'Клавиши' },
   'settings.reset_kb': { message: 'Сбросить клав. настройки' },
+  'settings.toggle_kb': { message: 'Включить / отключить сочетания клавиш' },
 
   // --- Permissions
   'settings.permissions_title': { message: 'Разрешения' },

addon/locales/ru.styles.js

@@ -98,4 +98,16 @@ export default {
 
   'styles.css_sidebar': { message: 'Боковая панель' },
   'styles.css_group': { message: 'Групповая страница' },
+  'styles.css_placeholder': { message: 'Write custom CSS here...' },
+  'styles.css_selectors_instruction': {
+    message: `NOTE: To get currently available css-selectors use debugger:
+  - Enter "about:debugging" in the URL bar
+  - In the left-hand menu, click This Firefox (or This Nightly)
+  - Click Inspect next to Sidebery extension
+  - Select frame to inspect
+    - Click on the rectangular icon (with three sections) in top-right area of the debugger page
+    - Select "/sidebar/index.html" for sidebar frame
+    - Select "/group/group.html" for group page frame
+  - Browse "Inspector" tab`,
+  },
 }

addon/manifest.json

@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "4.0.5",
+  "version": "4.1.0",
   "default_locale": "en",
   "description": "__MSG_ExtDesc__",
   "homepage_url": "https://github.com/mbnuqw/sidebery",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidebery",
-  "version": "4.0.5",
+  "version": "4.1.0",
   "description": "Manage your tabs and bookmarks in sidebar",
   "main": "index.js",
   "scripts": {

src/actions/keybindings.js

@@ -2,7 +2,18 @@
  * Load keybindings
  */
 async function loadKeybindings() {
-  let commands = await browser.commands.getAll()
+  let [commands, storage] = await Promise.all([
+    browser.commands.getAll(),
+    browser.storage.local.get({ disabledKeybindings: {} }),
+  ])
+
+  this.state.kbMap = {}
+
+  for (let k of commands) {
+    k.active = !storage.disabledKeybindings[k.name]
+    this.state.kbMap[k.name] = k
+  }
+
   this.state.keybindings = commands
 }
 

src/page.settings/actions/keybindings.js

@@ -7,6 +7,17 @@ async function updateKeybinding(name, shortcut) {
   await browser.commands.update({ name, shortcut })
 }
 
+/**
+ * Save keybindings
+ */
+async function saveKeybindings() {
+  let disabledKeybindings = {}
+  for (let k of this.state.keybindings) {
+    if (!k.active) disabledKeybindings[k.name] = true
+  }
+  await browser.storage.local.set({ disabledKeybindings })
+}
+
 /**
  * Reset addon's keybindings
  */
@@ -24,5 +35,6 @@ export default {
   ...CommonActions,
 
   updateKeybinding,
+  saveKeybindings,
   resetKeybindings,
 }

src/page.settings/components/styles-editor.vue

@@ -523,10 +523,15 @@
       textarea.editor(
         ref="cssEditor"
         v-model="customCSS"
+        autocomplete="off"
+        autocorrect="off"
+        autocapitalize="off"
+        spellcheck="false"
         @input="onInput"
         @keydown.tab.prevent=""
         @change="applyCssDebounced")
-      .placeholder(:data-hidden="!!customCSS") CSS...
+      .placeholder(:data-hidden="!!customCSS") {{t('styles.css_placeholder')}}
+      .placeholder-note(:data-hidden="!!customCSS") {{t('styles.css_selectors_instruction')}}
 </template>
 
 <script>