Support content type parameters.

Thanks to Caleb James DeLisle.

Support content type parameters.
Thanks to Caleb James DeLisle.
90a54b2f · Romain Courteaud · 1da1d7bb · 90a54b2f · 90a54b2f
Commit 90a54b2f authored Aug 06, 2013 by Romain Courteaud 🐸
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 2 deletions

renderjs.js renderjs.js +3 -2

test/renderjs_test.js test/renderjs_test.js +31 -0

No files found.
--- a/renderjs.js
+++ b/renderjs.js
@@ -615,8 +615,9 @@
      $.ajax(url)
        .done(function (value, textStatus, jqXHR) {
          var klass, tmp_constructor, key;
-          if ((jqXHR.getResponseHeader("Content-Type") || "")
-                === 'text/html') {
+          if (/^text\/html[;]?/.test(
+              jqXHR.getResponseHeader("Content-Type") || ""
+            )) {

            try {
              if (!gadget_model_dict.hasOwnProperty(url)) {

--- a/test/renderjs_test.js
+++ b/test/renderjs_test.js
@@ -440,6 +440,37 @@
    server.respond();
  });

+  test('Content type parameter are supported', function () {
+    // Check that declareGadgetKlass does not fail if the page content type
+    // contains a parameter
+    var server = sinon.fakeServer.create(),
+      url = 'https://example.org/files/qunittest/test';
+
+    server.respondWith("GET", url, [200, {
+      "Content-Type": "text/html; charset=utf-8",
+    }, "<html></html>"]);
+
+    stop();
+    renderJS.declareGadgetKlass(url)
+      .done(function (Klass) {
+        var instance;
+
+        equal(Klass.prototype.path, url);
+
+        instance = new Klass();
+        ok(instance instanceof RenderJSGadget);
+        ok(instance instanceof Klass);
+        ok(Klass !== RenderJSGadget);
+      })
+      .fail(function (jqXHR, textStatus) {
+        ok(false, "Failed to load " + textStatus + " " + jqXHR.status);
+      })
+      .always(function () {
+        start();
+      });
+    server.respond();
+  });
+
  /////////////////////////////////////////////////////////////////
  // declareJS
  /////////////////////////////////////////////////////////////////