Merge branch 'develop' into gh-pages

* develop: v3.2.122 Fix pre issue + update marked.js (#732) Chore(TravisCI): Test against Node 6 chore(package): update karma-mocha-reporter to version 2.0.3 (#740) chore(package): update nightmare to version 2.4.0 (#741) chore(package): update karma-safari-launcher to version 1.0.0 (#739) chore(package): update karma-firefox-launcher to version 1.0.0 (#738) chore(package): update karma-opera-launcher to version 1.0.0 (#737) chore(package): update karma-jasmine to version 1.0.2 (#736) chore(package): update karma-jasmine to version 1.0.0 (#734) chore(package): update karma-requirejs to version 1.0.0 (#733) chore(package): update karma-ie-launcher to version 1.0.0 (#735)
w3c · May 6, 2016 · 6d58b8a · 6d58b8a
2 parents 80fefd0 + 16bc873
commit 6d58b8a
Show file tree

Hide file tree

Showing 17 changed files with 467 additions and 1,130 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-  - v5.10.0
+  - v6.0
 before_install:
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 -extension RANDR"

diff --git a/builds/respec-w3c-common-3.2.122.build.js.map b/builds/respec-w3c-common-3.2.122.build.js.map
diff --git a/builds/respec-w3c-common-3.2.122.js b/builds/respec-w3c-common-3.2.122.js
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/.jshintrc b/js/.jshintrc
@@ -1,5 +1,7 @@
 {
+  "strict": "global",
   "jquery": true,
-  "esversion": "6",
+  "esnext": true,
   "predef": [ "require", "define" ],
+  "browser": true
 }