moved the QuerySelector functionality out of browser as many librarie…

…s sniff for the functionality.
jsdom · Dec 29, 2010 · e2f13f5 · e2f13f5
1 parent 8d27b57
commit e2f13f5
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 47 deletions.
diff --git a/lib/jsdom.js b/lib/jsdom.js
@@ -16,13 +16,19 @@ exports.__defineGetter__('version', function() {
 
 exports.jsdom = function (html, level, options) {
   options = options || {};
+  level   = level || exports.defaultLevel;
+
   if (!options.url) {
     options.url = module.parent.id == 'jsdom' ?
       module.parent.parent.filename :
       module.parent.filename;
   }
 
-  var browser = exports.browserAugmentation(level || exports.defaultLevel, options),
+  if (options.features && options.features.QuerySelector) {
+    require("./jsdom/selectors/index").applyQuerySelectorPrototype(level);
+  }
+
+  var browser = exports.browserAugmentation(level, options),
       doc     = (browser.HTMLDocument)             ?
                  new browser.HTMLDocument(options) :
                  new browser.Document(options);
@@ -57,7 +63,7 @@ exports.availableDocumentFeatures = [
 exports.defaultDocumentFeatures = {
   "FetchExternalResources"   : ['script'/*, 'img', 'css', 'frame', 'link'*/],
   "ProcessExternalResources" : ['script'/*, 'frame', 'iframe'*/],
-  "QuerySelector"            : [/*1.0, 2.0*/]
+  "QuerySelector"            : false
 };
 
 exports.applyDocumentFeatures = function(doc, features) {

diff --git a/lib/jsdom/browser/index.js b/lib/jsdom/browser/index.js
@@ -24,10 +24,17 @@ exports.windowAugmentation = function(dom, options) {
 
   if (!options.document) {
     var browser = browserAugmentation(dom, options);
+
+    if (options.features && options.features.QuerySelector) {
+      require(__dirname + "/../selectors/index").applyQuerySelectorPrototype(browser);
+    }
+
     options.document = (browser.HTMLDocument)             ?
                         new browser.HTMLDocument(options) :
                         new browser.Document(options);
 
+
+
     options.document.write('<html><head></head><body></body></html>');
   }
 
@@ -234,44 +241,6 @@ var browserAugmentation = exports.browserAugmentation = function(dom, options) {
     return new dom.NodeList(this.ownerDocument || this, dom.mapper(this, filterByClassName));
   };
 
-  var Sizzle = require("../selectors").Sizzle;
-
-  dom.Document.prototype.querySelector = function(selector) {
-    if (this.implementation.hasFeature("QuerySelector", "1.0")) {
-      return Sizzle(selector, this)[0];
-    }
-  };
-
-  dom.Document.prototype.querySelectorAll = function(selector) {
-    if (this.implementation.hasFeature("QuerySelector", "1.0")) {
-      var self = this;
-      return new dom.NodeList(self, function() {
-        return Sizzle(selector, self);
-      });
-    }
-    return [];
-  };
-
-  dom.Element.prototype.querySelector = function(selector) {
-    if (this.ownerDocument &&
-        this.ownerDocument.implementation.hasFeature("QuerySelector", "1.0"))
-    {
-      return Sizzle(selector, this)[0];
-    }
-  };
-
-  dom.Element.prototype.querySelectorAll = function(selector) {
-    if (this.ownerDocument &&
-        this.ownerDocument.implementation.hasFeature("QuerySelector", "1.0"))
-    {
-      var self = this;
-      return new dom.NodeList(self.ownerDocument, function() {
-        return Sizzle(selector, self);
-      });
-    }
-    return [];
-  };
-
   dom.Element.prototype.__defineGetter__('sourceIndex', function() {
     /*
     * According to QuirksMode:

diff --git a/lib/jsdom/level2/html.js b/lib/jsdom/level2/html.js
@@ -68,9 +68,9 @@ core.resourceLoader = {
     return URL.resolve(baseUrl, path).replace(/^file:\/\//, '');
   },
   download: function(url, callback) {
-    var path = url.pathname + (url.search || ''),
-      client = http.createClient(url.port || 80, url.hostname),
-      request = client.request('GET', path, {'host': url.hostname });
+    var path    = url.pathname + (url.search || ''),
+        client  = http.createClient(url.port || 80, url.hostname),
+        request = client.request('GET', path, {'host': url.hostname });
 
     request.on('response', function (response) {
       response.setEncoding('utf8');
@@ -79,7 +79,12 @@ core.resourceLoader = {
         data += chunk.toString();
       });
       response.on('end', function() {
-        callback(null, data);
+        if ([301, 302, 303, 307].indexOf(response.statusCode) > -1) {
+          var redirect = URL.resolve(url, response.headers["location"])
+          core.resourceLoader.download(redirect, callback);
+        } else {
+          callback(null, data);
+        }
       });
     });
     request.end();

diff --git a/lib/jsdom/selectors/index.js b/lib/jsdom/selectors/index.js
@@ -1 +1,24 @@
-exports.Sizzle = require("./sizzle").Sizzle;
+var Sizzle = require("./sizzle").Sizzle;
+exports.applyQuerySelectorPrototype = function(dom) {
+  dom.Document.prototype.querySelector = function(selector) {
+    return Sizzle(selector, this)[0];
+  };
+
+  dom.Document.prototype.querySelectorAll = function(selector) {
+    var self = this;
+    return new dom.NodeList(self, function() {
+      return Sizzle(selector, self);
+    });
+  };
+
+  dom.Element.prototype.querySelector = function(selector) {
+    return Sizzle(selector, this)[0];
+  };
+
+  dom.Element.prototype.querySelectorAll = function(selector) {
+    var self = this;
+    return new dom.NodeList(self.ownerDocument, function() {
+      return Sizzle(selector, self);
+    });
+  };
+};
diff --git a/test/jsdom/index.js b/test/jsdom/index.js
@@ -148,7 +148,7 @@ exports.tests = {
     var html     = '<html><body><div id="main"><p>Foo</p><p>Bar</p></div></body></html>',
         document = jsdom.jsdom(html, null, {
           features : {
-            'QuerySelector' : ['1.0']
+            'QuerySelector' : true
           }
         }),
         div      = document.body.children.item(0);
@@ -165,7 +165,7 @@ exports.tests = {
     var html     = '<html><body><div id="main"><p>Foo</p><p>Bar</p></div></body></html>',
         document = jsdom.jsdom(html, null, {
           features : {
-            'QuerySelector' : ['1.0']
+            'QuerySelector' : true
           }
         }),
         div      = document.body.children.item(0),