[Pkg-mozext-commits] [nosquint] 17/47: Import of 2.0.3b1 release into git

[David Prévot]

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 dc5d951f39de1749cfcf596ef19b0244fa4b5a0e
Author: Jason Tackaberry <tack at urandom.ca>
Date:   Fri Jan 13 19:41:13 2012 -0500

    Import of 2.0.3b1 release into git
---
 src/content/interfaces.js | 10 +++++++++-
 src/content/lib.js        |  1 +
 src/install.rdf           |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/content/interfaces.js b/src/content/interfaces.js
index d6ed632..3e93c57 100644
--- a/src/content/interfaces.js
+++ b/src/content/interfaces.js
@@ -87,9 +87,17 @@ NoSquint.interfaces = NoSquint.ns(function() { with (NoSquint) {
             var contentType = this.browser.docShell.document.contentType;
             if (this.contentType != contentType) {
                 this.contentType = contentType;
+                var userData = this.browser.getUserData('nosquint');
                 if (isChrome(this.browser)) {
-                    this.browser.getUserData('nosquint').site = null;
+                    // Content type is changed and it's now chrome.  Unzoom (or
+                    // zoom to 100%)
+                    userData.site = null;
                     NSQ.browser.zoom(this.browser, 100, 100);
+                } else if (userData.site === null) {
+                    // Was considered chrome, but now isn't.  Rezoom/style.
+                    delete userData.site;
+                    NSQ.browser.zoom(this.browser);
+                    this.styleApplied = NSQ.browser.style(this.browser);
                 }
             } else if (state & stateFlag) {
                 if (!this.zoomApplied) {
diff --git a/src/content/lib.js b/src/content/lib.js
index 1163140..0b2e448 100644
--- a/src/content/lib.js
+++ b/src/content/lib.js
@@ -106,6 +106,7 @@
     this.isChrome = function(browser) {
         var document = browser.docShell.document;
         
+        //this.debug('isChrome(): URL=' + document.URL + ', spec=' + browser.currentURI.spec + ', contentType=' + document.contentType);
         if (document.URL == undefined)
             return true;
 
diff --git a/src/install.rdf b/src/install.rdf
index 398dbf8..833d27d 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
     
         <em:id>nosquint at urandom.ca</em:id>
         <em:name>NoSquint</em:name>
-        <em:version>2.0.2</em:version>
+        <em:version>2.0.3b1</em:version>
         <em:description>Manage site-specific zoom levels and color settings</em:description>
         <em:creator>Jason Tackaberry</em:creator>
         <!-- optional items -->

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nosquint.git