Merge pull request #69 from teddy-gustiaux/develop

v2.10.1
teddy-gustiaux · Jul 4, 2019 · fe4afe6 · fe4afe6
2 parents 05808e7 + 3bbd799
commit fe4afe6
Show file tree

Hide file tree

Showing 15 changed files with 3,234 additions and 1,145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,21 @@
 
 All notable changes to this project are documented in this file.
 
+> 🛈 No longer want to see this page when the add-on is updated?
+>
+> Go to the add-on settings, and uncheck the option *`Show the release notes on GitHub when the add-on is updated`* in the `About` section.
+
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-Additionally, the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.2/) format is respected and used to generate the [conventional changelog](https://github.com/conventional-changelog/conventional-changelog).
+Additionally, the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.2/) format is respected and used to generate this [conventional changelog](https://github.com/conventional-changelog/conventional-changelog).
+
+## [2.10.1](https://github.com/teddy-gustiaux/default-bookmark-folder/compare/v2.10.0...v2.10.1) (2019-07-04)
+
+### Bug Fixes
+
+* copy for bookmarking of multiple tabs ([8fe0d2b](https://github.com/teddy-gustiaux/default-bookmark-folder/commit/8fe0d2b))
+* in add-on settings, move release notes section to the about section ([1dc0d1e](https://github.com/teddy-gustiaux/default-bookmark-folder/commit/1dc0d1e))
+* open add-on settings page on install ([fea376d](https://github.com/teddy-gustiaux/default-bookmark-folder/commit/fea376d))
+* option to show release notes on GitHub when the add-on is updated ([a938635](https://github.com/teddy-gustiaux/default-bookmark-folder/commit/a938635))
 
 # [2.10.0](https://github.com/teddy-gustiaux/default-bookmark-folder/compare/v2.9.0...v2.10.0) (2019-05-21)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "default-bookmark-folder",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "WebExtension allowing you to choose the default bookmark location folder and quickly bookmark pages there via a dedicated icon.",
   "main": "background.js",
   "scripts": {
@@ -39,17 +39,17 @@
   },
   "homepage": "https://github.com/teddy-gustiaux/default-bookmark-folder#readme",
   "devDependencies": {
-    "@babel/core": "7.4.4",
+    "@babel/core": "7.4.5",
     "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.4.4",
+    "@babel/preset-env": "7.4.5",
     "babel-plugin-istanbul": "5.1.4",
     "chai": "4.2.0",
     "conventional-changelog-cli": "2.0.21",
     "dirty-chai": "2.0.1",
-    "eslint": "5.16.0",
+    "eslint": "6.0.1",
     "eslint-config-airbnb-base": "13.1.0",
-    "eslint-config-prettier": "4.2.0",
-    "eslint-plugin-import": "2.17.2",
+    "eslint-config-prettier": "6.0.0",
+    "eslint-plugin-import": "2.18.0",
     "eslint-plugin-prettier": "3.1.0",
     "karma": "4.1.0",
     "karma-babel-preprocessor": "8.0.0",
@@ -61,12 +61,12 @@
     "karma-mocha": "1.3.0",
     "karma-mocha-reporter": "2.2.5",
     "mocha": "6.1.4",
-    "npm-check-updates": "3.1.9",
+    "npm-check-updates": "3.1.12",
     "nyc": "14.1.1",
-    "prettier": "1.17.1",
+    "prettier": "1.18.2",
     "sinon": "7.3.2",
     "sinon-chrome": "3.0.1",
-    "web-ext": "3.0.0"
+    "web-ext": "3.1.0"
   },
   "dependencies": {}
 }
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -69,16 +69,16 @@
     "message": "About"
   },
   "options_release_open_changelog": {
-    "message": "Show the release notes when the add-on is updated"
+    "message": "Show the release notes on GitHub when the add-on is updated"
   },
   "options_release_changelog_github": {
-    "message": "The release notes of the add-on are now accessible on GitHub."
+    "message": "The release notes of the add-on are accessible on GitHub (in English only)."
   },
   "options_release_full_changelog": {
     "message": "Access the changelog"
   },
   "options_ff_built_in_note": {
-    "message": "Those settings only apply to the built-in bookmarking system of Firefox. They allow you to select in which folder (and in which position of this folder) the new bookmarks will be added. It only affects bookmarks added through the built-in Firefox bookmark icon or shortcut (Ctrl+D), through the context menu or via the bookmarks menu."
+    "message": "The settings below only apply to the built-in bookmarking system of Firefox. They allow you to select in which folder (and in which position of this folder) the new bookmarks will be added. It only affects bookmarks added through the built-in Firefox bookmark icon or shortcut (Ctrl+D), through the context menu or via the bookmarks menu."
   },
   "options_ff_built_in_folder": {
     "message": "Select where new bookmarks will be added:"
@@ -99,25 +99,25 @@
     "message": "If disabled, new bookmarks will be added to the bottom of the selected folder"
   },
   "options_ff_built_in_folder_all_tabs_note": {
-    "message": "The setting below only applies when using the \"Bookmark All Tabs...\" feature of Firefox. It allows you to override the default location of the newly created folder, which contains itself one bookmark for each of the open tabs."
+    "message": "The settings below only apply when bookmarking multiple selected tabs at once or when using the \"Bookmark All Tabs...\" feature for all open tabs. It allows you to override the default location of the newly created folder, which contains itself one bookmark for each of the selected or open tabs (depending on the feature), as well as the position of the folder in this location."
   },
   "options_ff_built_in_folder_all_tabs": {
-    "message": "Select where new \"Bookmark All Tabs...\" folders will be added:"
+    "message": "Select where new folders of bookmarked tabs will be added:"
   },
   "options_ff_built_in_folder_all_tabs_default": {
     "message": "No folder selected (use Firefox's default bookmark location)"
   },
   "options_ff_built_in_folder_all_tabs_help_1": {
-    "message": "Note: Firefox's default \"Bookmark All Tabs...\" folder location is"
+    "message": "Note: Firefox's default location for folders of bookmarked tabs is"
   },
   "options_ff_built_in_folder_all_tabs_help_2": {
     "message": "Bookmarks Menu"
   },
   "options_ff_built_in_folder_all_tabs_top": {
-    "message": "Add new \"Bookmark All Tabs...\" folders to the top of the selected folder"
+    "message": "Add new folders of bookmarked tabs to the top of the selected folder"
   },
   "options_ff_built_in_folder_all_tabs_top_help": {
-    "message": "If disabled, new folders will be added to the bottom of the selected folder"
+    "message": "If disabled, new folders of bookmarked tabs will be added to the bottom of the selected folder"
   },
   "options_icon_explanation": {
     "message": "This feature will add a quick bookmark icon in the address bar, to (un)bookmark a page with only one click. The icon is a round star icon in the address bar. If the current page is bookmarked, the icon color will change to the selected color (red by default). Here are two screenshots to serve as examples: when the current page is not bookmarked and when it is."

diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
@@ -69,16 +69,16 @@
     "message": "À propos"
   },
   "options_release_open_changelog": {
-    "message": "Montrer les notes de version quand l’extension est mise à jour"
+    "message": "Ouvrir les notes de version sur GitHub quand l’extension est mise à jour"
   },
   "options_release_changelog_github": {
-    "message": "Les notes de versions sont maintenant consultables sur GitHub."
+    "message": "Les notes de versions sont consultables sur GitHub (en anglais uniquement)."
   },
   "options_release_full_changelog": {
     "message": "Accéder aux notes de versions"
   },
   "options_ff_built_in_note": {
-    "message": "Ces paramètres ne s’appliquent qu’au système de marquage interne à Firefox. Ils vous permettent de sélectionner à quel endroit (et à quelle position) les nouveaux marque-pages sont ajoutés. Cela n’affecte que les marque-pages créés via l’icône de marquage ou le raccourci (Ctrl+D) intégrés de Firefox, via le menu contextuel ou via le menu des marque-pages."
+    "message": "Les paramètres ci-dessous ne s’appliquent qu’au système de marquage interne à Firefox. Ils vous permettent de sélectionner à quel endroit (et à quelle position) les nouveaux marque-pages sont ajoutés. Cela n’affecte que les marque-pages créés via l’icône de marquage ou le raccourci (Ctrl+D) intégrés de Firefox, via le menu contextuel ou via le menu des marque-pages."
   },
   "options_ff_built_in_folder": {
     "message": "Sélectionner où les nouveaux marque-pages seront ajoutés :"
@@ -99,22 +99,22 @@
     "message": "Si désactivé, les nouveaux marque-pages seront ajoutés en bas du dossier sélectionné"
   },
   "options_ff_built_in_folder_all_tabs_note": {
-    "message": "Le paramètre ci-dessous ne s’applique qu’à la fonction \"Marquer tous les onglets...\" de Firefox. Il vous permet de choisir le dossier par défaut du dossier nouvellement créé, qui contient un marque-page pour chaque onglet ouvert."
+    "message": "Les paramètres ci-dessous ne s’applique qu’aux fonctionnalités permettant de marquer les onglets sélectionnés ou de \"Marquer tous les onglets...\" ouverts de Firefox. Ils vous permettent de choisir le dossier (et la position) par défaut du dossier nouvellement créé, qui contient un marque-page pour chaque onglet sélectionné ou ouvert (suivant la fonctionnalité utilisée)."
   },
   "options_ff_built_in_folder_all_tabs": {
-    "message": "Sélectionner où les nouveaux dossiers pour \"Marquer tous les onglets...\" seront ajoutés :"
+    "message": "Sélectionner où les nouveaux dossiers d’onglets marqués seront ajoutés :"
   },
   "options_ff_built_in_folder_all_tabs_default": {
     "message": "Pas de dossier sélectionné (le dossier par défaut de Firefox sera utilisé)"
   },
   "options_ff_built_in_folder_all_tabs_help_1": {
-    "message": "Note : le dossier par défaut de Firefox pour les dossiers \"Marquer tous les onglets...\" est"
+    "message": "Note : le dossier par défaut de Firefox pour les dossiers d’onglets marqués est"
   },
   "options_ff_built_in_folder_all_tabs_help_2": {
     "message": "Menu des marque-pages"
   },
   "options_ff_built_in_folder_all_tabs_top": {
-    "message": "Ajouter les nouveaux dossiers pour \"Marquer tous les onglets...\"  en haut du dossier sélectionné"
+    "message": "Ajouter les nouveaux dossiers d’onglets marqués en haut du dossier sélectionné"
   },
   "options_ff_built_in_folder_all_tabs_top_help": {
     "message": "Si désactivé, les nouveaux marque-pages seront ajoutés en bas du dossier sélectionné"

diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json
@@ -69,16 +69,16 @@
     "message": "About"
   },
   "options_release_open_changelog": {
-    "message": "Show the release notes when the add-on is updated"
+    "message": "Show the release notes on GitHub when the add-on is updated"
   },
   "options_release_changelog_github": {
-    "message": "The release notes of the add-on are now accessible on GitHub."
+    "message": "The release notes of the add-on are accessible on GitHub (in English only)."
   },
   "options_release_full_changelog": {
     "message": "Access the changelog"
   },
   "options_ff_built_in_note": {
-    "message": "Those settings only apply to the built-in bookmarking system of Firefox. They allow you to select in which folder (and in which position of this folder) the new bookmarks will be added. It only affects bookmarks added through the built-in Firefox bookmark icon or shortcut (Ctrl+D), through the context menu or via the bookmarks menu."
+    "message": "The settings below only apply to the built-in bookmarking system of Firefox. They allow you to select in which folder (and in which position of this folder) the new bookmarks will be added. It only affects bookmarks added through the built-in Firefox bookmark icon or shortcut (Ctrl+D), through the context menu or via the bookmarks menu."
   },
   "options_ff_built_in_folder": {
     "message": "Válassza ki, hogy az új könyvjelzõk hova legyenek hozzáadva:"
@@ -99,25 +99,25 @@
     "message": "Ha tiltott, akkor az új könyvjelzõk a kiválasztott mappa aljára kerülnek"
   },
   "options_ff_built_in_folder_all_tabs_note": {
-    "message": "A lenti beállítás csak akkor érvényes, ha a Firefox „Összes lap könyvjelzõzése…” funkcióját használja. Lehetõvé teszi a frissen létrehozott mappa alapértelmezett helyének felülbírálását, amely az összes nyitott mappa könyvjelzõjét tartalmazza."
+    "message": "The settings below only apply when bookmarking multiple selected tabs at once or when using the \"Bookmark All Tabs...\" feature for all open tabs. It allows you to override the default location of the newly created folder, which contains itself one bookmark for each of the selected or open tabs (depending on the feature), as well as the position of the folder in this location."
   },
   "options_ff_built_in_folder_all_tabs": {
-    "message": "Válassza ki, hogy az „Összes lap könyvjelzõzése…” mappák hová lesznek hozzáadva:"
+    "message": "Select where new folders of bookmarked tabs will be added:"
   },
   "options_ff_built_in_folder_all_tabs_default": {
     "message": "Nincs mappa kiválasztva (a Firefox alapértelmezett könyvjelzõzési helye)"
   },
   "options_ff_built_in_folder_all_tabs_help_1": {
-    "message": "Megjegyzés: A Firefox alapértelmezett „Összes lap könyvjelzõzése…” mappa helye:"
+    "message": "Note: Firefox's default location for folders of bookmarked tabs is"
   },
   "options_ff_built_in_folder_all_tabs_help_2": {
     "message": "Könyvjelzõk menü"
   },
   "options_ff_built_in_folder_all_tabs_top": {
-    "message": "Új „Összes lap könyvjelzõzése…” mappa hozzáadása a kiválasztott mappa tetejéhez"
+    "message": "Add new folders of bookmarked tabs to the top of the selected folder"
   },
   "options_ff_built_in_folder_all_tabs_top_help": {
-    "message": "Ha tiltott, akkor az új mappák a kiválasztott mappa aljára kerülnek"
+    "message": "If disabled, new folders of bookmarked tabs will be added to the bottom of the selected folder"
   },
   "options_icon_explanation": {
     "message": "Ez a funkció egy gyors könyvjelzõzés ikont tesz a címsávhoz, a könyvjelzõzés (és megszüntetése) csak egy kattintás. Az ikon egy kör alakú csillag ikon a címsávban. Ha a jelenlegi oldal könyvjelzõzött, akkor az ikon a kiválasztott színre vált (alapértelmezetten piros). Itt van két képernyõkép példaként: egyiken a jelenlegi oldal nincs könyvjelzõzve, a másikon pedig igen."

diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
@@ -69,10 +69,10 @@
     "message": "About"
   },
   "options_release_open_changelog": {
-    "message": "Показывать примечания к релизам при каждом обновлении расширения"
+    "message": "Show the release notes on GitHub when the add-on is updated"
   },
   "options_release_changelog_github": {
-    "message": "The release notes of the add-on are now accessible on GitHub."
+    "message": "The release notes of the add-on are accessible on GitHub (in English only)."
   },
   "options_release_full_changelog": {
     "message": "Access the changelog"
@@ -99,25 +99,25 @@
     "message": "Если эта настройка отключена, новые закладки будут добавляться после уже имеющихся элементов (в выбранной папке)"
   },
   "options_ff_built_in_folder_all_tabs_note": {
-    "message": "Настройки ниже, применимы только к функции Firefox \"Добавить вкладки в закладки..\". Они позволят вам изменить расположение, в котором будет создаваться новая папка, содержащая закладки для каждой из открытых вкладок."
+    "message": "The settings below only apply when bookmarking multiple selected tabs at once or when using the \"Bookmark All Tabs...\" feature for all open tabs. It allows you to override the default location of the newly created folder, which contains itself one bookmark for each of the selected or open tabs (depending on the feature), as well as the position of the folder in this location."
   },
   "options_ff_built_in_folder_all_tabs": {
-    "message": "Выберите куда по команде \"Добавить вкладки в закладки...\" будет добавляться новая папка:"
+    "message": "Select where new folders of bookmarked tabs will be added:"
   },
   "options_ff_built_in_folder_all_tabs_default": {
     "message": "Папка не выбрана (Firefox использует расположение по умолчанию)"
   },
   "options_ff_built_in_folder_all_tabs_help_1": {
-    "message": "Обратите внимание: по умолчанию для этих целей Firefox использует"
+    "message": "Note: Firefox's default location for folders of bookmarked tabs is"
   },
   "options_ff_built_in_folder_all_tabs_help_2": {
     "message": "Меню закладок"
   },
   "options_ff_built_in_folder_all_tabs_top": {
-    "message": "Добавлять новую папку на первую позицию (внутри выбранной папки)"
+    "message": "Add new folders of bookmarked tabs to the top of the selected folder"
   },
   "options_ff_built_in_folder_all_tabs_top_help": {
-    "message": "Если эта настройка отключена, новая папка будет добавляться после уже имеющихся элементов (в выбранной папке)"
+    "message": "If disabled, new folders of bookmarked tabs will be added to the bottom of the selected folder"
   },
   "options_icon_explanation": {
     "message": "Эта функция добавляет в адресную строку иконку быстрых закладок, позволяющую добавить страницы в закладки или удалить её одним кликом. Иконка представляет собою круг (со звездою в центре). Если текущая страница уже есть в закладках, иконка будет окрашена в выбранный цвет (по умолчанию - красный). Для примера, вот два скриншота: на первом текущая страница не добавлена в закладки, а на втором - добавлена."

diff --git a/src/background/background.js b/src/background/background.js
@@ -90,11 +90,13 @@ async function onContextMenuClick(info, tab) {
 }
 
 async function onAddonInstallation(details) {
+    globalOptions = await getNewOptions(globalOptions);
     const update = new Update(globalOptions);
     if (details.reason === 'install') {
         update.openOptionsPage();
     } else if (details.reason === 'update') {
         if (details.previousVersion[0] === '1') update.updateFromFirstVersion();
+        if (details.previousVersion === '2.10.0') update.updateRemovedNewReleaseOption();
         await update.displayReleaseNotes();
     }
 }

diff --git a/src/background/components/Update.js b/src/background/components/Update.js
@@ -11,19 +11,31 @@ class Update {
         this._options = options;
     }
 
-    openOptionsPage() {
-        browser.runtime.openOptionsPage();
+    async openOptionsPage() {
+        return browser.runtime.openOptionsPage();
+    }
+
+    async openChangelogPage() {
+        return browser.tabs.create({
+            url:
+                'https://github.com/teddy-gustiaux/default-bookmark-folder/blob/master/CHANGELOG.md',
+            active: true,
+        });
     }
 
     async displayReleaseNotes() {
         if (this._options.isDisplayReleaseNotesEnabled()) {
-            await browser.storage.local.set({ [NEW_RELEASE]: true });
-            this.openOptionsPage();
+            this.openChangelogPage();
         }
     }
 
     // Update from version 1.*
     updateFromFirstVersion() {
         browser.storage.local.remove(['override', 'icon', 'inbox', 'addtotop']);
     }
+
+    //  Update from version 2.10.0
+    updateRemovedNewReleaseOption() {
+        browser.storage.local.remove('newRelease');
+    }
 }