Merge branch 'release/v3.1.63' into gh-pages

Conflicts: builds/respec-w3c-common.js
sspeiche · Aug 29, 2013 · e1634f2 · e1634f2
2 parents 9294af2 + a1a7c20
commit e1634f2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/builds/respec-w3c-common-3.1.63.js b/builds/respec-w3c-common-3.1.63.js
diff --git a/builds/respec-w3c-common.js b/builds/respec-w3c-common.js
diff --git a/js/core/data-include.js b/js/core/data-include.js
@@ -42,15 +42,20 @@ define(
                 $incs.each(function () {
                     var $el = $(this)
                     ,   uri = $el.attr("data-include")
-                    ,   format = $el.attr("data-include-format") || "html";
+                    ,   format = $el.attr("data-include-format") || "html"
+                    ,   replace = !!$el.attr("data-include-replace")
+                    ,   sync = !!$el.attr("data-include-sync")
+                    ;
                     $.ajax({
                         dataType:   format
                     ,   url:        uri
-                    ,   success:    function (data, status, xhr) {
+                    ,   async:      !sync
+                    ,   success:    function (data) {
                             if (data) {
                                 var flist = $el.attr("data-oninclude");
                                 if (flist) data = utils.runTransforms(data, flist, uri);
-                                format === "text" ? $el.text(data) : $el.html(data);
+                                if (replace) $el.replaceWith(format === "text" ? doc.createTextNode(data) : data);
+                                else format === "text" ? $el.text(data) : $el.html(data);
                             }
                             finish($el);
                         }

diff --git a/js/core/structure.js b/js/core/structure.js
@@ -103,10 +103,11 @@ define(
                     if (!$ul) return;
                     var $sec = $("<section id='toc'/>").append("<h2 class='introductory'>" + i18n[conf.lang || "en"].toc + "</h2>")
                                                        .append($ul);
-                    var $ref = $("#toc", doc);
+                    var $ref = $("#toc", doc), replace = false;
+                    if ($ref) replace = true;
                     if (!$ref.length) $ref = $("#sotd", doc);
                     if (!$ref.length) $ref = $("#abstract", doc);
-                    $ref.after($sec);
+                    replace ? $ref.replaceWith($sec) : $ref.after($sec);
                 }
 
                 // Update all anchors with empty content that reference a section ID

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "respec",
-    "version": "3.1.62",
+    "version": "3.1.63",
     "description": "Specification Edition Support Tool.",
     "main": "index.js",
     "directories": {

diff --git a/tests/spec/core/utils-spec.js b/tests/spec/core/utils-spec.js
@@ -91,15 +91,15 @@ describe("Core - Utils", function () {
     // isoDate
     it("should produce an ISO date", function () {
         runs(function () {
-            expect(utils.isoDate("2013-06-25")).toMatch(/2013-06-25T/) ;
+            expect(utils.isoDate("2013-06-25")).toMatch(/2013-06-2[45]T/) ;
             var d = new Date();
             d.setFullYear(2013);
             d.setMonth(5);
             d.setDate(25);
             d.setHours(0);
             d.setMinutes(0);
             d.setSeconds(0);
-            expect(utils.isoDate(d)).toMatch(/2013-06-25T/);
+            expect(utils.isoDate(d)).toMatch(/2013-06-2[45]T/);
         });
     });