Merge branch 'develop' into gh-pages

* develop: v11.4.1 chore(deps/highlight.js): patch highlighter chore(package): update deps fix(core/webidl): link to WEBIDL-LS for some things (closes speced#989) (speced#1178)
w3c · Apr 4, 2017 · 5112934 · 5112934
2 parents 9235dcf + d2a6415
commit 5112934
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 27 deletions.
diff --git a/builds/respec-w3c-common.build.js.map b/builds/respec-w3c-common.build.js.map
diff --git a/builds/respec-w3c-common.js b/builds/respec-w3c-common.js
diff --git a/js/deps/highlight.js b/js/deps/highlight.js
@@ -47,11 +47,19 @@
     languages: undefined
   };
 
+  // Object map that is used to escape some common HTML characters.
+  var escapeRegexMap = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;'
+  };
 
   /* Utility functions */
 
   function escape(value) {
-    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    return value.replace(/[&<>]/gm, function(character) {
+      return escapeRegexMap[character];
+    });
   }
 
   function tag(node) {
@@ -168,7 +176,7 @@
     }
 
     function open(node) {
-      function attr_str(a) {return ' ' + a.nodeName + '="' + escape(a.value).replace('"', '&quot;') + '"';}
+      function attr_str(a) {return ' ' + a.nodeName + '="' + escape(a.value) + '"';}
       result += '<' + tag(node) + ArrayProto.map.call(node.attributes, attr_str).join('') + '>';
     }
 
@@ -729,7 +737,7 @@
     contains: [hljs.BACKSLASH_ESCAPE]
   };
   hljs.PHRASAL_WORDS_MODE = {
-    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
+    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/
   };
   hljs.COMMENT = function (begin, end, inherits) {
     var mode = hljs.inherit(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "11.4.0",
+  "version": "11.4.1",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
@@ -16,10 +16,10 @@
   "author": "Robin Berjon",
   "devDependencies": {
     "babel-cli": "^6.24.0",
-    "clipboard": "^1.6.0",
+    "clipboard": "^1.6.1",
     "babel-plugin-transform-async-to-generator": "^6.22.0",
     "babel-plugin-transform-es2015-modules-amd": "^6.24.0",
-    "babel-preset-env": "^1.2.2",
+    "babel-preset-env": "^1.3.2",
     "chai": "^3.5.0",
     "domReady": "github:requirejs/domReady",
     "glob": "^7.1.1",
@@ -48,7 +48,7 @@
     "moment": "^2.18.1",
     "requirejs": "^2.3.3",
     "text": "github:requirejs/text",
-    "uglify-js": "^2.8.18",
+    "uglify-js": "^2.8.21",
     "webidl2": "^2.3.0",
     "whatwg-fetch": "^2.0.3"
   },
@@ -90,7 +90,7 @@
     "marked": "^0.3.6",
     "nightmare": "^2.10.0",
     "prompt": "^1.0.0",
-    "snyk": "^1.26.0"
+    "snyk": "^1.26.1"
   },
   "snyk": true
 }
diff --git a/src/core/webidl.js b/src/core/webidl.js
@@ -241,22 +241,23 @@ const extenedAttributesLinks = new Map([
   ["Exposed", "WEBIDL#Exposed"],
   ["Global", "WEBIDL#Global"],
   ["HTMLConstructor", "HTML51#htmlconstructor"],
-  ["LegacyArrayClass", "WEBIDL#LegacyArrayClass"],
-  ["LegacyUnenumerableNamedProperties", "WEBIDL#LegacyUnenumerableNamedProperties"],
-  ["LenientSetter", "WEBIDL#LenientSetter"],
+  ["LegacyArrayClass", "WEBIDL-LS#LegacyArrayClass"],
+  ["LegacyUnenumerableNamedProperties", "WEBIDL-LS#LegacyUnenumerableNamedProperties"],
+  ["LenientSetter", "WEBIDL-LS#LenientSetter"],
   ["LenientThis", "WEBIDL#LenientThis"],
   ["NamedConstructor", "WEBIDL#NamedConstructor"],
   ["NewObject", "WEBIDL#NewObject"],
   ["NoInterfaceObject", "WEBIDL#NoInterfaceObject"],
   ["OverrideBuiltins", "WEBIDL#OverrideBuiltins"],
+  ["PrimaryGlobal", "WEBIDL#PrimaryGlobal"],
   ["PutForwards", "WEBIDL#PutForwards"],
   ["Replaceable", "WEBIDL#Replaceable"],
   ["SameObject", "WEBIDL#SameObject"],
-  ["SecureContext", "WEBIDL#SecureContext"],
+  ["SecureContext", "WEBIDL-LS#SecureContext"],
   ["TreatNonObjectAsNull", "WEBIDL#TreatNonObjectAsNull"],
   ["TreatNullAs", "WEBIDL#TreatNullAs"],
   ["Unforgeable", "WEBIDL#Unforgeable"],
-  ["Unscopable", "WEBIDL#Unscopable"],
+  ["Unscopable", "WEBIDL-LS#Unscopable"],
 ]);
 
 function extAttr(extAttrs, indent, singleLine) {
@@ -306,7 +307,7 @@ const standardTypes = new Map([
   ["float", "WEBIDL#idl-float"],
   ["Float32Array", "WEBIDL#idl-Float32Array"],
   ["Float64Array", "WEBIDL#idl-Float64Array"],
-  ["FrozenArray", "WEBIDL#idl-frozen-array"],
+  ["FrozenArray", "WEBIDL-LS#idl-frozen-array"],
   ["Int16Array", "WEBIDL#idl-Int16Array"],
   ["Int32Array", "WEBIDL#idl-Int32Array"],
   ["Int8Array", "WEBIDL#idl-Int8Array"],