Patch 2.0.2 (#71)

- Fixed missing fonts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve the extension
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+### Description
+A clear and concise description of what the bug is.
+
+### Reproduction steps
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '...'
+3. Scroll down to '...'
+4. See error
+
+### Expected behavior
+A clear and concise description of what you expected to happen.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+### Environment
+Please provide the following information:
+ - Operating System: [e.g. Windows 10 Pro 1909 (10.0.18363)]
+ - Browser: [e.g. Microsoft Edge 83.0.478.56]
+ - Extension version: [e.g. 1.5]
+
+### Additional context
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when '...'
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -0,0 +1,9 @@
+Implements following issues: 
+
+## Changelog
+- Item 1
+- Item 2
+- Item 3
+
+## PR Checklist
+- [ ] Change extension version in the manifest

.github/release_description_template.md

@@ -0,0 +1,13 @@
+## What's new
+
+## How to install
+1. Download attached archive and unpack it
+2. Enable Developers mode on your browser extensions page
+3. Click "Load unpacked" button and navigate to the extension root folder (contains `manifest.json`)
+4. Done!
+
+*On Firefox you should open manifest file instead of extension's folder
+
+**Note:** If you delete extension folder it will disappear from your browser
+
+_Sideloaded extensions don't replace officially installed ones_

.github/workflows/ci.yaml

@@ -0,0 +1,70 @@
+name: CI
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  Firefox:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build Extension for Firefox
+      id: web-ext-build
+      uses: kewisch/action-web-ext@v1
+      with:
+        cmd: build
+
+    - name: 'Sign & publish'
+      id: web-ext-sign
+      uses: kewisch/action-web-ext@v1
+      with:
+        cmd: sign
+        channel: listed
+        source: ${{ steps.web-ext-build.outputs.target }}
+        apiKey: ${{ secrets.FIREFOX_API_KEY }}
+        apiSecret: ${{ secrets.FIREFOX_CLIENT_SECRET }}
+
+    - name: Drop artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: 'Firefox Artefacts'
+        path: ${{ steps.web-ext-build.outputs.target }}
+
+  Chrome:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Pack extension
+      uses: TheDoctor0/zip-release@0.4.1
+      with:
+        filename: ./TabsAside.zip
+        exclusions: '.git/* .vscode/* .github/* *.md'
+
+    - name: Publish to Chrome Webstore
+      uses: SebastienGllmt/chrome-addon@v3
+      with:
+        extension: mgmjbodjgijnebfgohlnjkegdpbdjgin
+        zip: ./TabsAside.zip
+        client-id: ${{ secrets.CHROME_CLIENT_ID }}
+        client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
+        refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}
+
+    - name: Upload artifact
+      uses: xresloader/upload-to-github-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        file: ./TabsAside.zip
+        tags: true
+        draft: false
+
+    - name: Drop artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: 'Chrome Artifacts'
+        path: ./TabsAside.zip

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+	"version": "0.2.0",
+	"configurations":
+	[
+		{
+			"name": "Debug",
+			"type": "firefox",
+			"request": "launch",
+			"reAttach": true,
+			"addonPath": "${workspaceFolder}"
+		}
+	]
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at opensource@xfox111.net. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+<https://www.contributor-covenant.org/faq>

CONTRIBUTING.md

@@ -0,0 +1,214 @@
+# Contribution Guidelines
+Welcome, and thank you for your interest in contributing to my project!
+
+There are many ways in which you can contribute, beyond writing code. The goal of this document is to provide a high-level overview of how you can get involved.
+
+## Table of Contents
+- [Contribution Guidelines](#contribution-guidelines)
+  - [Table of Contents](#table-of-contents)
+  - [Asking Questions](#asking-questions)
+  - [Providing Feedback](#providing-feedback)
+  - [Reporting Issues](#reporting-issues)
+    - [Look For an Existing Issue](#look-for-an-existing-issue)
+    - [Writing Good Bug Reports and Feature Requests](#writing-good-bug-reports-and-feature-requests)
+    - [Final Checklist](#final-checklist)
+    - [Follow Your Issue](#follow-your-issue)
+  - [Contributing to the codebase](#contributing-to-the-codebase)
+    - [Deploy test version on your browser](#deploy-test-version-on-your-browser)
+    - [Development workflow](#development-workflow)
+      - [Release](#release)
+    - [Coding guidelines](#coding-guidelines)
+      - [Indentation](#indentation)
+      - [Names](#names)
+      - [Comments](#comments)
+      - [Strings](#strings)
+      - [Style](#style)
+    - [Finding an issue to work on](#finding-an-issue-to-work-on)
+    - [Contributing to translations](#contributing-to-translations)
+    - [Submitting pull requests](#submitting-pull-requests)
+      - [Spell check errors](#spell-check-errors)
+  - [Thank You!](#thank-you)
+  - [Attribution](#attribution)
+
+## Asking Questions
+Have a question? Rather than opening an issue, please ask me directly on opensource@xfox111.net.
+
+## Providing Feedback
+Your comments and feedback are welcome.
+You can leave your feedbak on feedback@xfox111.net or do it on [Microsoft Edge Add-ons Webstore](https://microsoftedge.microsoft.com/addons/detail/tabs-aside/kmnblllmalkiapkfknnlpobmjjdnlhnd), [Chrome Extensions Webstore](https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin) or [Mozilla Add-ons Webstore](https://addons.mozilla.org/firefox/addon/ms-edge-tabs-aside/)
+
+## Reporting Issues
+Have you identified a reproducible problem in the extension? Have a feature request? I'd like to hear it! Here's how you can make reporting your issue as effective as possible.
+
+### Look For an Existing Issue
+Before you create a new issue, please do a search in [open issues](https://github.com/xfox111/TabsAsideExtension/issues) to see if the issue or feature request has already been filed.
+
+Be sure to scan through the [feature requests](https://github.com/XFox111/TabsAsideExtension/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement).
+
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment:
+
+- 👍 - upvote
+- 👎 - downvote
+
+If you cannot find an existing issue that describes your bug or feature, create a new issue using the guidelines below.
+
+### Writing Good Bug Reports and Feature Requests
+File a single issue per problem and feature request. Do not enumerate multiple bugs or feature requests in the same issue.
+
+Do not add your issue as a comment to an existing issue unless they are the same ones. Many issues look similar, but have different causes.
+
+The more information you can provide, the more likely someone will be successful at reproducing the issue and finding a solution.
+
+Please include the following with each issue:
+- Current version of the extension
+- Your current browser and OS name
+- Reproducible steps (1... 2... 3...) that cause the issue
+- What you expected to see, versus what you actually saw
+- Images, animations, or a link to a video showing the issue occurring
+
+### Final Checklist
+Please remember to do the following:
+
+- [ ] Search the issue repository to ensure your report is a new issue
+- [ ] Separate issues reports
+- [ ] Include as much information as you can to your report
+
+Don't feel bad if the developers can't reproduce the issue right away. They will simply ask for more information!
+
+### Follow Your Issue
+Once your report is submitted, be sure to stay in touch with the devs in case they need more help from you.
+
+## Contributing to the codebase
+If you are interested in writing code to fix issues or implement new awesome features you can follow these guidelines to get a better result
+
+### Deploy test version on your browser
+1. Clone repository to local storage using [Git](https://guides.github.com/introduction/git-handbook/)
+
+   ```bash
+   git clone https://github.com/xfox111/TabsAsideExtension.git
+   ```
+2. Enable Developers mode on your browser extensions page
+3. Click "Load unpacked" button and navigate to the extension root folder (contains `manifest.json`)
+4. Done!
+
+Next time you make any changes to the codebase, reload the extension by toggling it off and on or by pressing "Reload" button on the extensions list page
+
+> **Note:** You can also check [this article](https://xfox111.net/46hsgv) to get more information about debugging web extensions
+
+### Development workflow
+This section represents how contributors should interact with codebase implementing features and fixing bugs
+
+1. Getting assigned to the issue
+2. Creating a repository fork
+3. Making changes to the codebase
+4. Creating a pull request to `master`
+5. Reviewing & completing PR
+6. Done
+
+#### Release
+The next stage is the release. Release performs on every push to master (which makes functional changes to the source code). Release performs manually by @XFox111 into: Chrome webstore, Edge webstore and GitHub releases
+
+### Coding guidelines
+#### Indentation
+We use tabs, not spaces.
+
+#### Names
+The project naming rules inherit [.NET Naming Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/naming-guidelines). Nevertheless there'is some distinction with the guidelines as well as additions to the one:
+
+- Use `camelCase` for variables instead of `CamelCase` stated in [Capitalization Conventions](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/capitalization-conventions#capitalization-rules-for-identifiers)
+- Use `snake_case` for file names
+
+#### Comments
+Leave as more comments as you can. Remember: the more detailed documentation your code has the less programmers will curse you in the future
+
+#### Strings
+Use "double quotes" wherever it's possible
+
+#### Style
+- Prefer to use lambda functions
+- Put curly braces on new lines
+    - Wrong:
+
+      ```javascript
+      if (condition) {
+          ...
+      }
+      ```
+
+    - Correct:
+
+      ```javascript
+      if (condition)
+      {
+          ...
+      }
+      ```
+- Put spaces between operators and before braces in methods declarations, conditionals and loops
+    - Wrong:
+        - `y=k*x+b`
+        - `function FunctionName()`
+    - Correct:
+        - `y = k * x + b`
+        - `function FunctionName ()`
+- Use ternary conditionals wherever it's possible
+    - Wrong:
+        ```javascript
+        var s;
+        if (condition)
+          s = "Life";
+        else
+          s = "Death";
+        ```
+    - Correct:
+
+        ```javascript
+        var s = condition ? "Life" : "Death";
+       ```
+- Do not surround loop and conditional bodies with curly braces if they can be avoided
+    - Wrong:
+        ```javascript
+        if (condition)
+        {
+            console.log("Hello, World!");
+        }
+        else
+        {
+            return;
+        }
+        ```
+    - Correct
+
+        ```javascript
+        if (condition)
+            console.log("Hello, World!");
+        else
+            return;
+        ```
+
+### Finding an issue to work on
+Check out the [full issues list](https://github.com/XFox111/TabsAsideExtension/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue) for a list of all potential areas for contributions. **Note** that just because an issue exists in the repository does not mean we will accept a contribution. There are several reasons we may not accept a pull request like:
+
+- Performance - One of Tabs Aside core values is to deliver a lightweight extension, that means it should perform well in both real and test environments.
+- User experience - Since we want to deliver a lightweight extension, the UX should feel lightweight as well and not be cluttered. Most changes to the UI should go through the issue owner and project owner (@XFox111).
+- Architectural - Project owner needs to agree with any architectural impact a change may make. Such things must be discussed with and agreed upon by the project owner.
+
+To improve the chances to get a pull request merged you should select an issue that is labelled with the `help-wanted` or `bug` labels. If the issue you want to work on is not labelled with `help-wanted` or `bug`, you can start a conversation with the project owner asking whether an external contribution will be considered.
+
+To avoid multiple pull requests resolving the same issue, let others know you are working on it by saying so in a comment.
+
+### Contributing to translations
+If you want to help us to translate this extension into other languages, please read [this article](https://developer.chrome.com/extensions/i18n)
+
+**Note** that whatever you want to contribute to the codebase, you should do it only after you got assigned on an issue
+
+### Submitting pull requests
+To enable us to quickly review and accept your pull requests, always create one pull request per issue and [link the issue in the pull request](https://github.com/blog/957-introducing-issue-mentions). Never merge multiple requests in one unless they have the same root cause. Be sure to follow our [Coding Guidelines](#coding-guidelines) and keep code changes as small as possible. Avoid pure formatting changes to code that has not been modified otherwise. Pull requests should contain tests whenever possible. Fill pull request content according to its template. Deviations from template are not recommended
+
+#### Spell check errors
+Pull requests that fix typos are welcomed but please make sure it doesn't touch multiple feature areas, otherwise it will be difficult to review. Pull requests only fixing spell check errors in source code are not recommended.
+
+## Thank You!
+Your contributions to open source, large or small, make great projects like this possible. Thank you for taking the time to contribute.
+
+## Attribution
+These Contribution Guidelines are adapted from the [Contributing to VS Code](https://github.com/microsoft/vscode/blob/master/CONTRIBUTING.md)

README.md

@@ -1,39 +1,68 @@
-# Tabs aside for Google Chrome
+# Tabs aside
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/xfox111/TabsAsideExtension)](https://github.com/xfox111/TabsAsideExtension/releases/latest)
+![CI](https://github.com/XFox111/TabsAsideExtension/workflows/CI/badge.svg)
+[![Mozilla Add-on](https://img.shields.io/amo/rating/ms-edge-tabs-aside?label=Firefox%20rating)](https://addons.mozilla.org/firefox/addon/ms-edge-tabs-aside/)
 
-[![Chrome Web Store](https://img.shields.io/chrome-web-store/users/mgmjbodjgijnebfgohlnjkegdpbdjgin?label=Chrome%20Web%20Store%20downloads)](https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin)
+[![Chrome Web Store](https://img.shields.io/chrome-web-store/users/mgmjbodjgijnebfgohlnjkegdpbdjgin?label=Chrome%20Webstore%20downloads)](https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin)
-[![Chrome Web Store](https://img.shields.io/chrome-web-store/rating/mgmjbodjgijnebfgohlnjkegdpbdjgin)](https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin)
+[![Mozilla Add-on](https://img.shields.io/amo/users/ms-edge-tabs-aside?label=Firefox%20Webstore%20downloads)](https://addons.mozilla.org/firefox/addon/ms-edge-tabs-aside/)
-[![GitHub release (latest by date)](https://img.shields.io/github/v/release/xfox111/chromiumtabsaside)](https://github.com/xfox111/chromiumtabsaside/releases/latest)
 
-[![GitHub issues](https://img.shields.io/github/issues/xfox111/chromiumtabsaside)](https://github.com/xfox111/ChromiumTabsAside/issues)
+[![GitHub issues](https://img.shields.io/github/issues/xfox111/TabsAsideExtension)](https://github.com/xfox111/TabsAsideExtension/issues)
-[![GitHub last commit](https://img.shields.io/github/last-commit/xfox111/chromiumtabsaside)](https://github.com/xfox111/ChromiumTabsAside/commits/master)
+[![GitHub last commit](https://img.shields.io/github/last-commit/xfox111/TabsAsideExtension)](https://github.com/xfox111/TabsAsideExtension/commits/master)
-[![GitHub repo size](https://img.shields.io/github/repo-size/xfox111/chromiumtabsaside?label=repo%20size)](https://github.com/xfox111/ChromiumTabsAside)
+[![GitHub repo size](https://img.shields.io/github/repo-size/xfox111/TabsAsideExtension?label=repo%20size)](https://github.com/xfox111/TabsAsideExtension)
-[![MIT License](https://img.shields.io/github/license/xfox111/chromiumtabsaside)](https://opensource.org/licenses/MIT)
+[![MIT License](https://img.shields.io/github/license/xfox111/TabsAsideExtension)](https://opensource.org/licenses/MIT)
 
 [![Twitter Follow](https://img.shields.io/twitter/follow/xfox111?style=social)](https://twitter.com/xfox111)
 [![GitHub followers](https://img.shields.io/github/followers/xfox111?label=Follow%20@xfox111&style=social)](https://github.com/xfox111)
+[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-%40xfox111-orange)](https://buymeacoffee.com/xfox111)
 
-![Tabs aside](https://xfox111.net/images/TabsAside.png)
+![Tabs aside](https://xfox111.net/y7xk3z)
 
 If you’re like me, you often find yourself with a bunch of open tabs. You’d like to get those tabs out of the way sometimes, but they’re maybe not worth saving as actual bookmarks.
 
 In the Edge browser, Microsoft has introduced a new feature called "Tabs aside" (or Tab groups) which lets you set tabs aside in a sort of temporary workspace so that you can call them back up later.
 
-Unfortunately, in new Chromium-based Microsoft Edge, the devs decided not to implement this must-have-feature. So I've decided to create a browser extension which replicates this awesome feature in Chromium-based browsers
+![Tabs aside demo](https://xfox111.net/knrp7b)
+
+Unfortunately, in new Chromium-based Microsoft Edge, the devs decided not to implement this must-have-feature. So I've decided to create a browser extension which replicates this awesome feature
 
 ## Features
 - Familiar UI inherited from legacy Microsoft Edge with some improvements
 - Auto Dark mode
 - Now you can restore one tab from collection without removing
+- Now you can choose if you want to load restored tabs only when you're navigating onto them
+- Set tabs you've selected aside
+- Sync your saved tabs between different PCs
+- **Now available for Firefox!**
 
 ## Download
 - [Google Chrome Webstore](https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin)
 - [Microsoft Edge Add-ons Webstore](https://microsoftedge.microsoft.com/addons/detail/kmnblllmalkiapkfknnlpobmjjdnlhnd)
-- [GitHub Releases](https://github.com/xfox111/chromiumtabsaside/releases/latest)
+- [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/ms-edge-tabs-aside/)
+- [GitHub Releases](https://github.com/xfox111/TabsAsideExtension/releases/latest)
 
 ## Project roadmap
-You can go to the project's [roadmap kanban board](https://github.com/XFox111/ChromiumTabsAside/projects/1) and see what have we planned and watch our progress in realtime
+You can go to the project's [roadmap kanban board](https://github.com/XFox111/TabsAsideExtension/projects/1) and see what have we planned and watch our progress in realtime
+
+## Contributing
+There are many ways in which you can participate in the project, for example:
+- [Submit bugs and feature requests](https://github.com/xfox111/TabsAsideExtension/issues), and help us verify as they are checked in
+- Review [source code changes](https://github.com/xfox111/TabsAsideExtension/pulls)
+- Review documentation and make pull requests for anything from typos to new content
+
+If you are interested in fixing issues and contributing directly to the code base, please see the [Contribution Guidelines](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md), which covers the following:
+- [How to deploy the extension on your browser](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#deploy-test-version-on-your-browser)
+- [The development workflow](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#development-workflow), including debugging and running tests
+- [Coding guidelines](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#coding-guidelines)
+- [Submitting pull requests](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#submitting-pull-requests)
+- [Finding an issue to work on](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#finding-an-issue-to-work-on)
+- [Contributing to translations](https://github.com/XFox111/TabsAsideExtension/blob/master/CONTRIBUTING.md#contributing-to-translations)
+
+## Code of Conduct
+This project has adopted the Contributor Covenant. For more information see the [Code of Conduct](https://github.com/XFox111/TabsAsideExtension/blob/master/CODE_OF_CONDUCT.md)
 
 ## Copyrights
-> ©2020 Michael "XFox" Gordeev
+> ©2021 Michael "XFox" Gordeev
 
-Licensed under [MIT License](https://opensource.org/licenses/MIT)
+Font copyrights: Microsoft Corportation ©2021 (Additional ELUA applied)
+
+Licensed under [MIT License](https://opensource.org/licenses/MIT)

TabsAside.html

@@ -2,58 +2,95 @@
 <html>
 
 <head>
-	<title>Tabs aside</title>
+	<title loc="name">Tabs aside</title>
 	<link id="icon" rel="shortcut icon" type="image/png" href="icons/light/empty/16.png" />
 
 	<link rel="stylesheet" type="text/css" href="css/style.css" />
 	<link rel="stylesheet" type="text/css" href="css/style.generic.css" />
 	<link rel="stylesheet" type="text/css" href="css/style.dark.css" />
+	<link rel="stylesheet" type="text/css" href="css/style.listview.css" />
 
-	<style type="text/css">
+	<meta charset="utf-8" />
-		body {
-			margin: 0px;
-			overflow: hidden;
-		}
-
-		aside {
-			transform: none !important;
-			left: 0px;
-			width: initial !important;
-		}
-	</style>
 </head>
 
-<body class="tabsAside">
+<body>
-	<aside class="tabsAside pane">
+	<div class="tabsAside background">
-		<header>
+		<div class="tabsAside closeArea"></div>
-			<div>
+		<aside class="tabsAside pane">
-				<h1>Tabs aside</h1>
+			<header>
-				<button title="Options">&#xE10C;</button>
+				<h1 loc="name">Tabs aside</h1>
+				<button loc_alt="options" class="btn more" title="Options">&#xE712;<span class="updateBadge"></span></button>
 
 				<nav>
+					<label class="checkbox control">
+						<input id="loadOnRestore" type="checkbox" />
+						<span class="mark"></span>
+						<span loc="loadOnRestore">Load tabs on restore</span>
+					</label>
+					<label class="checkbox control">
+						<input id="swapIconAction" type="checkbox" />
+						<span class="mark"></span>
+						<span loc="swapIconAction">Set tabs aside on extension icon click (Alt+P or right-click to open the pane)</span>
+					</label>
+					<label class="checkbox control">
+						<input id="showDeleteDialog" type="checkbox" />
+						<span class="mark"></span>
+						<span loc="showDeleteDialog">Show confirmation dialog before deleting an item</span>
+					</label>
+					<hr />
 					<div>
-						<button value="https://github.com/xfox111/ChromiumTabsAside">Visit GitHub page</button>
+						<button value="https://github.com/xfox111/TabsAsideExtension">
-						<button value="https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin">Leave feedback</button>
+							<img src="icons/github.svg"/>
-						<button value="https://buymeacoffee.com/xfox111">Buy me a coffee!</button>
+							<span loc="github">Visit GitHub page</span>
-						<button hidden>Backup saved tabs</button>
+						</button>
+						<button value="https://github.com/XFox111/TabsAsideExtension/releases/latest">
+							<img src="icons/list.svg"/>
+							<span loc="changelog">Changelog</span>
+							<span class="updateBadge"></span>
+						</button>
+						<button feedback-button>
+							<img src="icons/feedback.svg"/>
+							<span loc="feedback">Leave feedback</span>
+						</button>
+						<button value="https://buymeacoffee.com/xfox111">
+							<img style="filter: none !important;" src="icons/bmc.svg"/>
+							<span loc="buyMeACoffee">Buy me a coffee!</span>
+						</button>
 					</div>
+					<hr />
 					<p>
 						<small>v1.0</small><br />
-						Developed by Michael Gordeev (<a href="https://twitter.com/xfox111"
+						<span loc="credits">Developed by Michael Gordeev</span> (<a href="https://twitter.com/xfox111" target="_blank">@xfox111</a>)
-							target="_blank">@xfox111</a>)
 					</p>
 				</nav>
-			</div>
-			<a class="saveTabs">&#xE0AB; Set current tabs aside</a>
-			<hr />
-		</header>
 
-		<section>
+				<button loc_alt="closePanel" class="btn remove" title="Close panel">&#xE711;</button>
-			<h2>You have no aside tabs</h1>
+				<a class="saveTabs">
-		</section>
+					<span class="iconArrowRight">&#xE72A;</span>
-	</aside>
+					<span loc="setAside">Set current tabs aside</span>
+					<span loc_alt="setMultipleTabsAsideTooltip" class="iconQuestionCircle" title="Tip : You can set aside specific tabs by selecting them (by holding CTRL or SHIFT and clicking on the tabs) before clicking on the TabsAside extension">&#xE9CE;</span>
+				</a>
+
+				<div class="listviewSwitch tile">
+					<div></div>
+					<div></div>
+					<div></div>
+					<div></div>
+				</div>
+				<div class="listviewSwitch list">
+					<div></div>
+					<div></div>
+					<div></div>
+				</div>
+			</header>
+
+			<section>
+				<h2 loc="nothingSaved">You have no aside tabs</h2>
+			</section>
+		</aside>
+	</div>
 
 	<script type="text/javascript" src="js/aside-script.js"></script>
 </body>
 
-</html>
+</html>

_locales/en/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+		"message": "Tabs aside",
+		"description": "Extension name. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+		"message": "Classic Microsoft Edge \"Tabs Aside\" feature",
+		"description": "Extension description"
+	},
+	"author":
+	{
+		"message": "Michael \"XFox\" Gordeev",
+		"description": "Author name"
+	},
+	"options":
+	{
+		"message": "Options",
+		"description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+		"message": "Close",
+		"description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+		"message": "Load tabs on restore",
+		"description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+		"message": "Show confirmation dialog before deleting an item",
+		"description": "Label for option"
+	},
+	"swapIconAction":
+	{
+		"message": "Set tabs aside on extension icon click (%TOGGLE_SHORTCUT% or right-click to open the pane)",
+		"description": "Label for option"
+	},
+	"github":
+	{
+		"message": "Visit GitHub page",
+		"description": "Link title"
+	},
+	"changelog":
+	{
+		"message": "Changelog",
+		"description": "Link title"
+	},
+	"feedback":
+	{
+		"message": "Leave feedback",
+		"description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+		"message": "Buy me a coffee!",
+		"description": "Link title"
+	},
+	"credits":
+	{
+		"message": "Developed by Michael 'XFox' Gordeev",
+		"description": "Options menu credits"
+	},
+	"setAside":
+	{
+		"message": "Set current tabs aside",
+		"description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "Tip : You can set aside specific tabs by selecting them (by holding CTRL or SHIFT and clicking on the tabs) before clicking on the TabsAside extension",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+	"nothingSaved":
+	{
+		"message": "You have no aside tabs",
+		"description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+		"message": "Remove tab from collection",
+		"description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+		"message": "Restore tabs",
+		"description": "Collection restore action link name"
+	},
+	"more":
+	{
+		"message": "More...",
+		"description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+		"message": "Restore without removing",
+		"description": "Context action item name"
+	},
+	"removeCollection":
+	{
+		"message": "Remove collection",
+		"description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+		"message": "Are you sure you want to delete this collection?",
+		"description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+		"message": "Are you sure you want to delete this tab?",
+		"description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+		"message": "Toggle tabs aside pane",
+		"description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+		"message": "No tabs available to save",
+		"description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "Tabs could not be set aside. You may be trying to set too many tabs aside at once, or have too many tabs already set aside.",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "Some tabs set aside from a previous version could not be migrated. They have been backed up as browser bookmarks.",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+		"message": "items",
+		"description": "Collection tabs counter label (e.g. 8 items)"
+	}
+}

_locales/es/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+		"message": "Pestañas que has reservado",
+		"description": "Extension name. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+		"message": "Función \"Reservar pestañas\" de Microsoft Edge clásico",
+		"description": "Extension description"
+	},
+	"author":
+	{
+		"message": "Michael \"XFox\" Gordeev",
+		"description": "Author name"
+	},
+	"options":
+	{
+		"message": "Opciones",
+		"description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+		"message": "Cerrar",
+		"description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+		"message": "Cargar pestañas al restaurar",
+		"description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+		"message": "Mostrar diálogo de confirmacion antes de eliminar un item",
+		"description": "Label for option"
+	},
+	"swapIconAction":
+	{
+		"message": "Reservar pestañas al apretar el icono de la extensión (%TOGGLE_SHORTCUT% o click-derecho para abrir el panel)",
+		"description": "Label for option"
+	},
+	"github":
+	{
+		"message": "Visitar la pagina de GitHub",
+		"description": "Link title"
+	},
+	"changelog":
+	{
+		"message": "Registro de cambios",
+		"description": "Link title"
+	},
+	"feedback":
+	{
+		"message": "Deja un comentario",
+		"description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+		"message": "¡Comprame un cafe!",
+		"description": "Link title"
+	},
+	"credits":
+	{
+		"message": "Desarrollado por Michael 'XFox' Gordeev",
+		"description": "Options menu credits"
+	},
+	"setAside":
+	{
+		"message": "Reservar las pestañas actuales",
+		"description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "Consejo: puede dejar de lado pestañas específicas seleccionándolas (manteniendo presionada la tecla CTRL o SHIFT y haciendo clic en las pestañas) antes de hacer clic en la extensión TabsAside",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+	"nothingSaved":
+	{
+		"message": "No tienes pestañas reservadas",
+		"description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+		"message": "Eliminar pestañas de la colección",
+		"description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+		"message": "Restaurar pestañas",
+		"description": "Collection restore action link name"
+	},
+	"more":
+	{
+		"message": "Más...",
+		"description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+		"message": "Restaurar sin eliminar",
+		"description": "Context action item name"
+	},
+	"removeCollection":
+	{
+		"message": "Eliminar la colección",
+		"description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+		"message": "¿Está seguro que quiere eliminar esta colección?",
+		"description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+		"message": "¿Está seguro que quiere eliminar esta pestaña?",
+		"description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+		"message": "Abrir panel de pestañas",
+		"description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+		"message": "No hay pestañas disponibles para reservar",
+		"description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "Las pestañas no se pueden dejar de lado. Es posible que esté intentando dejar demasiadas pestañas a un lado a la vez o que ya haya reservado demasiadas pestañas.",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "Algunas pestañas apartadas de una versión anterior no se pudieron migrar. Se han respaldado como marcadores del navegador.",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+		"message": "items",
+		"description": "Collection tabs counter label (e.g. 8 items)"
+	}
+}

_locales/it/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+	  "message": "Schede a parte",
+	  "description": "name of the extension. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+	  "message": "La funzione del classico Microsoft Edge \"Tabs Aside\"",
+	  "description": "Extension description"
+	},
+	"author":
+	{
+	  "message": "Michael \"XFox\" Gordeev",
+	  "description": "Author name"
+	},
+	"options":
+	{
+	  "message": "Opzioni",
+	  "description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+	  "message": "Chiudi",
+	  "description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+	  "message": "Riapri le schede al ripristino",
+	  "description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+	  "message": "Mostra una finestra di conferma prima di eliminare qualcosa",
+	  "description": "Label for option"
+	},
+	"swapIconAction":
+	{
+	  "message": "Metti da parte le schede in Tabs Aside al click sull'estensione (%TOGGLE_SHORTCUT% o click con il tasto destro sull'icona dell'estensione per aprire il pannello)",
+	  "description": "Label for option"
+	},
+	"github":
+	{
+	  "message": "Visita la pagina di GitHub",
+	  "description": "Link title"
+	},
+	"changelog":
+	{
+	  "message": "Registro dei cambiamenti",
+	  "description": "Link title"
+	},
+	"feedback":
+	{
+	  "message": "Lascia un feedback",
+	  "description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+	  "message": "Comprami un caffè!",
+	  "description": "Link title"
+	},
+	"credits":
+	{
+	  "message": "Sviluppato da Michael 'XFox' Gordeev",
+	  "description": "Options menu credits"
+	},
+	"setAside":
+	{
+	  "message": "Sposta le schede correnti in Tabs Aside",
+	  "description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "Suggerimento: puoi mettere da parte schede specifiche selezionandole (tenendo premuto CTRL o MAIUSC e facendo clic sulle schede) e cliccando sull'estensione Tabs Aside.",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+  "nothingSaved":
+	{
+	  "message": "Non hai schede da parte qua",
+	  "description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+	  "message": "Rimuovi la scheda da questo gruppo di schede",
+	  "description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+	  "message": "Ripristina schede",
+	  "description": "Collection restore action link name"
+	},
+	"more":
+	{
+	  "message": "Altro...",
+	  "description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+	  "message": "Ripristina senza rimuovere le schede da da Tabs Aside",
+	  "description": "Context action item name"
+	},
+	"removeCollection":
+	{
+	  "message": "Rimuovi gruppo di schede",
+	  "description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+	  "message": "Sei sicuro di voler eliminare questo gruppo di schede?",
+	  "description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+	  "message": "Sei sucuro di voler rimuovere questa scheda?",
+	  "description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+	  "message": "Mostra/nascondi il pannello di Tabs Aside",
+	  "description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+	  "message": "Nessuna scheda da salvare",
+	  "description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "Queste schede non possono essere messe da parte. Forse perché stai cercando di mettere da parte troppe schede o perché ce ne sono già troppe messe da parte.",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "Alcune schede messe da parte in una versione precedente non potevano essere mantenute. Sono state salvate come preferiti del browser.",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+	  "message": "schede",
+	  "description": "Collection tabs counter label (e.g. 8 items)"
+	}
+  }

_locales/pt_BR/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+		"message": "Reservar abas",
+		"description": "Extension name. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+		"message": "Função \"Reservar abas\" do Microsoft Edge Clássico",
+		"description": "Extension description"
+	},
+	"author":
+	{
+		"message": "Michael \"XFox\" Gordeev",
+		"description": "Author name"
+	},
+	"options":
+	{
+		"message": "Opções",
+		"description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+		"message": "Fechar",
+		"description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+		"message": "Carregar abas ao restaurar",
+		"description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+		"message": "Mostrar diálogo de confirmação antes de deletar um item",
+		"description": "Label for option"
+	},
+	"swapIconAction":
+	{
+		"message": "Reservar abas ao apertar o ícone da extensão (%TOGGLE_SHORTCUT% ou clique-direito para abrir o painel)",
+		"description": "Label for option"
+	},
+	"github":
+	{
+		"message": "Visite a página do GitHub",
+		"description": "Link title"
+	},
+	"changelog":
+	{
+		"message": "Registro de mudanças",
+		"description": "Link title"
+	},
+	"feedback":
+	{
+		"message": "Deixe um comentário",
+		"description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+		"message": "Me compre um café!",
+		"description": "Link title"
+	},
+	"credits":
+	{
+		"message": "Desenvolvido por Michael 'XFox' Gordeev",
+		"description": "Options menu credits"
+	},
+	"setAside":
+	{
+		"message": "Reservas as abas atuais",
+		"description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "Dica: Você pode reservar abas específicas ao selecioná-las (ao apertar CTRL ou SHIFT e clicando nas abas) antes de clicar na extensão Reservar Abas",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+	"nothingSaved":
+	{
+		"message": "Você não tem abas reservadas",
+		"description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+		"message": "Remover aba da coleção",
+		"description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+		"message": "Restaurar abas",
+		"description": "Collection restore action link name"
+	},
+	"more":
+	{
+		"message": "Mais...",
+		"description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+		"message": "Restaurar sem remover",
+		"description": "Context action item name"
+	},
+	"removeCollection":
+	{
+		"message": "Remover coleção",
+		"description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+		"message": "Você tem certeza que quer deletar esta coleção?",
+		"description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+		"message": "Você tem certeza que quer deletar esta aba?",
+		"description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+		"message": "Alternar painel de abas",
+		"description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+		"message": "Não há abas disponíveis para salvar",
+		"description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "As abas não puderam ser reservadas. Você pode ter tentado reservar muitas abas de uma vez só, ou pode ter abas demais já reservadas.",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "Algumas abas reservadas de uma versão antiga não puderam ser migradas. Elas foram salvas como marcadores do navegador.",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+		"message": "itens",
+		"description": "Collection tabs counter label (e.g. 8 items)"
+	}
+}

_locales/ru/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+		"message": "Отложенные вкладки",
+		"description": "Extension name. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+		"message": "Функиця отложенных вкладок классического Microsoft Edge",
+		"description": "Extension description"
+	},
+	"author":
+	{
+		"message": "Михаил \"XFox\" Гордеев",
+		"description": "Author name"
+	},
+	"options":
+	{
+		"message": "Настройки",
+		"description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+		"message": "Закрыть",
+		"description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+		"message": "Загружать вкладки после открытия",
+		"description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+		"message": "Показывать окно подтверждения перед удалением элемента",
+		"description": "Label for option"
+	},
+	"swapIconAction":
+	{
+		"message": "Откладывать вкладки при нажатии на иконку расширения (%TOGGLE_SHORTCUT% или правая кнопка мыши для открытия панели)",
+		"description": "Label for option"
+	},
+	"github":
+	{
+		"message": "Страница GitHub",
+		"description": "Link title"
+	},
+	"changelog":
+	{
+		"message": "Список изменений",
+		"description": "Link title"
+	},
+	"feedback":
+	{
+		"message": "Оставить отзыв",
+		"description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+		"message": "Купить мне кофе!",
+		"description": "Link title"
+	},
+	"credits":
+	{
+		"message": "Разработано: Михаил 'XFox' Гордеев",
+		"description": "Options menu credits"
+	},
+	"setAside":
+	{
+		"message": "Отложить открытые вкладки",
+		"description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "Подсказка: теперь вы можете откладывать только некоторые вкладки. Просто выделите нужные вкладки с помощью Shift или Ctrl перед использованием расширения",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+	"nothingSaved":
+	{
+		"message": "У вас нет отложенных вкладок",
+		"description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+		"message": "Удалить вкладку из коллекции",
+		"description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+		"message": "Восстановить вкладки",
+		"description": "Collection restore action link name"
+	},
+	"more":
+	{
+		"message": "Больше...",
+		"description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+		"message": "Восстановить без удаления",
+		"description": "Context action item name"
+	},
+	"removeCollection":
+	{
+		"message": "Удалить коллекцию",
+		"description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+		"message": "Вы уверены, что хотите удалить эту коллекцию?",
+		"description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+		"message": "Вы уверены, что хотите удалить эту вкладку из коллекции?",
+		"description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+		"message": "Открыть/закрыть панель",
+		"description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+		"message": "Нет доступных для сохранения вкладок",
+		"description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "Не удается отложить вкладки. Возможно, вы пытаетесь отложить слишком много вкладок за раз или уже отложили слишком много вкладок",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "Не удалось перенести отложенные вкладки, сохраненные в старой версии расширения. Они были сохранены в закладках",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+		"message": "вкладок",
+		"description": "Collection tabs counter label (e.g. 8 items)"
+	}
+}

_locales/zh_CN/messages.json

@@ -0,0 +1,142 @@
+{
+	"name":
+	{
+		"message": "搁置的标签页",
+		"description": "Extension name. Displayed in the manifest and pane header"
+	},
+	"description":
+	{
+		"message": "为Chromium浏览器提供旧版 Microsoft Edge 中的\"搁置标签页\" 功能",
+		"description": "Extension description"
+	},
+	"author":
+	{
+		"message": "Michael \"XFox\" Gordeev",
+		"description": "Author name"
+	},
+	"options":
+	{
+		"message": "设置",
+		"description": "Alternative text for options button in the pane"
+	},
+	"closePanel":
+	{
+		"message": "关闭",
+		"description": "Alternative text for close panel button"
+	},
+	"loadOnRestore":
+	{
+		"message": "在重新打开时加载页面",
+		"description": "Label for option"
+	},
+	"showDeleteDialog":
+	{
+		"message": "在删除项目之前显示确认对话框",
+		"description": "Label for option"
+	},
+	"swapIconAction":
+	{
+		"message": "点击拓展图标来搁置所有标签页 (按%TOGGLE_SHORTCUT%或右键来打开侧栏)",
+		"description": "Label for option"
+	},
+	"github":
+	{
+		"message": "查看GitHub页面",
+		"description": "Link title"
+	},
+	"changelog":
+	{
+		"message": "变更日志",
+		"description": "Link title"
+	},
+	"feedback":
+	{
+		"message": "给我们反馈",
+		"description": "Link title"
+	},
+	"buyMeACoffee":
+	{
+		"message": "给我买杯咖啡!",
+		"description": "Link title"
+	},
+	"credits":
+	{
+		"message": "由Michael 'XFox' Gordeev开发",
+		"description": "Options menu credits"
+	},
+	"setAside":
+	{
+		"message": "搁置当前的所有标签页",
+		"description": "Save collection action name. Used in the pane, extension context menu and manifest shortcuts"
+	},
+	"setMultipleTabsAsideTooltip":
+	{
+		"message": "提示：在单击TabsAside扩展名之前，可以通过选择特定选项卡（按住CTRL或SHIFT并单击选项卡）来搁置它们",
+		"description": "Tooltip displayed on hover in the pane to explain how to set specific tabs aside"
+	},
+	"nothingSaved":
+	{
+		"message": "你目前没有搁置的标签页",
+		"description": "Placeholder for empty pane"
+	},
+	"removeTab":
+	{
+		"message": "从标签页集中移除标签页",
+		"description": "Button hint on a tab card"
+	},
+	"restoreTabs":
+	{
+		"message": "恢复标签页",
+		"description": "Collection restore action link name"
+	},
+	"more":
+	{
+		"message": "更多...",
+		"description": "Collections' more button title"
+	},
+	"restoreNoRemove":
+	{
+		"message": "恢复但不移除标签页",
+		"description": "Context action item name"
+	},
+	"removeCollection":
+	{
+		"message": "移除标签页集",
+		"description": "Collection remove action name"
+	},
+	"removeCollectionConfirm":
+	{
+		"message": "你确定要移除这个标签页集吗?",
+		"description": "Prompt dialog content on collection deletion"
+	},
+	"removeTabConfirm":
+	{
+		"message": "你确定要移除这个标签页吗?",
+		"description": "Prompt dialog content on one tab deletion"
+	},
+	"togglePaneContext":
+	{
+		"message": "打开或关闭侧栏",
+		"description": "Context action name. Used in extension context menu and manifest shortcuts"
+	},
+	"noTabsToSave":
+	{
+		"message": "没有可以搁置的标签页",
+		"description": "Alert dialog message when there's no tabs to save"
+	},
+	"errorSavingTabs":
+	{
+		"message": "标签页无法被搁置. 可能是因为您尝试一次性搁置过多的标签页, 或是先前搁置的标签页过多.",
+		"description": "Alert dialog message when there is an issue saving tabs"
+	},
+	"olderDataMigrationFailed":
+	{
+		"message": "一部分搁置的标签页无法从上一个版本中迁移. 这些标签页已经作为浏览器书签被备份.",
+		"description": "Alert dialog message when there is an issue migrating previous versions data"
+	},
+	"tabs":
+	{
+		"message": "项",
+		"description": "Collection tabs counter label (e.g. 8 items)"
+	}
+}

collections.html

@@ -1,57 +0,0 @@
-<div class="tabsAside background">
-	<aside class="tabsAside pane">
-		<header>
-			<div>
-				<h1>Tabs aside</h1>
-				<button title="Options">&#xE10C;</button>
-	
-				<nav>
-					<div>
-						<button value="https://github.com/xfox111/ChromiumTabsAside">Visit GitHub page</button>
-						<button value="https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin">Leave feedback</button>
-						<button value="https://buymeacoffee.com/xfox111">Buy me a coffee!</button>
-						<!--<button hidden>Backup saved tabs</button>-->
-					</div>
-					<p>
-						<small>v1.0</small><br />
-						Developed by Michael Gordeev (<a href="https://twitter.com/xfox111" target="_blank">@xfox111</a>)
-					</p>
-				</nav>
-			</div>
-			<a class="saveTabs">&#xE0AB; Set current tabs aside</a>
-			<hr />
-		</header>
-	
-		<section>
-			<h2>You have no aside tabs</h1>
-	
-			<!--<div>
-				<div>
-					<span>Tabs: $(tabsCount)</span>
-					<small>$(timestamp)</small>
-	
-					<a>Restore tabs</a>
-	
-					<div>
-						<button title="More...">&#xE10C;</button>
-						<nav>
-							<button>Add tabs to favorites</button>
-							<button>Share tabs</button>
-						</nav>
-					</div>
-					<button title="Remove collection">&#xE106;</button>
-				</div>
-	
-				<div>
-					<div title="Tab title caption">
-						<div>
-							<div></div>
-							<span>$(title)</span>
-							<button title="Remove tab from collection">&#xE106;</button>
-						</div>
-					</div>
-				</div>
-			</div>-->
-		</section>
-	</aside>
-</div>

css/style.css

@@ -1,260 +1,309 @@
 .tabsAside.background
 {
-	z-index: 9999 !important;
+	background-color: rgba(255, 255, 255, .5);
-	background-color: rgba(255, 255, 255, .5) !important;
+	position: fixed;
-	position: fixed !important;
+	top: 0;
-	top: 0 !important;
+	bottom: 0;
-	bottom: 0 !important;
+	right: 0;
-	right: 0 !important;
+	left: 0;
-	left: 0 !important;
+	transition: .2s;
-	transition: .2s !important;
+	color: black;
-	opacity: 0;
+}
-	color: black !important;
+
+.tabsAside.closeArea
+{
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	left: 0;
+
+	background-color: transparent;
 }
 
 .tabsAside.pane
 {
-	font-family: 'Segoe UI', 'Segoe MDL2 Assets' !important;
+	user-select: none;
-	user-select: none !important;
+	position: fixed;
-	position: fixed !important;
 
-	right: 0px !important;
+	right: 0px;
-	top: 0px !important;
+	top: 0px;
-	bottom: 0px !important;
+	bottom: 0px;
-	overflow: auto !important;
+	overflow: hidden;
-	
+	display: grid;
-	width: 40%;
+	grid-template-rows: auto 1fr;
-	min-width: 500px !important;
 
-	background-color: #f7f7f7 !important;
+	width: 100%;
-	border: 1px solid rgba(100, 100, 100, .5) !important;
+	min-width: 500px;
-	border-width: 0px 0px 0px 1px !important;
-	box-sizing: border-box !important;
-	box-shadow: 6px 0px 12px black !important;
 
-	font-size: small !important;
+	background-color: #f7f7f7;
+	border: 1px solid rgba(100, 100, 100, .5);
+	border-width: 0px 0px 0px 1px;
+	box-shadow: 6px 0px 12px black;
 
-	transform: translateX(110%);	/* Pane is hidden */
+	transform: translateX(110%);	/* pane is hidded */
-	transition: .2s !important;
+	transition: .2s;
-	text-align: initial !important;
 }
 
+	aside[embedded]
+	{
+		width: 500px !important;
+	}
+
 	.tabsAside.pane[opened]
 	{
-		transform: translateX(0px) !important;
+		transform: translateX(0px);
 	}
 
 	/* Pane header*/
 	.tabsAside.pane > header
 	{
-		margin: 20px 40px !important;
+		z-index: 1;
-		line-height: initial !important;
+		padding: 14px 20px 16px 20px;
-		height: initial !important;
+		box-shadow: 0px 0px 5px rgba(0,0,0,.5);
+		background-color: white;
+		display: grid;
+		grid-template-columns: 1fr auto auto;
+		grid-column-gap: 10px;
+		grid-row-gap: 20px;
 	}
-		.tabsAside.pane > header > div
-		{
-			display: grid !important;
-			grid-template-columns: 1fr auto !important;
-		}
 
-			.tabsAside.pane > header > div > h1
+			.tabsAside.pane > header > h1
 			{
-				margin: 10px 0px !important;
+				margin: 0px 5px;
-				font-weight: normal !important;
+				font-weight: 400;
-				font-size: 21pt !important;
+				font-size: 24px;
-				direction: initial !important;
-				color: inherit !important;
-				line-height: initial !important;
-				font-family: inherit !important;
 			}
 
-			.tabsAside.pane > header > div > button
+			.tabsAside.pane > header > button .updateBadge
 			{
-				margin: auto !important;
+				position: absolute;
-			}
+				bottom: 2px;
-			
+				right: 2px;
-			.tabsAside.pane > header > div > nav
-			{
-				top: 70px !important;
-				right: 40px !important;
 			}
 
-				.tabsAside.pane > header > div > nav > div
+			.tabsAside.pane > header > nav
+			{
+				top: 45px;
+				right: 55px;
+			}
+
+				.tabsAside.pane > header nav > p
 				{
-					box-shadow: 0px 4px 5px -2px rgba(100, 100, 100, .5) !important;
+					margin: 10px;
-					cursor: initial !important;
-					overflow: hidden !important;
 				}
 
-				.tabsAside.pane > header > div > nav > p
+					.tabsAside.pane > header nav > p > a
-				{
-					margin: 10px !important;
-					font-family: inherit !important;
-					font-size: inherit !important;
-					line-height: initial !important;
-				}
-
-					.tabsAside.pane > header > div > nav > p > small
-					{
-						font-size: inherit !important;
-						font-family: inherit !important;
-					}
-
-					.tabsAside.pane > header > div > nav > p > a
 					{
 						text-decoration: none;
-						font-size: inherit !important;
-						border: none !important;
 					}
 
-		.tabsAside.pane > header > a
+						.tabsAside.pane > header nav > p > a:hover
+						{
+							text-decoration: underline;
+						}
+
+		.saveTabs
 		{
-			font-size: inherit;
+			display: inline-grid;
+			grid-template-columns: 16px auto 16px;
+			grid-column-gap: 15px;
+
+			margin-right: auto;
 		}
 
-		.tabsAside.pane > header > hr
+		.saveTabs:hover
 		{
-			border: 1px solid #8a8a8a !important;
+			text-decoration: none !important;
-			direction: initial !important;
-			color: inherit !important;
-			height: initial !important;
-			margin: 6.5px 0px !important;
 		}
 
+			.saveTabs:hover span:nth-child(2)
+			{
+				text-decoration: underline;
+			}
+
+		.iconArrowRight,.iconQuestionCircle
+		{
+			width: 16px;
+			height: 16px;
+			display: inline-block;
+			font-family: "SegoeMDL2Assets";
+			margin: 2px;
+		}
+		.iconQuestionCircle
+		{
+			font-size: small;
+			padding-top: 2px;
+			margin-bottom: 0;
+		}
+
+	.tabsAside.pane section
+	{
+		overflow: auto;
+	}
+
 	.tabsAside.pane > section > h2
 	{
-		color: inherit !important;
+		margin: 20px;
-		margin: 0px 40px !important;
+		font-weight: normal;
-		font-weight: normal !important;
-		font-size: 1.5em !important;
-		line-height: normal !important;
 	}
 
 	/* Collection header */
 	.tabsAside.pane > section > div
 	{
-		transition: .2s !important;
+		transition: .2s;
 	}
 
-	.tabsAside.pane > section > div > div:first-child
+	.collectionSet
 	{
-		margin: 0px 20px !important;
+		background-color: white;
-		display: grid !important;
+		margin: 10px;
-		grid-template-columns: auto 1fr auto auto auto !important;
+		border-radius: 5px;
-		grid-column-gap: 10px !important;
+		border: 1px solid #eee;
-		align-items: center !important;
 	}
 
-		.tabsAside.pane > section > div > div:first-child > small
+	.collectionSet:hover
+	{
+		box-shadow: 0px 0px 5px rgba(0, 0, 0, .25);
+	}
+
+	.collectionSet .header > *
+	{
+		visibility: hidden;
+	}
+
+	.collectionSet:hover .header > *
+	{
+		visibility: visible;
+	}
+
+	.collectionSet > .header
+	{
+		margin: 10px 10px 0px 20px;
+		display: grid;
+		grid-template-columns: 1fr auto auto auto;
+		grid-column-gap: 10px;
+		align-items: center;
+	}
+
+		.collectionSet > .header > small
 		{
-			color: gray !important;
+			color: gray;
-			font-size: smaller !important;
+			visibility: visible !important;
-		}
-		
-		.tabsAside.pane > section > div > div:first-child > span
-		{
-			font-weight: 600 !important;
-		}
-		
-		.tabsAside.pane > section > div > div:first-child > a
-		{
-			font-size: 11pt !important;
-			line-height: initial !important;
 		}
 
-			.tabsAside.pane > section > div > div:first-child > div > nav
+		.collectionSet > .header > input
-			{
+		{
-				width: 250px !important;
+			margin: 0px;
-				margin-top: 40px !important;
+			visibility: visible !important;
-				right: 50px !important;
+			font-weight: 600;
-			}
+			border: none;
+			background: transparent;
+		}
+
+		.collectionSet > .header > input:hover
+		{
+			border: 1px solid black;
+		}
+
+		.collectionSet > .header > div > nav
+		{
+			width: 250px;
+			right: 60px;
+		}
 
 		/* Tabs collection */
-		.tabsAside.pane > section > div > div:last-child
+		.collectionSet > .set
 		{
-			margin: 0px 0px 0px 20px !important;
+			padding: 5px 10px;
-			padding: 10px 40px 10px 20px !important;
+			white-space: nowrap;
-			white-space: nowrap !important;
+			overflow: auto;
-			overflow: auto !important;
 		}
 
-			.tabsAside.pane > section > div > div:last-child:hover::-webkit-scrollbar-thumb
+			.collectionSet > .set::-webkit-scrollbar-thumb
 			{
-				visibility: visible !important;
+				visibility: hidden;
 			}
 
-			.tabsAside.pane > section > div > div:last-child > div
+			.collectionSet > .set:hover::-webkit-scrollbar-thumb
 			{
-				width: 175px !important;
+				visibility: visible;
-				height: 148px !important;
-				margin: 5px !important;
-
-				background-color: #c2c2c2 !important;
-				background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_thumbnail.png");
-				background-size: cover !important;
-				background-position-x: center !important;
-
-				display: inline-grid !important;
-				grid-template-rows: 1fr auto !important;
-
-				box-shadow: 0px 0px 5px rgba(100, 100, 100, .5) !important;
-				transition: .25s !important;
-				cursor: pointer !important;
 			}
-				.tabsAside.pane > section > div > div:last-child > div:hover
+
+			.collectionSet > .set > div
+			{
+				width: 175px;
+				height: 148px;
+				margin: 5px;
+
+				background-color: #c2c2c2;
+				background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_thumbnail.png"),
+								  url("moz-extension://__MSG_@@extension_id__/images/tab_thumbnail.png");
+				background-size: cover;
+				background-position-x: center;
+
+				display: inline-grid;
+				grid-template-rows: 1fr auto;
+
+				transition: .25s;
+				cursor: pointer;
+
+				border: 1px solid #eee;
+				border-radius: 5px;
+			}
+				.collectionSet > .set > div:hover
 				{
-					filter: brightness(120%) !important;
+					box-shadow: 0px 0px 5px rgba(100, 100, 100, .5);
-					box-shadow: 0px 0px 15px rgba(100, 100, 100, .5) !important;
 				}
 
-				.tabsAside.pane > section > div > div:last-child > div > div
+				.collectionSet > .set > div > div
 				{
-					background-color: rgba(233, 233, 233, .75) !important;
+					background-color: rgba(233, 233, 233, .75);
-					grid-row: 2 !important;
+					grid-row: 2;
-					display: grid !important;
+					display: grid;
-					grid-template-columns: auto 1fr auto !important;
+					grid-template-columns: auto 1fr auto;
 				}
 
-					.tabsAside.pane > section > div > div:last-child > div > div > button
+					.collectionSet > .set > div > div > button
 					{
-						margin: auto !important;
+						margin: auto;
-						margin-right: 5px !important;
+						margin-right: 5px;
-						display: none !important;
+						display: none;
 					}
 
-					.tabsAside.pane > section > div > div:last-child > div:hover > div > button
+					.collectionSet > .set > div:hover > div > button
 					{
-						display: initial !important;
+						display: initial;
 					}
 
-					.tabsAside.pane > section > div > div:last-child > div > div > div
+					.collectionSet > .set > div > div > div
 					{
-						width: 20px !important;
+						width: 20px;
-						height: 20px !important;
+						height: 20px;
-						margin: 10px !important;
+						margin: 8px;
 
-						background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_icon.png");
+						background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_icon.png"),
-						background-size: 20px !important;
+										  url("moz-extension://__MSG_@@extension_id__/images/tab_icon.png");
+						background-size: 20px;
 					}
 
-					.tabsAside.pane > section > div > div:last-child > div > div > span
+					.collectionSet > .set > div > div > span
 					{
-						overflow: hidden !important;
+						overflow: hidden;
-						margin: auto 0px !important;
+						margin: auto 0px;
-						margin-right: 10px !important;
+						margin-right: 10px;
-						line-height: initial !important;
+						font-size: 12px;
 					}
-					.tabsAside.pane > section > div > div:last-child > div:hover > div > span
+					.collectionSet > .set > div:hover > div > span
 					{
-						margin-right: 5px !important;
+						margin-right: 5px;
 					}
 
 @media only screen and (max-width: 500px)
 {
 	.tabsAside.pane
 	{
-		width: initial !important;
+		width: 100% !important;
-		left: 0px !important;
+		min-width: initial;
-		min-width: initial !important;
 	}
-}
+}

css/style.dark.css

@@ -1,59 +1,115 @@
 .tabsAside[darkmode].background
 {
-	background-color: rgba(0, 0, 0, .5) !important;
+	background-color: rgba(0, 0, 0, .5);
 }
 
 .tabsAside[darkmode] .pane
-{	
+{
-	background-color: #333333 !important;
+	background-color: #333333;
-	color: white !important;
+	color: white;
 }
 
-	.tabsAside[darkmode] .pane button
+	.tabsAside[darkmode] .pane header
 	{
-		color: white !important;
+		background-color: #3b3b3b;
 	}
-	.tabsAside[darkmode] .pane button:hover
+
+	.tabsAside[darkmode] nav hr
 	{
-		background-color: gray !important;
+		filter: invert(1);
+	}
+
+	.tabsAside[darkmode] .saveTabs > div
+	{
+		filter: invert();
+	}
+
+	/* Button style */
+	.tabsAside[darkmode] button
+	{
+		color: white;
+	}
+	.tabsAside[darkmode] .pane button:hover,
+	.tabsAside[darkmode] .pane .control.checkbox:hover
+	{
+		background-color: gray;
+	}
+	.tabsAside[darkmode] .pane button img,
+	.tabsAside[darkmode] .pane label > input + span
+	{
+		filter: invert();
 	}
 	.tabsAside[darkmode] .pane button:active
 	{
-		background-color: dimgray !important;
+		background-color: dimgray;
 	}
 
-	.tabsAside[darkmode] .pane > section > div > div:first-child > div:first-child > small
+	.tabsAside[darkmode] .collectionSet > .header > input
+	{
+		color: white;
+	}
+
+	.tabsAside[darkmode] .collectionSet > .header > input:hover
+	{
+		border: 1px solid dimgray;
+	}
+
+	.tabsAside[darkmode] .collectionSet > .header > input:focus
+	{
+		background: white;
+		color: black;
+	}
+
+	.tabsAside[darkmode] a
+	{
+		color: #48adff;
+	}
+
+	/* Timestamp label */
+	.tabsAside[darkmode] > .pane > section small
 	{
 		color: lightgray !important;
 	}
 
+	/* Scrollbar style */
 	.tabsAside[darkmode] .pane ::-webkit-scrollbar-thumb
 	{
-		background: gray !important;
+		background: gray;
-		border-radius: 3px !important;
+		border-radius: 3px;
 	}
 		.tabsAside[darkmode] .pane ::-webkit-scrollbar-thumb:hover
 		{
-			background: dimgray !important;
+			background: dimgray;
 		}
 
-	.tabsAside[darkmode] .pane > section > div > div:last-child > div
+	.tabsAside[darkmode] .pane .collectionSet
 	{
-		background-color: #0c0c0c !important;
+		background-color: #3b3b3b;
-		background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_thumbnail_dark.png");
+		border-color: #444;
 	}
 
-		.tabsAside[darkmode] .pane > section > div > div:last-child > div > div
+	/* Tab style */
+	.tabsAside[darkmode] .pane .collectionSet > .set > div
+	{
+		background-color: #0c0c0c;
+		background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_thumbnail_dark.png"),
+						  url("moz-extension://__MSG_@@extension_id__/images/tab_thumbnail_dark.png");
+		border-color: #444;
+	}
+
+		.tabsAside[darkmode] .pane .collectionSet > .set > div > div
 		{
-			background-color: rgba(50, 50, 50, .75) !important;
+			background-color: rgba(50, 50, 50, .75);
 		}
 
-			.tabsAside[darkmode] .pane > section > div > div:last-child > div > div > div
+			.tabsAside[darkmode] .pane .collectionSet > .set > div > div > div
 			{
-				background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_icon_dark.png");
+				background-image: url("chrome-extension://__MSG_@@extension_id__/images/tab_icon_dark.png"),
+								  url("moz-extension://__MSG_@@extension_id__/images/tab_icon_dark.png");
 			}
 
+	/* Context menu style */
 	.tabsAside[darkmode] .pane nav
 	{
-		background-color: #3f3f3f !important;
+		background-color: #4a4a4a;
 	}

css/style.generic.css

@@ -1,126 +1,226 @@
+.updateBadge
+{
+	display: none;
+}
+.tabsAside[updated] .updateBadge
+{
+	width: 10px;
+	height: 10px;
+	background-color: #0078d7;
+	border-radius: 5px;
+	display: block;
+}
+
 /* Custom scrollbar */
 .tabsAside ::-webkit-scrollbar
 {
-	height: 6px !important;
+	height: 6px;
+	width: 6px;
 }
 
 .tabsAside ::-webkit-scrollbar-thumb
 {
-	visibility: hidden !important;
+	background: darkgray;
-	background: darkgray !important;
+	border-radius: 3px;
-	border-radius: 3px !important;
 }
 	.tabsAside ::-webkit-scrollbar-thumb:hover
 	{
-		background: gray !important;
+		background: gray;
 	}
 
-.tabsAside::-webkit-scrollbar
+.tabsAside
 {
-	width: 6px !important;
+	font-family: "SegoeUI", "SegoeMDL2Assets" !important;
+	font-size: 14px;
+	user-select: none;
 }
 
-.tabsAside::-webkit-scrollbar-thumb
-{
-	background: gray !important;
-	border-radius: 3px !important;
-}
-	.tabsAside::-webkit-scrollbar-thumb:hover
-	{
-		background: darkgray !important;
-	}
-
 /* Links style */
 .tabsAside a
 {
-	font-family: 'Segoe UI', 'Segoe MDL2 Assets' !important;
+	color: #0078d7;
-	color: #0078d7 !important;
-	font-weight: 400 !important;
 }
-	.tabsAside a:hover 
+	.tabsAside a:hover
 	{
-		text-decoration: underline !important;
+		text-decoration: underline;
-		cursor: pointer !important;
+		cursor: pointer;
 	}
 
 	.tabsAside a:visited
 	{
-		color: #0078d7 !important;
+		color: #0078d7;
 	}
 
 /* Buttons style */
 .tabsAside button
 {
-	font-family: 'Segoe MDL2 Assets' !important;
+	width: 28px;
-	width: 32px !important;
+	height: 28px;
-	height: 32px !important;
+	font-size: 16px;
-	background-color: transparent !important;
+	background-color: transparent;
-	border: none !important;
+	border: none;
-	cursor: pointer !important;
+	cursor: pointer;
-	box-shadow: initial !important;
+	outline: none !important;
-	font-size: inherit !important;
+	position: relative;
-	padding: initial !important;
-	position: initial !important;
-	box-sizing: initial !important;
-	line-height: initial !important;
-	text-align: center !important;
-	border-radius: 2px !important;
-	min-height: initial !important;
-	display: initial !important;
-	min-width: initial !important;
 }
 	.tabsAside button:hover
 	{
-		background-color: #c6c6c6 !important;
+		background-color: #f2f2f2;
 	}
 	.tabsAside button:active
 	{
-		background-color: gray !important;
+		background-color: gray;
 	}
 
 /* Context menus style */
 .tabsAside nav
 {
-	font-family: 'Segoe UI' !important;
+	user-select: none;
-	user-select: none !important;
 
-	position: absolute !important;
+	position: absolute;
-	width: 250px !important;
+	width: 390px;
+	font-size: 12px;
 
-	box-shadow: 0px 0px 10px black !important;
+	box-shadow: 0px 4px 10px rgba(0,0,0,.25);
-	background-color: white !important;
+	background-color: white;
-	border-radius: 5px !important;
+	border-radius: 5px;
 
-	z-index: 10 !important;
+	z-index: 10;
 
-	visibility: hidden !important;
+	visibility: hidden;
-	
+	padding: 4px 0px;
-	display: initial !important;
-    left: initial !important;
-    bottom: initial !important;
-    padding: initial !important;
-    min-height: initial !important;
-    font-size: inherit !important;
 }
 
-	.tabsAside nav button 
+	.tabsAside nav hr
 	{
-		font-family: 'Segoe UI' !important;
+		border: none;
-		cursor: pointer !important;
+		height: 1px;
-		background-color: transparent !important;
+		background-color: rgba(0, 0, 0, .1);
-		border: none !important;
+		margin: 4px 0px
-		box-sizing: border-box !important;
-		
-		font-size: medium !important;
-		text-align: start !important;
-
-		padding: 10px !important;
-		width: 100% !important;
-		height: initial !important;
 	}
 
-	.tabsAside button + nav:active,
+	.tabsAside nav button
-	.tabsAside button:focus + nav 
 	{
-		visibility: visible !important;
+		align-content: center;
-	}
+		text-align: start;
+
+		padding: 0px 12px;
+		width: 100%;
+
+		height: 32px;
+		font-family: "SegoeUI";
+		font-size: 12px;
+
+		display: grid;
+		grid-template-columns: auto 1fr auto;
+		grid-column-gap: 14px;
+	}
+
+		.tabsAside nav button:hover
+		{
+			background-color: #eeee;
+		}
+
+		.tabsAside nav button img:first-child
+		{
+			width: 16px;
+			height: 16px;
+		}
+
+		.tabsAside nav button img:nth-child(3)
+		{
+			width: 12px;
+			height: 12px;
+		}
+
+		.tabsAside nav button *:nth-child(3)
+		{
+			align-self: center;
+		}
+
+	.tabsAside button + nav:active,
+	.tabsAside button:focus + nav
+	{
+		visibility: visible;
+	}
+
+/* Icon buttons style */
+.btn
+{
+	background-repeat: no-repeat;
+	background-size: 12px;
+	background-position: center;
+	font-family: "SegoeUI", "SegoeMDL2Assets";
+}
+
+.control.checkbox
+{
+	display: block;
+	position: relative;
+	padding: 8px 12px 8px 42px;
+	box-sizing: border-box;
+	cursor: pointer;
+	min-height: 32px;
+}
+	.control.checkbox:hover
+	{
+		background-color: #eeeeee;
+	}
+	.control.checkbox input
+	{
+		position: absolute;
+		opacity: 0;
+		width: 0;
+		height: 0;
+	}
+	.control.checkbox input + span
+	{
+		position: absolute;
+		left: 12px;
+		height: 16px;
+		width: 16px;
+
+		transition-property: background, border, border-color;
+		transition-duration: 200ms;
+		transition-timing-function: cubic-bezier(0.4, 0, 0.23, 1);
+	}
+		.control.checkbox input + span::after
+		{
+			position: absolute;
+			color: rgba(0, 0, 0, .4);
+
+			font-family: "SegoeMDL2Assets";
+			content: "\E001";
+
+			width: 16px;
+			height: 16px;
+			font-size: 16px;
+			text-align: center;
+
+			display: none;
+		}
+			.control.checkbox input:checked + span::after
+			{
+				display: block;
+				color: black;
+			}
+			.control.checkbox:hover input + span::after
+			{
+				display: block;
+			}
+
+@font-face
+{
+	font-family: "SegoeUI";
+	src: local("Segoe UI"),
+		url("../fonts/segoeui.ttf") format("truetype"),
+		url("../fonts/segoeui.woff") format("woff")
+}
+
+@font-face
+{
+	font-family: "SegoeMDL2Assets";
+	src: local("Segoe MDL2 Assets"),
+		url("../fonts/segoemdl2.ttf") format("truetype"),
+		url("../fonts/segoemdl2.woff") format("woff")
+}

css/style.listview.css

@@ -0,0 +1,59 @@
+.tabsAside[listview] .collectionSet > .header
+{
+	margin-bottom: 5px;
+}
+
+.tabsAside[listview] .collectionSet > .set
+{
+	max-height: 250px;
+}
+
+.tabsAside[listview] .collectionSet > .set > div
+{
+	width: initial;
+	height: initial;
+	background-image: none !important;
+	display: block;
+}
+
+.listviewSwitch
+{
+	width: 20px;
+	height: 20px;
+	display: grid;
+	grid-row-gap: 2px;
+	grid-column-gap: 2px;
+	cursor: pointer;
+	margin: 0px auto;
+}
+
+.listviewSwitch.tile
+{
+	grid-template-columns: 1fr 1fr;
+}
+
+.listviewSwitch > div
+{
+	border-radius: 1px;
+	background-color: #c2c2c2;
+}
+
+.listviewSwitch:hover > div
+{
+	background-color: #a0a0aa;
+}
+
+.tabsAside .listviewSwitch.tile > div
+{
+	background-color: gray;
+}
+
+.tabsAside[listview] .listviewSwitch.tile > div
+{
+	background-color: #c2c2c2;
+}
+
+.tabsAside[listview] .listviewSwitch.list > div
+{
+	background-color: gray;
+}

fonts/Segoe_EULA.txt

@@ -0,0 +1 @@
+You may use the Segoe MDL2 Assets and Segoe UI fonts or glyphs included in this file (“Software”) solely to design, develop and test your programs for Microsoft Office.  Microsoft Office includes but is not limited to any software product or service branded by trademark, trade dress, copyright or some other recognized means, as a product or service of Microsoft Office. This license does not grant you the right to distribute or sublicense all or part of the Software to any third party.  By using the Software you agree to these terms. If you do not agree to these terms, do not use the Segoe MDL2 and Segoe UI Fonts or Glyphs.

icons/bmc.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="36px" viewBox="0 0 24 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 59 (86127) - https://sketch.com -->
+    <title>Group</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-2" transform="translate(-17.000000, -7.000000)">
+            <g id="Logo">
+                <g id="Group-4" transform="translate(17.000000, 8.000000)">
+                    <g id="Group">
+                        <g id="Logo" transform="translate(0.559947, 0.000000)">
+                            <polygon id="Fill-1" fill="#FF9100" points="11.2752139 6.65517263 2.53594776 6.60250871 6.82755165 33.7158335 7.76390159 33.7158335 16.3471094 33.7158335 17.2834593 33.7158335 21.5750632 6.60250871"></polygon>
+                            <polygon id="Fill-2" fill="#FFDD00" points="11.2752139 6.65517263 2.53594776 6.60250871 6.82755165 33.7158335 7.76390159 33.7158335 14.1622929 33.7158335 15.0986428 33.7158335 19.3902467 6.60250871"></polygon>
+                            <polygon id="Fill-3" fill="#FFFFFF" points="0.0390145809 6.60252433 22.5894423 6.60252433 22.5894423 4.10216009 0.0390145809 4.10216009"></polygon>
+                            <polygon id="Stroke-4" stroke="#000000" stroke-width="1.17043743" points="0.0390145809 6.60252433 22.5894423 6.60252433 22.5894423 4.10216009 0.0390145809 4.10216009"></polygon>
+                            <polygon id="Fill-6" fill="#FFFFFF" points="18.2198093 0.0390681913 12.8357971 0.0390681913 9.63660147 0.0390681913 4.25258931 0.0390681913 2.61397692 3.78961456 9.63660147 3.78961456 12.8357971 3.78961456 19.8584217 3.78961456"></polygon>
+                            <g id="Group-11" transform="translate(0.936350, 0.000000)" stroke-width="1.17043743">
+                                <polygon id="Stroke-7" stroke="#050505" points="17.2834593 0.0390681913 11.8994472 0.0390681913 8.70025153 0.0390681913 3.31623937 0.0390681913 1.67762698 3.78961456 8.70025153 3.78961456 11.8994472 3.78961456 18.9220717 3.78961456"></polygon>
+                                <polygon id="Stroke-9" stroke="#000000" points="10.3388639 6.65517263 0.0390145809 6.60250871 4.33061848 33.7158335 5.26696842 33.7158335 15.4107594 33.7158335 16.3471094 33.7158335 20.6387133 6.60250871"></polygon>
+                            </g>
+                            <polygon id="Fill-12" fill="#FFFFFF" points="21.8871799 14.2598898 11.6059795 14.2598898 10.8664191 14.2598898 0.585218713 14.2598898 2.50832543 25.0427106 11.2361993 24.9487126 19.9640731 25.0427106"></polygon>
+                            <polygon id="Stroke-13" stroke="#000000" stroke-width="1.17043743" points="21.8871799 14.2598898 11.6059795 14.2598898 10.8664191 14.2598898 0.585218713 14.2598898 2.50832543 25.0427106 11.2361993 24.9487126 19.9640731 25.0427106"></polygon>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

icons/check.svg

@@ -0,0 +1,5 @@
+<!-- Exported by Character Map UWP -->
+<svg height="100%" viewBox="106 234 813 580" width="100%" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path d="M918.5,278.5L384,813.5L105.5,534.5L150.5,489.5L384,722.5L873.5,233.5Z" fill="#000000" fill-opacity="1">
+  </path>
+</svg>

icons/feedback.svg

@@ -0,0 +1,5 @@
+<!-- Exported by Character Map UWP -->
+<svg height="100%" viewBox="0 0 1024 1024" width="100%" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path d="M479,664C512.667,677.333 543.333,695.083 571,717.25C598.667,739.417 622.333,764.833 642,793.5C661.667,822.167 676.917,853.333 687.75,887C698.583,920.667 704,955.667 704,992L704,1024L640,1024L640,992C640,952.333 632.417,915 617.25,880C602.083,845 581.5,814.5 555.5,788.5C529.5,762.5 499,741.917 464,726.75C429,711.583 391.667,704 352,704C312.333,704 275,711.583 240,726.75C205,741.917 174.5,762.5 148.5,788.5C122.5,814.5 101.917,845 86.75,880C71.5833,915 64,952.333 64,992L64,1024L0,1024L0,992C0,955.667 5.41667,920.667 16.25,887C27.0833,853.333 42.3333,822.167 62,793.5C81.6667,764.833 105.333,739.417 133,717.25C160.667,695.083 191.333,677.333 225,664C210,653.667 196.5,641.667 184.5,628C172.5,614.333 162.333,599.583 154,583.75C145.667,567.917 139.25,551.25 134.75,533.75C130.25,516.25 128,498.333 128,480C128,449 133.917,419.917 145.75,392.75C157.583,365.583 173.583,341.917 193.75,321.75C213.917,301.583 237.583,285.583 264.75,273.75C291.917,261.917 321,256 352,256C383,256 412.083,261.917 439.25,273.75C466.417,285.583 490.083,301.583 510.25,321.75C530.417,341.917 546.417,365.583 558.25,392.75C570.083,419.917 576,449 576,480C576,498.333 573.75,516.25 569.25,533.75C564.75,551.25 558.333,567.917 550,583.75C541.667,599.583 531.5,614.333 519.5,628C507.5,641.667 494,653.667 479,664ZM352,640C374,640 394.667,635.833 414,627.5C433.333,619.167 450.25,607.75 464.75,593.25C479.25,578.75 490.75,561.75 499.25,542.25C507.75,522.75 512,502 512,480C512,458 507.75,437.333 499.25,418C490.75,398.667 479.25,381.75 464.75,367.25C450.25,352.75 433.333,341.25 414,332.75C394.667,324.25 374,320 352,320C330,320 309.25,324.25 289.75,332.75C270.25,341.25 253.25,352.75 238.75,367.25C224.25,381.75 212.833,398.667 204.5,418C196.167,437.333 192,458 192,480C192,502 196.167,522.75 204.5,542.25C212.833,561.75 224.25,578.75 238.75,593.25C253.25,607.75 270.25,619.167 289.75,627.5C309.25,635.833 330,640 352,640ZM1024,0L1024,512L896,512L704,704L704,512L640,512L640,448L768,448L768,549.5L869.5,448L960,448L960,64L320,64L320,179C309.333,180.333 298.583,182.083 287.75,184.25C276.917,186.417 266.333,189.333 256,193L256,0Z" fill="#000000" fill-opacity="1">
+  </path>
+</svg>

icons/github.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
+<!--
+Font Awesome Free 5.4.1 by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+-->

icons/list.svg

@@ -0,0 +1,5 @@
+<!-- Exported by Character Map UWP -->
+<svg height="100%" viewBox="7 111 1017 721" width="100%" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path d="M1024,192L1024,256L384,256L384,192ZM384,384L1024,384L1024,448L384,448ZM384,576L1024,576L1024,640L384,640ZM384,768L1024,768L1024,832L384,832ZM239,495L273,529L96,706L7,617L41,583L96,638ZM239,111L273,145L96,322L7,233L41,199L96,254Z" fill="#000000" fill-opacity="1">
+  </path>
+</svg>

js/aside-script.js

@@ -1,94 +1,68 @@
-if (document.location.protocol == "chrome-extension:")
+if (window.location === window.parent.location && !window.location.protocol.includes("-extension:"))	// For open/close call
-	InitializeStandalone();
-else
 {
-	setTimeout(function ()
+	var iframe = document.querySelector("iframe.tabsAsideIframe");
+	if (!iframe)
 	{
-		var pane = document.querySelector(".tabsAside.pane");
+		iframe = document.createElement('iframe');
 
-		if (pane == null)
+		iframe.setAttribute("class", "tabsAsideIframe");
+
+		iframe.style.position = "fixed";
+		iframe.style.zIndex = "2147483647";
+
+		iframe.style.height = "100%";
+		iframe.style.width = "100%";
+
+		iframe.style.top = "0px";
+		iframe.style.right = "0px";
+		iframe.style.left = "0px";
+		iframe.style.bottom = "0px";
+
+		iframe.style.border = "none";
+		iframe.style.background = "transparent";
+		iframe.style.opacity = 0;
+
+		var bodyStyle = document.body.getAttribute("style");
+		document.body.setAttribute("style", "overflow: hidden !important");
+
+		iframe.onload = () => setTimeout(() => iframe.style.opacity = 1, 100);
+
+		iframe.src = chrome.extension.getURL("TabsAside.html");
+		document.body.appendChild(iframe);
+	}
+	else
+	{
+		iframe.contentWindow.postMessage({ target: "TabsAside", command: "TogglePane" }, "*");
+		setTimeout(() =>
 		{
-			var xhr = new XMLHttpRequest();
+			iframe.remove();
-			xhr.open('GET', chrome.extension.getURL("collections.html"), true);
+			document.body.setAttribute("style", bodyStyle);
-			xhr.onreadystatechange = function ()
+		}, 250);
-			{
+	}
-				if (this.status !== 200 || document.querySelector("#aside-pane") != null)
-					return;
-
-				if (document.querySelector(".tabsAside.pane") == null)
-				{
-					document.body.innerHTML += this.responseText;
-					chrome.runtime.sendMessage({ command: "loadData" }, function (collections)
-					{
-						if (document.querySelector(".tabsAside.pane section div") == null)
-							collections.forEach(i => 
-							{
-								AddCollection(i);
-							});
-					});
-				}
-
-				setTimeout(function ()
-				{
-					pane = document.querySelector(".tabsAside.pane");
-
-					if (window.matchMedia("(prefers-color-scheme: dark)").matches)
-						pane.parentElement.setAttribute("darkmode", "");
-
-					document.querySelector(".tabsAside .saveTabs").onclick = SetTabsAside;
-
-
-					document.querySelectorAll(".tabsAside.pane > header nav button").forEach(i => 
-					{
-						i.onclick = function () { window.open(i.value, '_blank'); };
-					});
-
-					document.querySelector(".tabsAside.background").addEventListener("click", function (event)
-					{
-						if (event.target == pane.parentElement)
-						{
-							pane.removeAttribute("opened");
-							pane.parentElement.style.opacity = 0;
-							document.body.style.overflow = "";
-							setTimeout(function ()
-							{
-								pane.parentElement.remove();
-							}, 300);
-						}
-					});
-
-					pane.setAttribute("opened", "");
-					pane.parentElement.style.opacity = 1;
-					document.body.style.overflow = "hidden";
-				}, 50);
-			};
-			xhr.send();
-		}
-		else
-		{
-			if (pane.hasAttribute("opened"))
-			{
-				pane.removeAttribute("opened");
-				pane.parentElement.style.opacity = 0;
-				document.body.style.overflow = "";
-				setTimeout(function ()
-				{
-					if (!pane.hasAttribute("opened"))
-						pane.parentElement.remove();
-				}, 300);
-			}
-			else
-			{
-				pane.setAttribute("opened", "");
-				pane.parentElement.style.opacity = 1;
-			}
-		}
-	}, 50);
 }
+else // For init call
+	Initialize();
 
-function InitializeStandalone()
+function Initialize()
 {
-	pane = document.querySelector(".tabsAside.pane");
+	var pane = document.querySelector(".tabsAside.pane");
+	if (!pane)
+		return;
+
+	if (window.location !== window.parent.location)
+	{
+		pane.setAttribute("embedded", "");
+		window.addEventListener('message', event =>
+		{
+			if (event.data.target == "TabsAside")
+			{
+				pane.parentElement.style.opacity = 0;
+				pane.removeAttribute("opened");
+			}
+		});
+	}
+
+	UpdateLocale();
 
 	if (window.matchMedia("(prefers-color-scheme: dark)").matches)
 	{
@@ -97,23 +71,180 @@ function InitializeStandalone()
 	}
 
 	document.querySelector(".tabsAside .saveTabs").onclick = SetTabsAside;
+	document.querySelector(".tabsAside header .btn.remove").addEventListener("click", () =>
+		chrome.runtime.sendMessage({ command: "togglePane" })
+	);
+	document.querySelector(".tabsAside.closeArea").addEventListener("click", () =>
+		chrome.runtime.sendMessage({ command: "togglePane" })
+	);
 
-	document.querySelectorAll(".tabsAside.pane > header nav button").forEach(i => 
+	document.querySelector("nav > p > small").textContent = chrome.runtime.getManifest()["version"];
+
+	// Tabs dismiss option
+	var loadOnRestoreCheckbox = document.querySelector("#loadOnRestore");
+	chrome.storage.sync.get(
+		{ "loadOnRestore": true },
+		values => loadOnRestoreCheckbox.checked = values?.loadOnRestore ?? true
+	);
+	chrome.storage.onChanged.addListener((changes, namespace) =>
 	{
-		i.onclick = function () { window.open(i.value, '_blank'); };
+		if (namespace == 'sync')
+			for (key in changes)
+				if (key === 'loadOnRestore')
+					loadOnRestoreCheckbox.checked = changes[key].newValue
 	});
-
+	loadOnRestoreCheckbox.addEventListener("click", () =>
-	chrome.runtime.sendMessage({ command: "loadData" }, function (collections)
+		chrome.storage.sync.set(
-	{
-		if (document.querySelector(".tabsAside.pane section div") == null)
-			collections.forEach(i => 
 			{
-				AddCollection(i);
+				"loadOnRestore": loadOnRestoreCheckbox.checked
-			});
+			})
+	);
+
+	// Extension browser icon action
+	var swapIconAction = document.querySelector("#swapIconAction");
+	chrome.storage.sync.get(
+		{ "setAsideOnClick": false },
+		values => swapIconAction.checked = values?.setAsideOnClick ?? false
+	);
+	chrome.storage.onChanged.addListener((changes, namespace) =>
+	{
+		if (namespace == 'sync')
+			for (key in changes)
+				if (key === 'setAsideOnClick')
+					swapIconAction.checked = changes[key].newValue
 	});
+	swapIconAction.addEventListener("click", () =>
+		chrome.storage.sync.set(
+			{
+				"setAsideOnClick": swapIconAction.checked
+			})
+	);
+
+	// Deletion confirmation dialog
+	var showDeleteDialog = document.querySelector("#showDeleteDialog");
+	chrome.storage.sync.get(
+		{ "showDeleteDialog": true },
+		values => showDeleteDialog.checked = values.showDeleteDialog
+	);
+	chrome.storage.onChanged.addListener((changes, namespace) =>
+	{
+		if (namespace == 'sync')
+			for (key in changes)
+				if (key === 'showDeleteDialog')
+					showDeleteDialog.checked = changes[key].newValue
+	});
+	showDeleteDialog.addEventListener("click", () =>
+		chrome.storage.sync.set(
+			{
+				"showDeleteDialog": showDeleteDialog.checked
+			})
+	);
+
+	// Collections view switch
+	chrome.storage.sync.get(
+		{ "listview": false },
+		values =>
+		{
+			if (values?.listview)
+				pane.setAttribute("listview", "");
+		}
+	);
+	document.querySelectorAll(".listviewSwitch").forEach(i =>
+		{
+			i.onclick = (args) =>
+			{
+				if (args.currentTarget.classList[1] == "list")
+				{
+					pane.setAttribute("listview", "");
+					chrome.storage.sync.set({ "listview": true });
+				}
+				else
+				{
+					pane.removeAttribute("listview");
+					chrome.storage.sync.set({ "listview": false });
+				}
+			}
+		});
+	chrome.storage.onChanged.addListener((changes, namespace) =>
+	{
+		if (namespace == 'sync')
+			for (key in changes)
+				if (key === 'listview')
+					if (changes[key].newValue)
+						pane.setAttribute("listview", "");
+					else
+						pane.removeAttribute("listview");
+	});
+
+	document.querySelectorAll(".tabsAside.pane > header nav button").forEach(i =>
+		i.onclick = () =>
+		{
+			if (i.hasAttribute("feedback-button"))
+			{
+				if (chrome.runtime.getManifest()["update_url"] && chrome.runtime.getManifest()["update_url"].includes("edge.microsoft.com"))
+					window.open("https://microsoftedge.microsoft.com/addons/detail/tabs-aside/kmnblllmalkiapkfknnlpobmjjdnlhnd", "_blank")
+				else
+					window.open("https://chrome.google.com/webstore/detail/tabs-aside/mgmjbodjgijnebfgohlnjkegdpbdjgin", "_blank")
+			}
+			else
+				window.open(i.value, "_blank");
+		});
+
+	// Showing changelog badge if updated
+	chrome.storage.local.get({ "showUpdateBadge": false }, values =>
+	{
+		if (values.showUpdateBadge)
+		{
+			pane.setAttribute("updated", "");
+			let settingsButton = document.querySelector("header .btn.more");
+			settingsButton.addEventListener("focusout", () =>
+				{
+					if (!pane.hasAttribute("updated"))
+						return;
+					pane.removeAttribute("updated");
+					chrome.storage.local.set({ "showUpdateBadge": false });
+				});
+		}
+	});
+
+	chrome.runtime.sendMessage({ command: "loadData" }, ({ collections, thumbnails }) =>
+		ReloadCollections(collections, thumbnails));
+
+	chrome.runtime.onMessage.addListener((message) =>
+	{
+		switch (message.command)
+		{
+			case "reloadCollections":
+				ReloadCollections(message.collections, message.thumbnails);
+				break;
+		}
+	});
+
+	setTimeout(() => pane.setAttribute("opened", ""), 100);
 }
 
-function AddCollection(collection)
+function UpdateLocale()
+{
+	document.querySelectorAll("*[loc]").forEach(i => i.textContent = chrome.i18n.getMessage(i.getAttribute("loc")));
+	document.querySelectorAll("*[loc_alt]").forEach(i => i.title = chrome.i18n.getMessage(i.getAttribute("loc_alt")));
+
+	var swapActionsLabel = document.querySelector("span[loc=swapIconAction]");
+	chrome.runtime.sendMessage({ command: "getShortcuts" }, (shortcuts) =>
+		swapActionsLabel.textContent = swapActionsLabel.textContent.replace("%TOGGLE_SHORTCUT%", shortcuts.filter(i => i.name == "toggle-pane")[0].shortcut)
+	);
+}
+
+
+function ReloadCollections(collections, thumbnails)
+{
+	document.querySelector(".tabsAside section h2").removeAttribute("hidden");
+	document.querySelectorAll(".tabsAside section > div").forEach(i => i.remove());
+
+	for (var collection of Object.values(collections).reverse())
+		AddCollection(collection, thumbnails);
+}
+
+function AddCollection(collection, thumbnails)
 {
 	var list = document.querySelector(".tabsAside section");
 	list.querySelector("h2").setAttribute("hidden", "");
@@ -121,77 +252,62 @@ function AddCollection(collection)
 	var rawTabs = "";
 
 	for (var i = 0; i < collection.links.length; i++)
-	{
 		rawTabs +=
-			"<div title='" + collection.titles[i] + "'" + ((collection.thumbnails && collection.thumbnails[i]) ? " style='background-image: url(" + collection.thumbnails[i] + ")'" : "") + ">" +
+			"<div title='" + collection.titles[i] + "'" + (thumbnails[collection.links[i]]?.pageCapture ? " style='background-image: url(" + thumbnails[collection.links[i]].pageCapture + ")'" : "") + " value='" + collection.links[i] + "'>" +
-			"<span value='" + collection.links[i] + "'></span>" +
+				"<div>" +
-			"<div>" +
+					"<div" + (!thumbnails[collection.links[i]]?.iconUrl ? "" : " style='background-image: url(\"" + thumbnails[collection.links[i]].iconUrl + "\")'") + "></div>" +
-			"<div" + ((collection.icons[i] == 0 || collection.icons[i] == null) ? "" : " style='background-image: url(\"" + collection.icons[i] + "\")'") + "></div>" +
+					"<span>" + collection.titles[i] + "</span>" +
-			"<span>" + collection.titles[i] + "</span>" +
+					"<button loc_alt='removeTab' class='btn remove' title='Remove tab from collection'>&#xE711;</button>" +
-			"<button title='Remove tab from collection'>&#xE106;</button>" +
+				"</div>" +
-			"</div>" +
 			"</div>";
-	}
 
-	list.innerHTML += "<div>" +
+	list.innerHTML +=
-		"<div>" +
+		"<div class='collectionSet' id='set_"+collection.timestamp+"'>" +
-		"<span>Tabs: " + collection.links.length + "</span>" +
+			"<div class='header'>" +
-		"<small>" + GetAgo(collection.timestamp) + "</small>" +
+				"<input type='text' value='" + (collection.name ?? new Date(collection.timestamp).toDateString()) + "'/>" +
-		"<a>Restore tabs</a>" +
+				"<a loc='restoreTabs' class='restoreCollection'>Restore tabs</a>" +
-		"<div>" +
+				"<div>" +
-		"<button title='More...'>&#xE10C;</button>" +
+					"<button loc_alt='more' class='btn more' title='More...'>&#xE712;</button>" +
-		"<nav>" +
+					"<nav>" +
-		"<button>Restore without removing</button>" +
+						"<button loc='restoreNoRemove' class='restoreCollection noDelete'>Restore without removing</button>" +
-		"<button hidden>Add tabs to favorites</button>" +
+					"</nav>" +
-		"<button hidden>Share tabs</button>" +
+				"</div>" +
-		"</nav>" +
+				"<button loc_alt='removeCollection' class='btn remove' title='Remove collection'>&#xE711;</button>" +
-		"</div>" +
+				"<small>" + collection.links.length + " " + chrome.i18n.getMessage("tabs") +"</small>" +
-		"<button title='Remove collection'>&#xE106;</button>" +
+			"</div>" +
-		"</div>" +
 
-		"<div>" + rawTabs + "</div>" +
+			"<div class='set' class='tabsList'>" + rawTabs + "</div>" +
-		"</div>"
+		"</div>";
 
-	list.querySelectorAll("a").forEach(i => 
+	UpdateLocale();
-	{
-		i.onclick = function () { RestoreTabs(i.parentElement.parentElement) };
-	});
 
-	list.querySelectorAll("nav button:first-child").forEach(i => 
+	list.querySelectorAll("input").forEach(i =>
-	{
+		i.addEventListener("focusout",(event) => RenameCollection(i.parentElement.parentElement, event.target.value)));
-		i.onclick = function () { RestoreTabs(i.parentElement.parentElement.parentElement.parentElement, false) };
-	});
 
-	list.querySelectorAll("div > div:last-child > div > span").forEach(i => 
+	list.querySelectorAll(".restoreCollection").forEach(i =>
-	{
+		i.onclick = () => RestoreTabs(i.parentElement.parentElement));
-		i.onclick = function () {
-			chrome.runtime.sendMessage(
-				{
-					command: "openTab",
-					url: i.getAttribute("value")
-				}
-			);
-		};
-	})
 
-	document.querySelectorAll(".tabsAside.pane > section > div > div:first-child > button").forEach(i => 
+	list.querySelectorAll(".restoreCollection.noDelete").forEach(i =>
-	{
+		i.onclick = () => RestoreTabs(i.parentElement.parentElement.parentElement.parentElement, false));
-		i.onclick = function () { RemoveTabs(i.parentElement.parentElement) };
-	});
 
-	/*document.querySelectorAll(".tabsAside.pane > section > div > div:first-child > div > nav > button:first-child").forEach(i => 
+	list.querySelectorAll(".set > div").forEach(i =>
-	{
+		i.onclick = (args) =>
-		i.onclick = function () { AddToFavorites(i.parentElement.parentElement.parentElement.parentElement) };
+		{
-	});
+			if (args.target.localName != "button")
-	document.querySelectorAll(".tabsAside.pane > section > div > div:first-child > div > nav > button:last-child").forEach(i => 
+				chrome.runtime.sendMessage(
-	{
+					{
-		i.onclick = function () { ShareTabs(i.parentElement.parentElement.parentElement.parentElement) };
+						command: "openTab",
-	});*/
+						url: i.getAttribute("value")
+					}
+				);
+		});
 
-	document.querySelectorAll(".tabsAside.pane > section > div > div:last-child > div > div > button").forEach(i => 
+	document.querySelectorAll(".header .btn.remove").forEach(i =>
-	{
+		i.onclick = () => RemoveTabs(i.parentElement.parentElement));
-		i.onclick = function () { RemoveOneTab(i.parentElement.parentElement) };
+
-	});
+	document.querySelectorAll(".set .btn.remove").forEach(i =>
+		i.onclick = () =>
+			RemoveOneTab(i.parentElement.parentElement));
 }
 
 function SetTabsAside()
@@ -199,145 +315,86 @@ function SetTabsAside()
 	chrome.runtime.sendMessage({ command: "saveTabs" });
 }
 
+function RenameCollection(collectionData, name)
+{
+	chrome.runtime.sendMessage(
+		{
+			command: "renameCollection",
+			newName: name,
+			collectionKey: collectionData.id
+		});
+}
+
 function RestoreTabs(collectionData, removeCollection = true)
 {
 	chrome.runtime.sendMessage(
 		{
 			command: "restoreTabs",
 			removeCollection: removeCollection,
-			collectionIndex: Array.prototype.slice.call(collectionData.parentElement.children).indexOf(collectionData) - 1
+			collectionKey: collectionData.id
 		},
-		function ()
+		() =>
 		{
-			if (!removeCollection)
+			if (removeCollection)
-				return;
+				RemoveCollectionElement(collectionData);
-
-			if (collectionData.parentElement.children.length < 3)
-			{
-				RemoveElement(collectionData);
-				setTimeout(function ()
-				{
-					document.querySelector(".tabsAside.pane > section > h2").removeAttribute("hidden");
-				}, 250);
-			}
-			else
-				RemoveElement(collectionData);
 		}
 	);
 }
 
 function RemoveTabs(collectionData)
 {
-	chrome.runtime.sendMessage(
+	chrome.storage.sync.get({ "showDeleteDialog": true }, values =>
-		{
+	{
-			command: "deleteTabs",
+		if (values.showDeleteDialog && !confirm(chrome.i18n.getMessage("removeCollectionConfirm")))
-			collectionIndex: Array.prototype.slice.call(collectionData.parentElement.children).indexOf(collectionData) - 1
+			return;
-		},
+
-		function ()
+		chrome.runtime.sendMessage(
-		{
-			if (collectionData.parentElement.children.length < 3)
 			{
-				RemoveElement(collectionData);
+				command: "deleteTabs",
-				setTimeout(function ()
+				collectionKey: collectionData.id
-				{
+			},
-					document.querySelector(".tabsAside.pane > section > h2").removeAttribute("hidden");
+			() => RemoveCollectionElement(collectionData)
-				}, 250);
+		);
-			}
+	});
-			else
-				RemoveElement(collectionData);
-		}
-	);
-}
-
-function AddToFavorites(collectionData)
-{
-	chrome.runtime.sendMessage(
-		{
-			command: "toFavorites",
-			collectionIndex: Array.prototype.slice.call(collectionData.parentElement.children).indexOf(collectionData) - 1
-		});
-}
-
-function ShareTabs(collectionData)
-{
-	chrome.runtime.sendMessage(
-		{
-			command: "share",
-			collectionIndex: Array.prototype.slice.call(collectionData.parentElement.children).indexOf(collectionData) - 1
-		});
 }
 
 function RemoveOneTab(tabData)
 {
-	chrome.runtime.sendMessage(
+	chrome.storage.sync.get({ "showDeleteDialog": true }, values =>
-		{
+	{
-			command: "removeTab",
+		if (values.showDeleteDialog && !confirm(chrome.i18n.getMessage("removeTabConfirm")))
-			collectionIndex: Array.prototype.slice.call(tabData.parentElement.parentElement.parentElement.children).indexOf(tabData.parentElement.parentElement) - 1,
+			return;
-			tabIndex: Array.prototype.slice.call(tabData.parentElement.children).indexOf(tabData)
+
-		},
+		chrome.runtime.sendMessage(
-		function ()
-		{
-			tabData.parentElement.previousElementSibling.children[0].textContent = "Tabs: " + tabData.parentElement.children.length - 1;
-			if (tabData.parentElement.children.length < 2)
 			{
-				RemoveElement(tabData.parentElement.parentElement);
+				command: "removeTab",
-				if (document.querySelector("tabsAside.pane > section").children.length < 2)
+				collectionKey: tabData.parentElement.parentElement.id,
-					setTimeout(function ()
+				tabIndex: Array.prototype.slice.call(tabData.parentElement.children).indexOf(tabData)
-					{
+			},
-						document.querySelector(".tabsAside.pane > section > h2").removeAttribute("hidden");
+			() =>
-					}, 250);
+			{
-			}
+				tabData.parentElement.previousElementSibling.querySelector("small").textContent = (tabData.parentElement.children.length - 1) + " " + chrome.i18n.getMessage("tabs");
-			else
+				if (tabData.parentElement.children.length < 2)
-				RemoveElement(tabData);
+				{
-		});
+					RemoveElement(tabData.parentElement.parentElement);
-}
+					if (document.querySelector("tabsAside.pane > section").children.length < 2)
-
+						setTimeout(() => document.querySelector(".tabsAside.pane > section > h2").removeAttribute("hidden"), 250);
-function GetAgo(timestamp)
+				}
-{
+				else
-	var minutes = (Date.now() - timestamp) / 60000;
+					RemoveElement(tabData);
-
+			});
-	if (minutes < 1)
+	});
-		return "Just now";
-
-	else if (Math.floor(minutes) == 1)
-		return "1 minute ago";
-	else if (minutes < 60)
-		return Math.floor(minutes) + " minutes ago";
-
-	else if (Math.floor(minutes / 60) == 1)
-		return "1 hour ago";
-	else if (minutes < 24 * 60)
-		return Math.floor(minutes / 60) + " hours ago";
-
-	else if (Math.floor(minutes / 24 / 60) == 1)
-		return "1 day ago";
-	else if (minutes < 7 * 24 * 60)
-		return Math.floor(minutes / 24 / 60) + " days ago";
-
-	else if (Math.floor(minutes / 7 / 24 / 60) == 1)
-		return "1 week ago";
-	else if (minutes < 30 * 24 * 60)
-		return Math.floor(minutes / 7 / 24 / 60) + " weeks ago";
-
-	else if (Math.floor(minutes / 30 / 24 / 60) == 1)
-		return "1 month ago";
-	else if (minutes < 365 * 24 * 60)
-		return Math.floor(minutes / 30 / 24 / 60) + " months ago";
-
-	else if (Math.floor(minutes / 24 / 60) == 365)
-		return "1 year ago";
-	else
-		return Math.floor(minutes / 365 / 24 / 60) + "years ago";
 }
 
 function RemoveElement(el)
 {
 	el.style.opacity = 0;
-	setTimeout(function ()
+	setTimeout(() => el.remove(), 200);
-	{
-		el.remove();
-	}, 200);
 }
 
-// TODO: Add more actions
+function RemoveCollectionElement(el)
-// TODO: Make backup system
+{
+	if (el.parentElement.children.length < 3)
+		setTimeout(() => document.querySelector(".tabsAside.pane > section > h2").removeAttribute("hidden"), 250);
+	RemoveElement(el);
+}

js/background.js

@@ -1,28 +1,30 @@
-chrome.browserAction.onClicked.addListener(function (tab)
+//This variable is populated when the browser action icon is clicked, or a command is called (with a shortcut for example).
+//We can't populate it later, as selected tabs get deselected on a click inside a tab.
+var tabsToSave = [];
+
+var syncEnabled = true;		//This variable controls whether to use the chrome sync storage, along with its size limitations, or the much larger chrome local storage. The option is currently not exposed to the users.
+var collectionStorage = syncEnabled ? chrome.storage.sync : chrome.storage.local;
+
+//Get the tabs to save, either all the window or the selected tabs only, and pass them through a callback.
+function GetTabsToSave (callback)
+{
+	chrome.tabs.query({ currentWindow: true }, (windowTabs) =>
+	{
+		var highlightedTabs = windowTabs.filter(item => item.highlighted);
+		//If there are more than one selected tab in the window, we set only those aside.
+		// Otherwise, all the window's tabs get saved.
+		return callback((highlightedTabs.length > 1 ? highlightedTabs : windowTabs));
+	});
+
+}
+
+function TogglePane (tab)
 {
 	if (tab.url.startsWith("http")
-	&& !tab.url.includes("chrome.google.com")
+		&& !tab.url.includes("chrome.google.com")
-	&& !tab.url.includes("microsoftedge.microsoft.com"))
+		&& !tab.url.includes("addons.mozilla.org")
+		&& !tab.url.includes("microsoftedge.microsoft.com"))
 	{
-		chrome.tabs.insertCSS(
-			{
-				file: "css/style.css",
-				allFrames: true,
-				runAt: "document_idle"
-			});
-		chrome.tabs.insertCSS(
-			{
-				file: "css/style.generic.css",
-				allFrames: true,
-				runAt: "document_idle"
-			});
-		chrome.tabs.insertCSS(
-			{
-				file: "css/style.dark.css",
-				allFrames: true,
-				runAt: "document_idle"
-			});
-
 		chrome.tabs.executeScript(tab.id,
 			{
 				file: "js/aside-script.js",
@@ -30,92 +32,266 @@ chrome.browserAction.onClicked.addListener(function (tab)
 				runAt: "document_idle"
 			});
 	}
-	else if (tab.url.startsWith("chrome-extension") && tab.url.endsWith("TabsAside.html"))
+	else if (tab.url == chrome.runtime.getURL("TabsAside.html"))
 		chrome.tabs.remove(tab.id);
 	else
 	{
-		chrome.tabs.create({
+		chrome.tabs.create(
-			url: chrome.extension.getURL("TabsAside.html"),
-			active: true
-		});
-	}
-});
-
-chrome.tabs.onActivated.addListener(function (activeInfo)
-{
-	chrome.tabs.query({ url: chrome.extension.getURL("TabsAside.html") }, function (result)
-	{
-		if (result.length)
-			setTimeout(function ()
 			{
-				result.forEach(i => 
+				url: chrome.extension.getURL("TabsAside.html"),
+				active: true
+			},
+			(activeTab) =>
+				chrome.tabs.onActivated.addListener(function TabsAsideCloser(activeInfo)
 				{
-					if (activeInfo.tabId != i.id)
+					chrome.tabs.query({ url: chrome.extension.getURL("TabsAside.html") }, (result) =>
-						chrome.tabs.remove(i.id);
-				});
-			}, 200);
-	});
-});
-
-function UpdateTheme()
-{
-	if (window.matchMedia("(prefers-color-scheme: dark)").matches)
-	{
-		if (collections.length)
-			chrome.browserAction.setIcon(
-				{
-					path:
 					{
-						"128": "icons/dark/full/128.png",
+						if (result.length)
-						"48": "icons/dark/full/48.png",
+							setTimeout(() =>
-						"32": "icons/dark/full/32.png",
+							{
-						"16": "icons/dark/full/16.png"
+								result.forEach(i =>
-					}
+									{
-				});
+									if (activeInfo.tabId != i.id)
-		else
+										chrome.tabs.remove(i.id);
-			chrome.browserAction.setIcon(
+									});
-				{
+							}, 200);
-					path:
+						else chrome.tabs.onActivated.removeListener(TabsAsideCloser);
-					{
+					});
-						"128": "icons/dark/empty/128.png",
+				}));
-						"48": "icons/dark/empty/48.png",
-						"32": "icons/dark/empty/32.png",
-						"16": "icons/dark/empty/16.png"
-					}
-				});
-	}
-	else
-	{
-		if (collections.length)
-			chrome.browserAction.setIcon(
-				{
-					path:
-					{
-						"128": "icons/light/full/128.png",
-						"48": "icons/light/full/48.png",
-						"32": "icons/light/full/32.png",
-						"16": "icons/light/full/16.png"
-					}
-				});
-		else
-			chrome.browserAction.setIcon(
-				{
-					path:
-					{
-						"128": "icons/light/empty/128.png",
-						"48": "icons/light/empty/48.png",
-						"32": "icons/light/empty/32.png",
-						"16": "icons/light/empty/16.png"
-					}
-				});
 	}
 }
 
-var collections = JSON.parse(localStorage.getItem("sets"));
+function ProcessCommand (command)
-if (collections == null)
+{
-	collections = [];
+	GetTabsToSave((returnedTabs) =>
+	{
+		tabsToSave = returnedTabs;
+		switch(command)
+		{
+			case "set-aside":
+				SaveCollection();
+				break;
+			case "toggle-pane":
+				chrome.tabs.query(
+					{
+						active: true,
+						currentWindow: true
+					},
+					(tabs) => TogglePane(tabs[0])
+				)
+				break;
+		}
+	});
+}
 
-chrome.runtime.onMessage.addListener(function (message, sender, sendResponse)
+chrome.browserAction.onClicked.addListener((tab) =>
+{
+	GetTabsToSave((returnedTabs) =>
+	{
+		tabsToSave = returnedTabs;
+
+		chrome.storage.sync.get({ "setAsideOnClick": false }, values =>
+		{
+			if (values?.setAsideOnClick)
+				SaveCollection();
+			else
+				TogglePane(tab);
+		});
+	});
+});
+
+collections = { };
+thumbnails = { };
+
+/**
+ *	Updates the thumbnail storage, then the collection synced storage. Calls the onSuccess callback when successful, and onFailure when failed.
+ *	@param {Object} collectionsToUpdate An object containing one or more collections to be updated. By default, updates the whole "collections" item.
+ *	@param {function} onSuccess A function without arguments, that will be called after the collections and thumbnails values are obtained, if collections are successfully updated
+ *	@param {function} onFailure A function that will be called with the error, after the collections and thumbnails values are obtained, if collections are not successfully updated
+ */
+function UpdateStorages (collectionsToUpdate = collections, onSuccess = () => null, onFailure = (error) => { throw error.message; })
+{
+	//The collections storage is updated after the thumbnail storage, so that the thumbnails are ready when the collections are updated.
+	chrome.storage.local.set({ "thumbnails": thumbnails },
+		() => collectionStorage.set(CompressCollectionsStorage(collectionsToUpdate),
+		() =>
+		{
+			if (!chrome.runtime.lastError)
+				onSuccess();
+			else
+				onFailure(chrome.runtime.lastError);
+		})
+	);
+	//When the collection storage is updated, a listener set up below reacts and updates the collections global variable, so we do not need to update that variable here
+}
+
+/**
+ * Use a compression mechanism to compress collections in an object, one by one.
+ * @param {Object} collectionsToCompress object of collections to compress
+ * @returns {Object} Object of compressed stringified collections.
+ */
+function CompressCollectionsStorage (collectionsToCompress)
+{
+	var compressedStorage = { };
+	for (var [key, value] of Object.entries(collectionsToCompress))		//For each collection in the uncompressed collectionsToCompress
+	{
+		var cloneWithoutTimestamp = Object.assign({ }, value, { timestamp: null });
+		compressedStorage[key] = LZUTF8.compress(JSON.stringify(cloneWithoutTimestamp), { outputEncoding: "StorageBinaryString" });
+	}
+	return compressedStorage;
+}
+
+/**
+ * Load and decompresses the thumbnails and collections global variables from the storage, updates the theme and eventually sends the collections and thumbnails to a callback
+ * @param {function} callback A function that will be called after the collections and thumbnails values are obtained.
+ * These collections and thumbnails are sent as a data={"collections":collections,"thumbnails":thumbnails} argument to the callback.
+ */
+function LoadStorages (callback = () => null)
+{
+	chrome.storage.local.get("thumbnails", values =>
+	{
+		thumbnails = values?.thumbnails ?? { };
+		collectionStorage.get(null, values =>
+		{
+			collections = DecompressCollectionsStorage(values);
+			UpdateBadgeCounter();
+			callback({ "collections": collections, "thumbnails": thumbnails });
+		});
+	});
+}
+
+/**
+ * Use a decompression mechanism to decompress stringified collections in an object, one by one.
+ * Ignores non collections items (items with a key not starting with "set_"
+ * @param {Object} compressedCollections object of stringified collections to decompress
+ * @returns {Object} Object of decompressed and parsed collections.
+ */
+function DecompressCollectionsStorage (compressedCollections)
+{
+	var decompressedStorage = { };
+	for (var [key, value] of Object.entries(compressedCollections))
+	{
+		if (!key.startsWith("set_"))
+			continue;
+
+		decompressedStorage[key] = JSON.parse(LZUTF8.decompress(value, { inputEncoding: "StorageBinaryString" }));
+		decompressedStorage[key].timestamp = parseInt(key.substr(4));
+	}
+	return decompressedStorage;
+}
+
+/**
+ * Merges a provided collections array with older pre v2 collections,
+ * saving the result into the new post v2 storage, or into bookmarks on failure.
+ * Allows to preserve backward compatibility with the localStorage method of storing collections in pre v2 versions.
+ * @param {Object} collections The current collections object
+ */
+function MergePreV2Collections ()
+{
+	if (localStorage.getItem("sets"))
+	{
+		console.log("Found pre-v2 data");
+		var old_collections = JSON.parse(localStorage.getItem("sets"));
+		//Migrate thumbnails and icons to follow the new format .
+		old_collections.forEach(collection =>
+		{
+			for (var i = 0; i < collection.links.length; i++)
+				thumbnails[collection.links[i]] =
+				{
+					"pageCapture": collection.thumbnails[i],
+					"iconUrl": collection.icons[i]
+				};
+
+			delete collection.thumbnails;
+			delete collection.icons;
+
+			UpdateStorages({ ["set_" + collection.timestamp]: collection },
+				() => null,
+				() =>
+				{
+					SaveCollectionAsBookmarks(collection);
+					alert(chrome.i18n.getMessage("olderDataMigrationFailed"));
+				});
+		});
+		localStorage.removeItem("sets");
+	}
+}
+
+function SaveCollectionAsBookmarks (collection)
+{
+	//The id 1 is the browser's bookmark bar
+	chrome.bookmarks.create({
+		"parentId": "1",
+		"title": "TabsAside " + (collection.name ?? new Date(collection.timestamp).toISOString())
+	},
+	(collectionFolder) =>
+	{
+		for (var i = 0; i < collection.links.length; i++)
+			chrome.bookmarks.create(
+				{
+					"parentId": collectionFolder.id,
+					"title": collection.titles[i],
+					"url": collection.links[i]
+				});
+	});
+}
+
+LoadStorages(MergePreV2Collections);
+
+chrome.storage.onChanged.addListener((changes, namespace) =>
+{
+	if (namespace == "sync")
+		for (key in changes)
+			if (key.startsWith("set_"))
+			{
+				if (changes[key].newValue)
+				{
+					collections[key] = DecompressCollectionsStorage({ [key]: changes[key].newValue })[key];
+
+				}
+				else
+					delete collections[key];
+
+				UpdateBadgeCounter();
+				chrome.runtime.sendMessage(
+				{
+					command: "reloadCollections",
+					collections: collections,
+					thumbnails: thumbnails
+				});
+			}
+});
+
+var shortcuts;
+chrome.commands.getAll((commands) => shortcuts = commands);
+
+chrome.commands.onCommand.addListener(ProcessCommand);
+chrome.contextMenus.onClicked.addListener((info) => ProcessCommand(info.menuItemId));
+
+chrome.runtime.onInstalled.addListener((updateInfo) =>
+{
+	if (updateInfo.reason == "update" && updateInfo.previousVersion != chrome.runtime.getManifest()["version"])
+		chrome.storage.local.set({ "showUpdateBadge": true });
+
+	// Adding context menu options, must be done on extension install and update, and probably chrome update as well.
+	chrome.contextMenus.create(
+		{
+			id: "toggle-pane",
+			contexts: ["browser_action"],
+			title: chrome.i18n.getMessage("togglePaneContext")
+		}
+	);
+	chrome.contextMenus.create(
+		{
+			id: "set-aside",
+			contexts: ["browser_action"],
+			title: chrome.i18n.getMessage("setAside")
+		}
+	);
+});
+
+//We receive a message from the pane aside-script, which means the tabsToSave are already assigned on message reception.
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) =>
 {
 	switch (message.command)
 	{
@@ -123,170 +299,170 @@ chrome.runtime.onMessage.addListener(function (message, sender, sendResponse)
 			chrome.tabs.create({ url: message.url });
 			break;
 		case "loadData":
-			sendResponse(collections);
+			LoadStorages(sendResponse);		//Sends the collections as a response
-			break;
+			return true;	//Required to indicate the answer will be sent asynchronously https://developer.chrome.com/extensions/messaging
 		case "saveTabs":
 			SaveCollection();
 			break;
 		case "restoreTabs":
-			RestoreCollection(message.collectionIndex, message.removeCollection);
+			RestoreCollection(message.collectionKey, message.removeCollection);
 			sendResponse();
 			break;
 		case "deleteTabs":
-			DeleteCollection(message.collectionIndex);
+			DeleteCollection(message.collectionKey);
 			sendResponse();
 			break;
 		case "removeTab":
-			RemoveTab(message.collectionIndex, message.tabIndex);
+			RemoveTab(message.collectionKey, message.tabIndex);
 			sendResponse();
 			break;
-		case "toFavorites":
+		case "renameCollection":
-			AddTabsToFavorites(message.collectionIndex);
+			collections[message.collectionKey].name = message.newName;
+			UpdateStorages({ [message.collectionKey]: collections[message.collectionKey] });
 			break;
-		case "share":
+		case "togglePane":
-			ShareTabs(message.collectionIndex);
+			chrome.tabs.query(
+				{
+					active: true,
+					currentWindow: true
+				},
+				(tabs) => TogglePane(tabs[0])
+			);
+			break;
+		case "getShortcuts":
+			sendResponse(shortcuts);
 			break;
 	}
 });
 
-UpdateTheme();
+// This function updates the extension's toolbar icon
-chrome.windows.onCreated.addListener(UpdateTheme);
+function UpdateBadgeCounter ()
-chrome.windows.onRemoved.addListener(UpdateTheme);
-chrome.windows.onFocusChanged.addListener(UpdateTheme);
-
-chrome.tabs.onUpdated.addListener(UpdateTheme);
-chrome.tabs.onCreated.addListener(UpdateTheme);
-chrome.tabs.onMoved.addListener(UpdateTheme);
-chrome.tabs.onSelectionChanged.addListener(UpdateTheme);
-chrome.tabs.onActiveChanged.addListener(UpdateTheme);
-chrome.tabs.onActivated.addListener(UpdateTheme);
-chrome.tabs.onHighlightChanged.addListener(UpdateTheme);
-chrome.tabs.onHighlighted.addListener(UpdateTheme);
-chrome.tabs.onDetached.addListener(UpdateTheme);
-chrome.tabs.onAttached.addListener(UpdateTheme);
-chrome.tabs.onRemoved.addListener(UpdateTheme);
-chrome.tabs.onReplaced.addListener(UpdateTheme);
-
-function SaveCollection()
 {
-	chrome.tabs.query({ currentWindow: true }, function (tabs)
+	var collectionsLength = Object.keys(collections).length;
+	// Updating badge counter
+	chrome.browserAction.setBadgeText({ text: collectionsLength < 1 ? "" : collectionsLength.toString() });
+
+}
+
+// Set current tabs aside
+function SaveCollection ()
+{
+	var tabs = tabsToSave.filter(i => i.url != chrome.runtime.getURL("TabsAside.html") && !i.pinned && !i.url.includes("//newtab") && !i.url.includes("about:blank") && !i.url.includes("about:home"));
+
+	if (tabs.length < 1)
 	{
-		tabs = tabs.filter(i => !i.url.startsWith("chrome-extension") && !i.url.endsWith("TabsAside.html") && !i.pinned);
+		alert(chrome.i18n.getMessage("noTabsToSave"));
-		
+		return;
-		var collection =
+	}
+
+	var collection =
+	{
+		timestamp: Date.now(),
+		tabsCount: tabs.length,
+		titles: tabs.map(tab => (tab.title ?? "").substr(0, 100)),
+		links: tabs.map(tab => tab.url ?? "")
+	};
+
+	tabs.forEach(tab =>		//For each tab to save, Add relevant thumbnails in the thumbnails object
+	{
+		thumbnails[tab.url] =
 		{
-			timestamp: Date.now(),
+			"pageCapture": sessionCaptures[tab.url] ?? thumbnails[tab.url]?.pageCapture,
-			tabsCount: tabs.length,
+			"iconUrl": tab.favIconUrl
-			titles: tabs.map(tab => tab.title ?? ""),
-			links: tabs.map(tab => tab.url ?? ""),
-			icons: tabs.map(tab => tab.favIconUrl ?? ""),
-			thumbnails: tabs.map(tab => thumbnails.find(i => i.tabId == tab.id)?.url ?? "")
 		};
-
-		var rawData;
-		if (localStorage.getItem("sets") === null)
-			rawData = [collection];
-		else
-		{
-			rawData = JSON.parse(localStorage.getItem("sets"));
-			rawData.unshift(collection);
-		}
-
-		localStorage.setItem("sets", JSON.stringify(rawData));
-
-		collections = JSON.parse(localStorage.getItem("sets"));
-
-		chrome.tabs.create({});
-		chrome.tabs.remove(tabs.map(tab => tab.id));
 	});
 
-	UpdateTheme();
+	UpdateStorages({["set_" + collection.timestamp]: collection}, () =>
+		chrome.tabs.create({}, (tab) =>
+		{
+			var newTabId = tab.id;
+			chrome.tabs.remove(tabsToSave.filter(i => !i.pinned && i.id != newTabId).map(tab => tab.id));
+		}),
+		() => alert(chrome.i18n.getMessage("errorSavingTabs"))
+	);
 }
 
-function DeleteCollection(collectionIndex)
+function DeleteCollection (collectionKey)
 {
-	collections = collections.filter(i => i != collections[collectionIndex]);
+	var deletedUrls = collections[collectionKey].links;
-	localStorage.setItem("sets", JSON.stringify(collections));
+	delete collections[collectionKey];
-
+	ForEachUnusedUrl(deletedUrls, (url) => delete thumbnails[url]);		//We delete the thumbnails that are not used in any other collection.
-	UpdateTheme();
+	UpdateStorages({});//Updates the thumbnails storage only, by providing an empty "collectionsToUpdate" object.
+	collectionStorage.remove(collectionKey);//Remove the collection from the collectionstorage
 }
 
-function RestoreCollection(collectionIndex, removeCollection)
+function RestoreCollection (collectionKey, removeCollection)
 {
-	collections[collectionIndex].links.forEach(i => 
+	collections[collectionKey].links.forEach(i =>
 	{
 		chrome.tabs.create(
 			{
 				url: i,
 				active: false
+			},
+			(createdTab) =>
+			{
+				chrome.storage.sync.get({"loadOnRestore": true}, values =>
+				{
+					if (!(values?.loadOnRestore))
+						chrome.tabs.onUpdated.addListener(function DiscardTab (updatedTabId, changeInfo, updatedTab)
+						{
+							if (updatedTabId === createdTab.id)
+							{
+								chrome.tabs.onUpdated.removeListener(DiscardTab);
+								if (!updatedTab.active)
+								{
+									chrome.tabs.discard(updatedTabId);
+								}
+							}
+						});
+				});
 			});
 	});
 
+	//We added new tabs by restoring a collection, so we refresh the array of tabs ready to be saved.
+	GetTabsToSave((returnedTabs) =>
+		tabsToSave = returnedTabs);
+
 	if (!removeCollection)
 		return;
 
-	collections = collections.filter(i => i != collections[collectionIndex]);
+	DeleteCollection(collectionKey);
-	localStorage.setItem("sets", JSON.stringify(collections));
-
-	UpdateTheme();
 }
 
-function AddTabsToFavorites(collectionIndex)
+function RemoveTab (collectionKey, tabIndex)
 {
-	alert("Adding to favorites");
+	var set = collections[collectionKey];
-	/*for (var i = 0; i < collections[collectionIndex].links.length; i++)
-	{
-		chrome.bookmarks.create(
-			{
-				title: collections[collectionIndex].titles[i],
-				url: collections[collectionIndex].links[i],
-			});
-	}*/
-}
-
-function ShareTabs(collectionId)
-{
-	alert("Sharing");
-}
-
-function RemoveTab(collectionIndex, tabIndex)
-{
-	var set = collections[collectionIndex];
 	if (--set.tabsCount < 1)
 	{
-		collections = collections.filter(i => i != set);
+		DeleteCollection(collectionKey);
-		localStorage.setItem("sets", JSON.stringify(collections));
-
-		UpdateTheme();
 		return;
 	}
 
-	var titles = [];
+	var urlToRemove = set.links[tabIndex];
-	var links = [];
+	set.titles.splice(tabIndex, 1);
-	var icons = [];
+	set.links.splice(tabIndex, 1);
 
-	for (var i = set.links.length - 1; i >= 0; i--)
+	ForEachUnusedUrl([urlToRemove], (url) => delete thumbnails[url]);
-	{
+	UpdateStorages({[collectionKey]: set});
-		if (i == tabIndex)
-			continue;
-
-		titles.unshift(set.titles[i]);
-		links.unshift(set.links[i]);
-		icons.unshift(set.icons[i]);
-	}
-
-	set.titles = titles;
-	set.links = links;
-	set.icons = icons;
-
-	localStorage.setItem("sets", JSON.stringify(collections));
-
-	UpdateTheme();
 }
 
-var thumbnails = [];
+/**
+ * Execute a callback for each url in urlsToFilter that is not in any collection urls
+ * @param {Array} urlsToFilter array of urls to check
+ * @param {function} callback callback to execute on an url
+ */
+function ForEachUnusedUrl (urlsToFilter, callback)
+{
+	for (var i = 0; i < urlsToFilter.length; i++)		// If the url of the tab n°i is not present among all the collections, we call the callback on it
+		if (!Object.values(collections).some(collection => collection.links.some(link => link == urlsToFilter[i])))
+			callback(urlsToFilter[i]);
+}
 
-function AppendThumbnail(tabId, cahngeInfo, tab)
+// page Captures are not always used in a collection, so we keep them in a specific variable until a collection is saved.
+var sessionCaptures = { };
+
+function AppendThumbnail (tab)
 {
 	if (!tab.active || !tab.url.startsWith("http"))
 		return;
@@ -296,27 +472,22 @@ function AppendThumbnail(tabId, cahngeInfo, tab)
 			format: "jpeg",
 			quality: 1
 		},
-		function (dataUrl)
+		(image) =>
 		{
-			if(!dataUrl)
+			if (!image)
 			{
 				console.log("Failed to retrieve thumbnail");
 				return;
 			}
 
 			console.log("Thumbnail retrieved");
-			var item = thumbnails.find(i => i.tabId == tabId);
+			sessionCaptures[tab.url] = image;
-			if (item)
-				item.url = dataUrl;
-			else
-				thumbnails.unshift(
-					{
-						tabId: tabId,
-						url: dataUrl
-					}
-				);
 		}
 	);
 }
 
-chrome.tabs.onUpdated.addListener(AppendThumbnail);
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) =>
+{
+	if (changeInfo.status == "complete")
+		AppendThumbnail(tab);
+});

manifest.json

@@ -1,29 +1,67 @@
 {
-	"name": "Tabs Aside",
+	"name": "__MSG_name__",
-	"version": "1.2.2",
+	"version": "2.0.2",
 	"manifest_version": 2,
-	"description": "Classic Microsoft Edge \"Tabs Aside\" feature for Chromium browsers",
+	"description": "__MSG_description__",
-	"author": "Michael \"XFox\" Gordeev",
+	"author": "__MSG_author__",
-	"permissions": 
+	"default_locale": "en",
+
+	"permissions":
 	[
 		"tabs",
+		"bookmarks",
 		"unlimitedStorage",
-		"<all_urls>"
+		"storage",
+		"<all_urls>",
+		"contextMenus"
 	],
-	
+
-	"icons": 
+	"icons":
 	{
-		"128": "icons/light/empty/128.png",
+		"128": "icons/icon-128.png",
-		"48": "icons/light/empty/48.png",
+		"48": "icons/icon-48.png",
-		"32": "icons/light/empty/32.png",
+		"32": "icons/icon-32.png",
-		"16": "icons/light/empty/16.png"
+		"16": "icons/icon-16.png"
+	},
+	"browser_action":
+	{
+		"default_icon": "icons/icon-32.png"
 	},
-	"browser_action": { "default_icon": "icons/light/empty/32.png" },
 	"web_accessible_resources": [ "*" ],
 
 	"background":
 	{
-		"scripts": [ "js/background.js" ],
+		"scripts": [ "js/lib/lzutf8.min.js","js/background.js" ],
-		"persistent": true
+		"persistent": false
+	},
+
+	"commands":
+	{
+		"set-aside":
+		{
+			"description": "__MSG_setAside__",
+			"suggested_key":
+			{
+				"default": "Alt+Left",
+				"mac": "MacCtrl+T"
+			}
+		},
+		"toggle-pane":
+		{
+			"description": "__MSG_togglePaneContext__",
+			"suggested_key":
+			{
+				"default": "Alt+P",
+				"mac": "Command+Shift+P"
+			}
+		}
+	},
+	"browser_specific_settings":
+	{
+		"gecko":
+		{
+			"id": "tabsaside@xfox111.net",
+			"strict_min_version": "58.0"
+		}
 	}
-}
+}