Merge branch 'master' of https://github.com/idflood/vogue into idfloo…

…d-master
sequoiar · Sep 8, 2011 · f9ceabb · f9ceabb
2 parents c308b60 + 25f8328
commit f9ceabb
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/client/vogue-client.js b/src/client/vogue-client.js
@@ -119,30 +119,34 @@
       // Go through all the links in the page, looking for stylesheets.
       for (i = 0, m = links.length; i < m; i += 1) {
         link = links[i];
-        if (isLocalStylesheet(link)) {
-          // Link is local, get the base URL.
-          href = getBase(link.href);
-          if (href !== false) {
-            stylesheets[href] = link;
+        if (link.getAttribute("media") != "print") {
+          if (isLocalStylesheet(link)) {
+            // Link is local, get the base URL.
+            href = getBase(link.href);
+            if (href !== false) {
+              stylesheets[href] = link;
+            }
           }
         }
       }
 
       // Go through all the style tags, looking for @import tags.
       links = document.getElementsByTagName("style");
       for (i = 0, m = links.length; i < m; i += 1) {
-        content = links[i].text || links[i].textContent;
-        while ((matches = reImport.exec(content))) {
-          link = {
-            rel: "stylesheet",
-            href: matches[1],
-            getAttribute: getProperty
-          };
-          if (isLocalStylesheet(link)) {
-            // Link is local, get the base URL.
-            href = getBase(link.href);
-            if (href !== false) {
-              stylesheets[href] = link;
+        if (links[i].getAttribute("media") != "print") {
+          content = links[i].text || links[i].textContent;
+          while ((matches = reImport.exec(content))) {
+            link = {
+              rel: "stylesheet",
+              href: matches[1],
+              getAttribute: getProperty
+            };
+            if (isLocalStylesheet(link)) {
+              // Link is local, get the base URL.
+              href = getBase(link.href);
+              if (href !== false) {
+                stylesheets[href] = link;
+              }
             }
           }
         }