[Pkg-mozext-commits] [nosquint] 09/47: Import of 1.93.1 release into git
David Prévot
taffit at moszumanska.debian.org
Tue Apr 28 01:41:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag 2.1.6
in repository nosquint.
commit 6a50ce2aa6bb8edc399538dacf8811b1b0183f7e
Author: Jason Tackaberry <tack at urandom.ca>
Date: Fri Jan 13 19:41:13 2012 -0500
Import of 1.93.1 release into git
---
src/content/nosquint.js | 16 +++++++++-------
src/install.rdf | 4 ++--
src/locale/en-US/help.html | 3 +--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/content/nosquint.js b/src/content/nosquint.js
index 49d2e9a..d7eea21 100644
--- a/src/content/nosquint.js
+++ b/src/content/nosquint.js
@@ -350,11 +350,10 @@ var NoSquint = {
var increment = NoSquint.zoomIncrement * (event.detail < 0 ? 1 : -1);
if (NoSquint.fullZoomPrimary && !event.shiftKey || !NoSquint.fullZoomPrimary && event.shiftKey)
- full = (browser.markupDocumentViewer.fullZoom * 100) + increment;
+ full = Math.round((browser.markupDocumentViewer.fullZoom * 100) + increment);
else
- text = (browser.markupDocumentViewer.textZoom * 100) + increment;
+ text = Math.round((browser.markupDocumentViewer.textZoom * 100) + increment);
- var current = Math.round(browser.markupDocumentViewer.textZoom * 100);
NoSquint.zoom(browser, text, full);
NoSquint.saveCurrentZoom();
@@ -422,11 +421,13 @@ var NoSquint = {
},
- /* Takes an array of exceptions
+ /* Takes an array of exceptions as stored in prefs, and returns a sorted
+ * list, where each exception is converted to a regexp grammar. The list
+ * is sorted such that exceptions with the most literal (non-wildcard)
+ * characters are first.
*/
processExceptions: function(exlist) {
- /* My eyes! The googles do nothing!
- * This hideous function takes an exception, with our custom
+ /* This ugly function takes an exception, with our custom
* grammar, and converts it to a regular expression that we can
* match later. Hostname and path components are processed in
* separate calls; re_star and re_dblstar define the regexp syntax
@@ -654,7 +655,8 @@ var NoSquint = {
},
/* Queues a zoomAll. Useful when we might otherwise call zoomAll()
- * multiple times.
+ * multiple times, such as in the case of multiple preferences being
+ * updated at once.
*/
queueZoomAll: function() {
if (!NoSquint.zoomAllTimer)
diff --git a/src/install.rdf b/src/install.rdf
index 3633bcc..2638f30 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:id>nosquint at urandom.ca</em:id>
<em:name>No Squint</em:name>
- <em:version>1.93.0</em:version>
+ <em:version>1.93.1</em:version>
<em:description>Manage site-specific full page and text zoom levels</em:description>
<em:creator>Jason Tackaberry</em:creator>
<!-- optional items -->
@@ -20,7 +20,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0b4pre</em:minVersion>
- <em:maxVersion>3.0b4</em:maxVersion>
+ <em:maxVersion>3.0b5pre</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
diff --git a/src/locale/en-US/help.html b/src/locale/en-US/help.html
index e9a70d1..bbc6660 100644
--- a/src/locale/en-US/help.html
+++ b/src/locale/en-US/help.html
@@ -282,7 +282,6 @@ For example, for <code>www.google.com</code>, a single <code>*</code> matches
that matches the most non-wildcard characters in the host name. If there are
still multiple exceptions in that narrowed list, the exception that matches the
most non-wildcard characters in the path is then chosen. If still there are
-multiple exceptions, the last one is chosen.</p>
-
+multiple exceptions, the first one that matched is chosen.</p>
</body>
</html>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nosquint.git
More information about the Pkg-mozext-commits
mailing list