Skip to content

Commit

Permalink
Merge branch 'develop' into gh-pages
Browse files Browse the repository at this point in the history
* develop:
  v6.1.2
  fix: temporary guard for #952
  chore(yarn): update deps
  chore(package): update deps
  chore(package): update fs-promise to version 1.0.0 (#968)
  chore(package): update karma-detect-browsers to version 2.2.2 (#967)
  • Loading branch information
marcoscaceres committed Nov 10, 2016
2 parents 8c352a4 + 26b0ace commit 62352e6
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 46 deletions.
2 changes: 1 addition & 1 deletion builds/respec-w3c-common.build.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions builds/respec-w3c-common.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion js/core/ui.js
Expand Up @@ -96,7 +96,11 @@ define([
}
const ui = {
show: function() {
$respecUI[0].classList.remove("respec-hidden");
try {
$respecUI[0].classList.remove("respec-hidden");
} catch (err) {
console.error(err);
}
},
hide: function() {
$respecUI[0].classList.add("respec-hidden");
Expand Down
22 changes: 11 additions & 11 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "respec",
"version": "6.1.1",
"version": "6.1.2",
"license": "W3C",
"description": "A technical specification pre-processor.",
"engines": {
Expand All @@ -24,22 +24,22 @@
"jquery": "^3.1.1",
"js-beautify": "^1.6.4",
"jscs": "^3.0.7",
"jshint": "^2.9.3",
"jshint": "^2.9.4",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-detect-browsers": "^2.1.0",
"karma-detect-browsers": "^2.2.2",
"karma-firefox-launcher": "^1.0.0",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-mocha": "^1.2.0",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.0",
"karma-opera-launcher": "^1.0.0",
"karma-requirejs": "^1.1.0",
"karma-safari-launcher": "^1.0.0",
"karma-safaritechpreview-launcher": "0.0.5",
"karma-verbose-summary-reporter": "0.0.1",
"mocha": "^3.1.0",
"moment": "^2.15.1",
"mocha": "^3.1.2",
"moment": "^2.15.2",
"promise-polyfill": "^6.0.2",
"requirejs": "^2.3.2",
"text": "github:requirejs/text",
Expand Down Expand Up @@ -70,15 +70,15 @@
},
"dependencies": {
"colors": "^1.1.2",
"command-line-args": "^3.0.1",
"command-line-usage": "^3.0.3",
"command-line-args": "^3.0.3",
"command-line-usage": "^3.0.7",
"epipebomb": "^1.0.0",
"express": "^4.14.0",
"fs-promise": "^0.5.0",
"fs-promise": "^1.0.0",
"highlight.js": "github:isagalaev/highlight.js",
"marcosc-async": "^3.0.3",
"marcosc-async": "^3.0.4",
"marked": "^0.3.6",
"nightmare": "^2.7.0",
"nightmare": "^2.8.1",
"prompt": "^1.0.0",
"snyk": "1.19.1"
},
Expand Down
69 changes: 44 additions & 25 deletions yarn.lock
Expand Up @@ -501,9 +501,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"

command-line-args@^3.0.1:
version "3.0.2"
resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-3.0.2.tgz#eb4e203f936c10a20b5143667bdeaf08c933638f"
command-line-args@^3.0.1, command-line-args@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-3.0.3.tgz#87b3b2df449c71ec14e43f462a269931207a2f33"
dependencies:
array-back "^1.0.3"
core-js "^2.4.1"
Expand All @@ -522,7 +522,7 @@ command-line-tool@~0.6.4:
feature-detect-es6 "^1.3.1"
typical "^2.6.0"

command-line-usage@^3.0.3:
command-line-usage@^3.0.3, command-line-usage@^3.0.7:
version "3.0.7"
resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-3.0.7.tgz#ebec67c69e5470a5b7b7699fe34c34cbd5252ee6"
dependencies:
Expand Down Expand Up @@ -672,8 +672,8 @@ cryptiles@2.x.x:
boom "2.x.x"

cst@^0.4.3:
version "0.4.6"
resolved "https://registry.yarnpkg.com/cst/-/cst-0.4.6.tgz#c049c19e335df46d258c10388aa0b510e0b05547"
version "0.4.7"
resolved "https://registry.yarnpkg.com/cst/-/cst-0.4.7.tgz#1771f52aad1130c34c49d72f56492a49a13ef12e"
dependencies:
babel-runtime "^6.9.2"
babylon "^6.8.1"
Expand Down Expand Up @@ -704,8 +704,8 @@ date-now@^0.1.4:
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"

debug@^2.1.3, debug@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.0.tgz#3912dc55d7167fc3af17d2b85c13f93deaedaa43"
version "2.3.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.1.tgz#4b206c092eb4e5b090e429a15d1d89083737ab2b"
dependencies:
ms "0.7.2"

Expand Down Expand Up @@ -882,8 +882,8 @@ electron-download@^3.0.1:
sumchecker "^1.2.0"

electron@^1.4.4:
version "1.4.5"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.5.tgz#829c4884d641d88398805a7f94a37ec432a00bf3"
version "1.4.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.6.tgz#7e8ea042f03ff3f14f48afa132f7fdecc29b3df5"
dependencies:
electron-download "^3.0.1"
extract-zip "^1.0.3"
Expand Down Expand Up @@ -1161,8 +1161,8 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"

form-data@~2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.1.tgz#4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"
version "2.1.2"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.5"
Expand Down Expand Up @@ -1202,6 +1202,14 @@ fs-extra@^0.30.0:
path-is-absolute "^1.0.0"
rimraf "^2.2.8"

fs-extra@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
klaw "^1.0.0"

fs-promise@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
Expand All @@ -1211,6 +1219,15 @@ fs-promise@^0.5.0:
mz "^2.3.1"
thenify-all "^1.6.0"

fs-promise@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-1.0.0.tgz#4246a4cd45497d2ed57e6e4b22167d3864b23679"
dependencies:
any-promise "^1.0.0"
fs-extra "^1.0.0"
mz "^2.3.1"
thenify-all "^1.6.0"

fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
Expand Down Expand Up @@ -1837,7 +1854,7 @@ jsesc@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"

jshint@^2.9.3:
jshint@^2.9.4:
version "2.9.4"
resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.9.4.tgz#5e3ba97848d5290273db514aee47fe24cf592934"
dependencies:
Expand Down Expand Up @@ -1902,9 +1919,9 @@ karma-chrome-launcher@^2.0.0:
fs-access "^1.0.0"
which "^1.2.1"

karma-detect-browsers@^2.1.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/karma-detect-browsers/-/karma-detect-browsers-2.2.1.tgz#808e65877e9073b3ac1b93cbda772d706639cd96"
karma-detect-browsers@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/karma-detect-browsers/-/karma-detect-browsers-2.2.2.tgz#b4ada3349cb18e33695edf43c6e93ff5fd086ac2"
dependencies:
resolve "^1.1.7"
which "^1.2.4"
Expand All @@ -1929,9 +1946,11 @@ karma-mocha-reporter@^2.2.0:
dependencies:
chalk "1.1.3"

karma-mocha@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-1.2.0.tgz#bca6be2a66805b847417e8d2873fd0b5b27ee7cd"
karma-mocha@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-1.3.0.tgz#eeaac7ffc0e201eb63c467440d2b69c7cf3778bf"
dependencies:
minimist "1.2.0"

karma-opera-launcher@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -2163,7 +2182,7 @@ map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"

marcosc-async@^3.0.3, marcosc-async@^3.0.4:
marcosc-async@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/marcosc-async/-/marcosc-async-3.0.4.tgz#2896303cbc0034663e9645cb09f5fe27040f6e94"

Expand Down Expand Up @@ -2252,7 +2271,7 @@ minimatch@3.0.2:
dependencies:
brace-expansion "^1.0.0"

minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

Expand Down Expand Up @@ -2282,7 +2301,7 @@ mkdirp@0.5.0:
dependencies:
minimist "0.0.8"

mocha@^3.1.0:
mocha@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.1.2.tgz#51f93b432bf7e1b175ffc22883ccd0be32dba6b5"
dependencies:
Expand All @@ -2298,7 +2317,7 @@ mocha@^3.1.0:
mkdirp "0.5.1"
supports-color "3.1.2"

moment@^2.15.1:
moment@^2.15.2:
version "2.15.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.15.2.tgz#1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"

Expand Down Expand Up @@ -2360,7 +2379,7 @@ nested-error-stacks@^1.0.0:
dependencies:
inherits "~2.0.1"

nightmare@^2.7.0:
nightmare@^2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/nightmare/-/nightmare-2.8.1.tgz#c7d56e4b37d16978fc853ecb3acc976c315e16d9"
dependencies:
Expand Down Expand Up @@ -3587,7 +3606,7 @@ typical@^2.4.2, typical@^2.5.0, typical@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.0.tgz#89d51554ab139848a65bcc2c8772f8fb450c40ed"

uglify-js, uglify-js@^2.6:
uglify-js@^2.6, uglify-js@^2.7.4:
version "2.7.4"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.4.tgz#a295a0de12b6a650c031c40deb0dc40b14568bd2"
dependencies:
Expand Down

0 comments on commit 62352e6

Please sign in to comment.