[Pkg-mozext-commits] [stylish] 01/01: Imported Upstream version 1.4.3
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sun Jun 15 09:44:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch upstream
in repository stylish.
commit a1327ae (upstream)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sun Jun 15 08:56:00 2014
Imported Upstream version 1.4.3
---
chrome.manifest | 8 ++++++++
components/stylishDataSource.js | 27 +++++++++++++++++++++++----
content/edit.js | 6 +++++-
content/overlay-fx4.xul | 4 ++--
content/overlay.js | 6 +++---
install.rdf | 26 +++++++++++++++++++++-----
skin/overlay.css | 27 +++++++++++++++------------
7 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 3579f8c..45745d6 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -69,16 +69,24 @@ style chrome://stylish/content/manage-standalone.xul?sidebar chrome://stylish/sk
style about:addons chrome://stylish/skin/manage-addons-fx6.css application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>=6.0a1
style about:addons chrome://stylish/skin/manage-addons-fx6.css application={3550f703-e582-4d05-9a08-453d09bdfdc6} appversion>=6.0a1
style about:addons chrome://stylish/skin/manage-addons-fx6.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion>=2.3
+style about:addons chrome://stylish/skin/manage-addons-fx6.css application={36E66FA0-F259-11D9-850E-000D935D3368}
+style about:addons chrome://stylish/skin/manage-addons-fx6.css application={b1042fb5-9e9c-11db-b107-000d935d3368}
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx6.css application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>=6.0a1
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx6.css application={3550f703-e582-4d05-9a08-453d09bdfdc6} appversion>=6.0a1
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx6.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion>=2.3
+style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx6.css application={36E66FA0-F259-11D9-850E-000D935D3368}
+style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx6.css application={b1042fb5-9e9c-11db-b107-000d935d3368}
style about:addons chrome://stylish/skin/manage-addons-fx11.css application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>=11
style about:addons chrome://stylish/skin/manage-addons-fx11.css application={3550f703-e582-4d05-9a08-453d09bdfdc6} appversion>=11
style about:addons chrome://stylish/skin/manage-addons-fx11.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion>=2.8
+style about:addons chrome://stylish/skin/manage-addons-fx11.css application={36E66FA0-F259-11D9-850E-000D935D3368}
+style about:addons chrome://stylish/skin/manage-addons-fx11.css application={b1042fb5-9e9c-11db-b107-000d935d3368}
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx11.css application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>=11
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx11.css application={3550f703-e582-4d05-9a08-453d09bdfdc6} appversion>=11
style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx11.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion>=2.8
+style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx11.css application={36E66FA0-F259-11D9-850E-000D935D3368}
+style chrome://mozapps/content/extensions/extensions.xul chrome://stylish/skin/manage-addons-fx11.css application={b1042fb5-9e9c-11db-b107-000d935d3368}
# fennec
override chrome://stylish/content/overlay-fx4.xul chrome://stylish/content/overlay-mobile.xul application={aa3c5121-dab2-40e2-81ca-7ea25febc110}
diff --git a/components/stylishDataSource.js b/components/stylishDataSource.js
index 283976b..47f5714 100644
--- a/components/stylishDataSource.js
+++ b/components/stylishDataSource.js
@@ -68,7 +68,7 @@ StylishDataSource.prototype = {
_file: null,
migrate: function(connection) {
- var expectedDataVersion = 6;
+ var expectedDataVersion = 7;
var currentDataVersion = connection.schemaVersion;
if (currentDataVersion >= expectedDataVersion)
return;
@@ -83,21 +83,40 @@ StylishDataSource.prototype = {
connection.executeSimpleSQL("ALTER TABLE styles ADD COLUMN originalCode TEXT NULL;");
} catch (ex) {
// this can happen if the user downgrades to a version with schema 1 then upgrades. they will then already have the column.
+ Components.utils.reportError("Error on migrate version 1 - " + ex);
}
case 2:
try {
connection.executeSimpleSQL("ALTER TABLE styles ADD COLUMN idUrl TEXT NULL; UPDATE styles SET idUrl = url;");
- } catch (ex) {}
+ } catch (ex) {
+ Components.utils.reportError("Error on migrate version 2 - " + ex);
+ }
case 3:
+ try {
connection.executeSimpleSQL("UPDATE styles SET md5Url = REPLACE(md5Url, 'http://userstyles.org/styles/', 'http://update.userstyles.org/') WHERE md5Url LIKE 'http://userstyles.org/styles/%.md5';");
+ } catch (ex) {
+ Components.utils.reportError("Error on migrate version 3 - " + ex);
+ }
case 4:
try {
connection.executeSimpleSQL("ALTER TABLE styles ADD COLUMN applyBackgroundUpdates INTEGER NOT NULL DEFAULT 1;"); // 1 = AddonManager.AUTOUPDATE_DEFAULT
- } catch (ex) {}
+ } catch (ex) {
+ Components.utils.reportError("Error on migrate version 4 - " + ex);
+ }
case 5:
try {
connection.executeSimpleSQL("ALTER TABLE styles ADD COLUMN originalMd5 TEXT NULL;");
- } catch (ex) {}
+ } catch (ex) {
+ Components.utils.reportError("Error on migrate version 5 - " + ex);
+ }
+ case 6:
+ try {
+ connection.executeSimpleSQL("UPDATE styles SET url = REPLACE(url, 'http://userstyles.org/', 'https://userstyles.org/') WHERE url LIKE 'http://userstyles.org/%';");
+ connection.executeSimpleSQL("UPDATE styles SET updateUrl = REPLACE(updateUrl, 'http://userstyles.org/', 'https://userstyles.org/') WHERE updateUrl LIKE 'http://userstyles.org/%';");
+ connection.executeSimpleSQL("UPDATE styles SET md5Url = REPLACE(md5Url, 'http://update.userstyles.org/', 'https://update.userstyles.org/') WHERE md5Url LIKE 'http://update.userstyles.org/%';");
+ } catch (ex) {
+ Components.utils.reportError("Error on migrate version 6 - " + ex);
+ }
}
connection.schemaVersion = expectedDataVersion;
connection.commitTransaction();
diff --git a/content/edit.js b/content/edit.js
index a570d42..afab3f5 100644
--- a/content/edit.js
+++ b/content/edit.js
@@ -164,7 +164,11 @@ function init2() {
wrapLinesE.checked = wrapLines;
wrapLinesE.style.display = "";
}
- if (sourceEditorType == "sourceeditor") {
+ var autocompleteEnabled = false;
+ try {
+ autocompleteEnabled = Services.prefs.getBoolPref("devtools.styleeditor.autocompletion-enabled");
+ } catch (ex) {}
+ if (sourceEditorType == "sourceeditor" && autocompleteEnabled) {
// Up to Firefox 28, sometimes "require" will return an object when something is not available instead of throwing.
// Rather than trying to detect if autocompleter is available, let's just try to use it.
try {
diff --git a/content/overlay-fx4.xul b/content/overlay-fx4.xul
index 65ce1f5..2d5123f 100644
--- a/content/overlay-fx4.xul
+++ b/content/overlay-fx4.xul
@@ -69,11 +69,11 @@
</popupset>
<toolbarpalette id="BrowserToolbarPalette">
- <toolbarbutton id="stylish-toolbar-button" label="&stylish;" orient="horizontal" popup="stylish-popup" tooltip="stylish-tooltip" onclick="stylishOverlay.handleStatusClick(event)" class="toolbarbutton-1" type="menu"/>
+ <toolbarbutton id="stylish-toolbar-button" label="&stylish;" popup="stylish-popup" tooltip="stylish-tooltip" onclick="stylishOverlay.handleStatusClick(event)" class="toolbarbutton-1" type="menu"/>
</toolbarpalette>
<toolbarpalette id="MailToolbarPalette">
- <toolbarbutton id="stylish-toolbar-button" label="&stylish;" orient="horizontal" popup="stylish-popup" tooltip="stylish-tooltip" onclick="stylishOverlay.handleStatusClick(event)" class="toolbarbutton-1" type="menu"/>
+ <toolbarbutton id="stylish-toolbar-button" label="&stylish;" popup="stylish-popup" tooltip="stylish-tooltip" onclick="stylishOverlay.handleStatusClick(event)" class="toolbarbutton-1" type="menu"/>
</toolbarpalette>
<broadcasterset id="mainBroadcasterSet">
diff --git a/content/overlay.js b/content/overlay.js
index 178bddf..1ac109d 100644
--- a/content/overlay.js
+++ b/content/overlay.js
@@ -5,7 +5,7 @@ var stylishOverlay = {
//cached number of global styles
globalCount: null,
- uiElementIds: ["stylish-panel", "stylish-toolbar-button"],
+ uiElementIds: ["stylish-toolbar-button"],
init: function() {
stylishOverlay.STRINGS = document.getElementById("stylish-strings");
@@ -30,7 +30,7 @@ var stylishOverlay = {
try {
BrowserToolboxCustomizeDone(true);
} catch (e) {
- Comonpents.utils.reportError(e);
+ Components.utils.reportError(e);
}
}
prefService.setIntPref("extensions.stylish.firstRun", 3);
@@ -412,7 +412,7 @@ var stylishOverlay = {
handleStatusClick: function(event) {
//open manage styles on middle click
- if ((event.target.id == "stylish-panel" || event.target.id == "stylish-toolbar-button") && event.button == 1) {
+ if (event.target.id == "stylish-toolbar-button" && event.button == 1) {
stylishOverlay.openManage();
}
}
diff --git a/install.rdf b/install.rdf
index 938b629..6b614f9 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<Description rdf:about="urn:mozilla:install-manifest">
<em:id>{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}</em:id>
<em:name>Stylish</em:name>
- <em:version>1.4.1</em:version>
+ <em:version>1.4.3</em:version>
<em:creator>Jason Barnabe</em:creator>
<em:homepageURL>http://userstyles.org/</em:homepageURL>
<em:iconURL>chrome://stylish/skin/32.png</em:iconURL>
@@ -60,7 +60,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>4.0</em:minVersion>
- <em:maxVersion>30.0</em:maxVersion>
+ <em:maxVersion>32.0</em:maxVersion>
</Description>
</em:targetApplication>
<!--Thunderbird-->
@@ -68,7 +68,7 @@
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>5.0</em:minVersion>
- <em:maxVersion>30.0</em:maxVersion>
+ <em:maxVersion>32.0</em:maxVersion>
</Description>
</em:targetApplication>
<!--SeaMonkey-->
@@ -76,7 +76,7 @@
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>2.1</em:minVersion>
- <em:maxVersion>2.27</em:maxVersion>
+ <em:maxVersion>2.29</em:maxVersion>
</Description>
</em:targetApplication>
<!--Toolkit-->
@@ -108,7 +108,23 @@
<Description>
<em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
<em:minVersion>14.0</em:minVersion>
- <em:maxVersion>30.0</em:maxVersion>
+ <em:maxVersion>32.0</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <!-- Komodo IDE -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{36E66FA0-F259-11D9-850E-000D935D3368}</em:id>
+ <em:minVersion>7.*</em:minVersion>
+ <em:maxVersion>8.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <!-- Komodo Edit -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{b1042fb5-9e9c-11db-b107-000d935d3368}</em:id>
+ <em:minVersion>7.*</em:minVersion>
+ <em:maxVersion>8.*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
diff --git a/skin/overlay.css b/skin/overlay.css
index d09af5e..323c0f6 100644
--- a/skin/overlay.css
+++ b/skin/overlay.css
@@ -1,25 +1,28 @@
+/* Pre-Firefox 29 sizes - 16 for small, 24 for large */
#stylish-toolbar-button {
- list-style-image: url("chrome://stylish/skin/24w.png");
-}
-toolbar[iconsize="small"] #stylish-toolbar-button {
- list-style-image: url("chrome://stylish/skin/16w.png");
-}
-
-#stylish-toolbar-button[styles-applied~="site"] {
list-style-image: url("chrome://stylish/skin/24.png");
}
-toolbar[iconsize="small"] #stylish-toolbar-button[styles-applied~="site"] {
+toolbar[iconsize="small"] #stylish-toolbar-button {
list-style-image: url("chrome://stylish/skin/16.png");
}
-#stylish-panel {
+#stylish-toolbar-button:not([styles-applied~="site"]) {
+ list-style-image: url("chrome://stylish/skin/24w.png");
+}
+toolbar[iconsize="small"] #stylish-toolbar-button:not([styles-applied~="site"]) {
list-style-image: url("chrome://stylish/skin/16w.png");
}
-#stylish-panel[styles-applied~="site"] {
- list-style-image: url("chrome://stylish/skin/16.png");
+
+/* Firefox 29+ sizes - 16 on the toolbar, 32 elsewhere */
+#stylish-toolbar-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #stylish-toolbar-button {
+ list-style-image: url("chrome://stylish/skin/32.png");
}
/* Things that don't make sense in a non-browser */
-#messengerWindow #stylish-find-styles, #messengerWindow #stylish-write-style-menu, #messengerWindow #stylish-panel {
+#messengerWindow #stylish-find-styles, #messengerWindow #stylish-write-style-menu {
+ display: none;
+}
+
+#stylish-toolbar-button .toolbarbutton-menu-dropmarker {
display: none;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/stylish.git
More information about the Pkg-mozext-commits
mailing list