Merge branch 'develop'

Changelog.md

@@ -1,3 +1,14 @@
+# 0.5.0
+
+## Bug fixes
+
+* Use the inverted toolbar icon if needed on high resolutions.
+
+## Refactorings
+
+* Use the default favicon instead of no favicon at all. (PR [35](https://github.com/denschub/firefox-tabgroups/pull/35))
+* Removed the Panorama migration to avoid breakage in Firefox 52
+
 # 0.4.0
 
 ## Features

README.md

@@ -5,33 +5,12 @@ This project aims to provide a simple add-on to replace some functionalities
 from TabView/Tab Groups/Panorama which were removed from Firefox due to a lot
 of open bugs and a very low overall usage.
 
-As this add-on is built to replace the features removed from the Firefox core,
-it is supported in Firefox 45 or later. It may work in older versions, but be
-careful.
-
 Installation
 ------------
 
 The add-on is available at [addons.mozilla.org][amo] and should be installed
 there to ensure the add-on stays updated.
 
-Compatibility with old Tab Groups/Panorama
-------------------------------------------
-
-This extension was built to replace the functionalities, not to work together
-with it. While this project is able to read the data created by the old
-built-in functionalities, groups managed by this extension will not work in
-panorama. That is, mainly, because Panorama requires additional data (like the
-groups position and size on the virtual board) which we do not save.
-
-*Please do not open Panorama* if you use this extension and Panorama is not yet
-removed from Firefox. If you have opened Panorama, you have to restart your
-browser to make this add-on work again since Panorama registers some event
-listeners that conflict with our code. Unfortunately, this also seems to happen
-after some minutes/hours of using Firefox without opening Panorama. There is
-nothing this project can do against it registering its event handlers so it's
-probably best to wait for Panoramas removal...
-
 Warning
 -------
 

src/bootstrap.js

@@ -12,7 +12,4 @@ const COMMONJS_URI = "resource://gre/modules/commonjs";
 const { require } = Cu.import(COMMONJS_URI + "/toolkit/require.js", {});
 const { Bootstrap } = require(COMMONJS_URI + "/sdk/addon/bootstrap.js");
 
-const { MigrationOverride } = require(rootURI + "lib/migrationoverride");
-MigrationOverride();
-
 var { startup, shutdown, install, uninstall } = new Bootstrap(rootURI);

src/data/assets/css/groupspanel.css

@@ -87,6 +87,18 @@ ul, li {
   margin-left: 4px;
 }
 
+.tab-icon:-moz-broken {
+  background: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  background-size: contain;
+  display: inline-block;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .tab-icon:-moz-broken {
+    background-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
 .expanded .group-title {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
   padding-bottom: 5px;

src/data/components/tab.js

@@ -7,14 +7,11 @@ const Tab = React.createClass({
   },
 
   render: function() {
-    let favicon;
-    if (this.props.tab.icon) {
-      favicon = React.DOM.img({
-        alt: "",
-        className: "tab-icon",
-        src: this.props.tab.icon
-      });
-    }
+    let favicon = React.DOM.img({
+      alt: "",
+      className: "tab-icon",
+      src: this.props.tab.icon
+    });
 
     let tabClasses = classNames({
       active: this.props.tab.active,

src/data/vendor/css/font-awesome.css

@@ -50,3 +50,4 @@
 .fa-minus:before { content: "\f068"; }
 .fa-chevron-up:before { content: "\f077"; }
 .fa-chevron-down:before { content: "\f078"; }
+.fa-undo:before { content: "\f079"; }

src/index.js

@@ -57,14 +57,16 @@ TabGroups.prototype = {
 
   createPanelButton: function() {
     let iconBase = "chrome://simplified-tabgroups/content/icons/togglebutton/";
+    let toolBarButton = Utils.themeSwitch({
+      dark: iconBase + "icon-inverted-32.png",
+      light: iconBase + "icon-32.png"
+    });
+
     this._panelButton = ToggleButton({
       id: "tabgroups-show",
       icon: {
-        "16": Utils.themeSwitch({
-          dark: iconBase + "icon-inverted-32.png",
-          light: iconBase + "icon-32.png"
-        }),
-        "32": iconBase + "icon-32.png",
+        "16": toolBarButton,
+        "32": toolBarButton,
         "64": iconBase + "icon-64.png"
       },
       label: _("panelButton_label")

src/install.rdf

@@ -4,7 +4,7 @@
     <em:id>tabgroups@schub.io</em:id>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
-    <em:version>0.4.0</em:version>
+    <em:version>0.5.0</em:version>
     <em:optionsURL>data:text/xml,&lt;placeholder/&gt;</em:optionsURL>
     <em:optionsType>2</em:optionsType>
 

src/package.json

@@ -1,7 +1,7 @@
 {
   "id": "tabgroups@schub.io",
   "name": "tabgroups",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "title": "Simplified Tab Groups",
   "description": "An add-on to replace the removed TabView/TabGroups/Panorama.",
   "author": "Dennis Schubert <mozilla@dennis-schubert.de>",