rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto 2017-02-07 18:04:44 -08:00
commit c56a651b7d
6 changed files with 4994 additions and 4826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@ -1,8 +1,8 @@
source 'https://rubygems.org' source 'https://rubygems.org'
group :development, :test do group :development, :test do
gem 'jekyll', '~> 3.3.1' gem 'jekyll', '~> 3.4.0'
gem 'jekyll-redirect-from', '~> 0.12.0' gem 'jekyll-redirect-from', '~> 0.12.1'
gem 'jekyll-sitemap', '~> 0.12.0' gem 'jekyll-sitemap', '~> 1.0.0'
gem 'scss_lint', '~> 0.51.0' gem 'scss_lint', '~> 0.52.0'
end end

22
Gemfile.lock
View File

@ -4,9 +4,9 @@ GEM
addressable (2.5.0) addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0) colorator (1.1.0)
ffi (1.9.14) ffi (1.9.17)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
jekyll (3.3.1) jekyll (3.4.0)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
@ -17,15 +17,15 @@ GEM
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (~> 1.7) rouge (~> 1.7)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-redirect-from (0.12.0) jekyll-redirect-from (0.12.1)
jekyll (~> 3.3) jekyll (~> 3.3)
jekyll-sass-converter (1.5.0) jekyll-sass-converter (1.5.0)
sass (~> 3.4) sass (~> 3.4)
jekyll-sitemap (0.12.0) jekyll-sitemap (1.0.0)
jekyll (~> 3.3) jekyll (~> 3.3)
jekyll-watch (1.5.0) jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1) listen (~> 3.0, < 3.1)
kramdown (1.13.1) kramdown (1.13.2)
liquid (3.0.6) liquid (3.0.6)
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -36,12 +36,12 @@ GEM
public_suffix (2.0.5) public_suffix (2.0.5)
rake (12.0.0) rake (12.0.0)
rb-fsevent (0.9.8) rb-fsevent (0.9.8)
rb-inotify (0.9.7) rb-inotify (0.9.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rouge (1.11.1) rouge (1.11.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.23) sass (3.4.23)
scss_lint (0.51.0) scss_lint (0.52.0)
rake (>= 0.9, < 13) rake (>= 0.9, < 13)
sass (~> 3.4.20) sass (~> 3.4.20)
@ -49,10 +49,10 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jekyll (~> 3.3.1) jekyll (~> 3.4.0)
jekyll-redirect-from (~> 0.12.0) jekyll-redirect-from (~> 0.12.1)
jekyll-sitemap (~> 0.12.0) jekyll-sitemap (~> 1.0.0)
scss_lint (~> 0.51.0) scss_lint (~> 0.52.0)
BUNDLED WITH BUNDLED WITH
1.13.6 1.13.6

933
grunt/npm-shrinkwrap.json generated
View File

@ -16,7 +16,7 @@
}, },
"acorn": { "acorn": {
"version": "4.0.4", "version": "4.0.4",
"from": "acorn@>=4.0.1 <5.0.0", "from": "acorn@4.0.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz",
"dev": true "dev": true
}, },
@ -49,15 +49,15 @@
} }
}, },
"ajv": { "ajv": {
"version": "4.10.3", "version": "4.11.2",
"from": "ajv@>=4.7.0 <5.0.0", "from": "ajv@>=4.7.0 <5.0.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.10.3.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz",
"dev": true "dev": true
}, },
"ajv-keywords": { "ajv-keywords": {
"version": "1.5.0", "version": "1.5.1",
"from": "ajv-keywords@>=1.0.0 <2.0.0", "from": "ajv-keywords@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
"dev": true "dev": true
}, },
"align-text": { "align-text": {
@ -66,12 +66,6 @@
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"dev": true "dev": true
}, },
"amdefine": {
"version": "1.0.1",
"from": "amdefine@>=0.0.4",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
"dev": true
},
"ansi-escapes": { "ansi-escapes": {
"version": "1.4.0", "version": "1.4.0",
"from": "ansi-escapes@>=1.1.0 <2.0.0", "from": "ansi-escapes@>=1.1.0 <2.0.0",
@ -79,9 +73,9 @@
"dev": true "dev": true
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.0.0", "version": "2.1.1",
"from": "ansi-regex@>=2.0.0 <3.0.0", "from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"dev": true "dev": true
}, },
"ansi-styles": { "ansi-styles": {
@ -139,15 +133,13 @@
"version": "2.0.0", "version": "2.0.0",
"from": "arr-diff@>=2.0.0 <3.0.0", "from": "arr-diff@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
"dev": true, "dev": true
"optional": true
}, },
"arr-flatten": { "arr-flatten": {
"version": "1.0.1", "version": "1.0.1",
"from": "arr-flatten@>=1.0.1 <2.0.0", "from": "arr-flatten@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz",
"dev": true, "dev": true
"optional": true
}, },
"array-differ": { "array-differ": {
"version": "1.0.0", "version": "1.0.0",
@ -161,12 +153,6 @@
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"dev": true "dev": true
}, },
"array-index": {
"version": "1.0.0",
"from": "array-index@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz",
"dev": true
},
"array-union": { "array-union": {
"version": "1.0.2", "version": "1.0.2",
"from": "array-union@>=1.0.1 <2.0.0", "from": "array-union@>=1.0.1 <2.0.0",
@ -183,8 +169,7 @@
"version": "0.2.1", "version": "0.2.1",
"from": "array-unique@>=0.2.1 <0.3.0", "from": "array-unique@>=0.2.1 <0.3.0",
"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
"dev": true, "dev": true
"optional": true
}, },
"arrify": { "arrify": {
"version": "1.0.1", "version": "1.0.1",
@ -192,6 +177,12 @@
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
"dev": true "dev": true
}, },
"asap": {
"version": "2.0.5",
"from": "asap@>=2.0.3 <2.1.0",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
"dev": true
},
"asn1": { "asn1": {
"version": "0.2.3", "version": "0.2.3",
"from": "asn1@>=0.2.3 <0.3.0", "from": "asn1@>=0.2.3 <0.3.0",
@ -230,9 +221,9 @@
"dev": true "dev": true
}, },
"autoprefixer": { "autoprefixer": {
"version": "6.6.1", "version": "6.7.2",
"from": "autoprefixer@>=6.6.1 <7.0.0", "from": "autoprefixer@>=6.7.2 <7.0.0",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.6.1.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.2.tgz",
"dev": true "dev": true
}, },
"aws-sign2": { "aws-sign2": {
@ -248,15 +239,15 @@
"dev": true "dev": true
}, },
"babel-code-frame": { "babel-code-frame": {
"version": "6.20.0", "version": "6.22.0",
"from": "babel-code-frame@>=6.16.0 <7.0.0", "from": "babel-code-frame@>=6.16.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-core": { "babel-core": {
"version": "6.21.0", "version": "6.22.1",
"from": "babel-core@>=6.0.12 <7.0.0", "from": "babel-core@>=6.0.12 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.22.1.tgz",
"dev": true "dev": true
}, },
"babel-eslint": { "babel-eslint": {
@ -266,9 +257,9 @@
"dev": true "dev": true
}, },
"babel-generator": { "babel-generator": {
"version": "6.21.0", "version": "6.22.0",
"from": "babel-generator@>=6.21.0 <7.0.0", "from": "babel-generator@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.22.0.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"jsesc": { "jsesc": {
@ -280,141 +271,141 @@
} }
}, },
"babel-helper-call-delegate": { "babel-helper-call-delegate": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-call-delegate@>=6.18.0 <7.0.0", "from": "babel-helper-call-delegate@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-define-map": { "babel-helper-define-map": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-define-map@>=6.18.0 <7.0.0", "from": "babel-helper-define-map@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-function-name": { "babel-helper-function-name": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-function-name@>=6.18.0 <7.0.0", "from": "babel-helper-function-name@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-get-function-arity": { "babel-helper-get-function-arity": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-get-function-arity@>=6.18.0 <7.0.0", "from": "babel-helper-get-function-arity@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-hoist-variables": { "babel-helper-hoist-variables": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-hoist-variables@>=6.18.0 <7.0.0", "from": "babel-helper-hoist-variables@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-optimise-call-expression": { "babel-helper-optimise-call-expression": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-optimise-call-expression@>=6.18.0 <7.0.0", "from": "babel-helper-optimise-call-expression@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-regex": { "babel-helper-regex": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-regex@>=6.8.0 <7.0.0", "from": "babel-helper-regex@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helper-replace-supers": { "babel-helper-replace-supers": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-helper-replace-supers@>=6.18.0 <7.0.0", "from": "babel-helper-replace-supers@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-helpers": { "babel-helpers": {
"version": "6.16.0", "version": "6.22.0",
"from": "babel-helpers@>=6.16.0 <7.0.0", "from": "babel-helpers@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.16.0.tgz", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-messages": { "babel-messages": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-messages@>=6.8.0 <7.0.0", "from": "babel-messages@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-check-es2015-constants": { "babel-plugin-check-es2015-constants": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-check-es2015-constants@>=6.3.13 <7.0.0", "from": "babel-plugin-check-es2015-constants@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-arrow-functions": { "babel-plugin-transform-es2015-arrow-functions": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-arrow-functions@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-arrow-functions@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-block-scoped-functions": { "babel-plugin-transform-es2015-block-scoped-functions": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-block-scoping": { "babel-plugin-transform-es2015-block-scoping": {
"version": "6.21.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-block-scoping@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-block-scoping@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-classes": { "babel-plugin-transform-es2015-classes": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-classes@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-classes@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-computed-properties": { "babel-plugin-transform-es2015-computed-properties": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-computed-properties@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-computed-properties@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-destructuring": { "babel-plugin-transform-es2015-destructuring": {
"version": "6.19.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-destructuring@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-destructuring@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.19.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-duplicate-keys": { "babel-plugin-transform-es2015-duplicate-keys": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-duplicate-keys@>=6.6.0 <7.0.0", "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-for-of": { "babel-plugin-transform-es2015-for-of": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-for-of@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-for-of@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-function-name": { "babel-plugin-transform-es2015-function-name": {
"version": "6.9.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-function-name@>=6.9.0 <7.0.0", "from": "babel-plugin-transform-es2015-function-name@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-literals": { "babel-plugin-transform-es2015-literals": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-literals@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-modules-amd": { "babel-plugin-transform-es2015-modules-amd": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-modules-amd@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-modules-amd@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-modules-commonjs": { "babel-plugin-transform-es2015-modules-commonjs": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-modules-commonjs@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-modules-strip": { "babel-plugin-transform-es2015-modules-strip": {
@ -424,117 +415,117 @@
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-modules-systemjs": { "babel-plugin-transform-es2015-modules-systemjs": {
"version": "6.19.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-modules-systemjs@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-modules-systemjs@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.19.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-modules-umd": { "babel-plugin-transform-es2015-modules-umd": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-modules-umd@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-modules-umd@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-object-super": { "babel-plugin-transform-es2015-object-super": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-object-super@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-object-super@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-parameters": { "babel-plugin-transform-es2015-parameters": {
"version": "6.21.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-parameters@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-parameters@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-shorthand-properties": { "babel-plugin-transform-es2015-shorthand-properties": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-shorthand-properties@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-spread": { "babel-plugin-transform-es2015-spread": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-spread@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-spread@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-sticky-regex": { "babel-plugin-transform-es2015-sticky-regex": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-sticky-regex@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-sticky-regex@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-template-literals": { "babel-plugin-transform-es2015-template-literals": {
"version": "6.8.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-template-literals@>=6.6.0 <7.0.0", "from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-typeof-symbol": { "babel-plugin-transform-es2015-typeof-symbol": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-typeof-symbol@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-es2015-unicode-regex": { "babel-plugin-transform-es2015-unicode-regex": {
"version": "6.11.0", "version": "6.22.0",
"from": "babel-plugin-transform-es2015-unicode-regex@>=6.3.13 <7.0.0", "from": "babel-plugin-transform-es2015-unicode-regex@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-regenerator": { "babel-plugin-transform-regenerator": {
"version": "6.21.0", "version": "6.22.0",
"from": "babel-plugin-transform-regenerator@>=6.16.0 <7.0.0", "from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-plugin-transform-strict-mode": { "babel-plugin-transform-strict-mode": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-plugin-transform-strict-mode@>=6.18.0 <7.0.0", "from": "babel-plugin-transform-strict-mode@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-preset-es2015": { "babel-preset-es2015": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-preset-es2015@>=6.18.0 <7.0.0", "from": "babel-preset-es2015@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-register": { "babel-register": {
"version": "6.18.0", "version": "6.22.0",
"from": "babel-register@>=6.18.0 <7.0.0", "from": "babel-register@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-runtime": { "babel-runtime": {
"version": "6.20.0", "version": "6.22.0",
"from": "babel-runtime@>=6.20.0 <7.0.0", "from": "babel-runtime@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.20.0.tgz", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-template": { "babel-template": {
"version": "6.16.0", "version": "6.22.0",
"from": "babel-template@>=6.15.0 <7.0.0", "from": "babel-template@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.16.0.tgz", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.22.0.tgz",
"dev": true "dev": true
}, },
"babel-traverse": { "babel-traverse": {
"version": "6.21.0", "version": "6.22.1",
"from": "babel-traverse@>=6.15.0 <7.0.0", "from": "babel-traverse@>=6.15.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.22.1.tgz",
"dev": true "dev": true
}, },
"babel-types": { "babel-types": {
"version": "6.21.0", "version": "6.22.0",
"from": "babel-types@>=6.15.0 <7.0.0", "from": "babel-types@>=6.15.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.21.0.tgz", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.22.0.tgz",
"dev": true "dev": true
}, },
"babylon": { "babylon": {
"version": "6.14.1", "version": "6.15.0",
"from": "babylon@>=6.13.0 <7.0.0", "from": "babylon@>=6.13.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.14.1.tgz", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.15.0.tgz",
"dev": true "dev": true
}, },
"balanced-match": { "balanced-match": {
@ -556,9 +547,9 @@
"dev": true "dev": true
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.0", "version": "1.0.1",
"from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
@ -641,13 +632,12 @@
"version": "1.8.5", "version": "1.8.5",
"from": "braces@>=1.8.2 <2.0.0", "from": "braces@>=1.8.2 <2.0.0",
"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
"dev": true, "dev": true
"optional": true
}, },
"browserslist": { "browserslist": {
"version": "1.5.1", "version": "1.7.1",
"from": "browserslist@>=1.5.1 <1.6.0", "from": "browserslist@>=1.7.1 <2.0.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.5.1.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.1.tgz",
"dev": true "dev": true
}, },
"buffer-crc32": { "buffer-crc32": {
@ -668,6 +658,26 @@
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"dev": true "dev": true
}, },
"bulk-require": {
"version": "1.0.0",
"from": "bulk-require@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/bulk-require/-/bulk-require-1.0.0.tgz",
"dev": true,
"dependencies": {
"glob": {
"version": "3.2.11",
"from": "glob@>=3.2.7 <3.3.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
"dev": true
},
"minimatch": {
"version": "0.3.0",
"from": "minimatch@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
"dev": true
}
}
},
"bytes": { "bytes": {
"version": "2.2.0", "version": "2.2.0",
"from": "bytes@2.2.0", "from": "bytes@2.2.0",
@ -699,9 +709,9 @@
"dev": true "dev": true
}, },
"caniuse-db": { "caniuse-db": {
"version": "1.0.30000604", "version": "1.0.30000619",
"from": "caniuse-db@>=1.0.30000604 <2.0.0", "from": "caniuse-db@>=1.0.30000618 <2.0.0",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000604.tgz", "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000619.tgz",
"dev": true "dev": true
}, },
"caseless": { "caseless": {
@ -743,19 +753,23 @@
"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
"dev": true "dev": true
}, },
"clean-css": { "cjson": {
"version": "3.4.23", "version": "0.5.0",
"from": "clean-css@>=3.4.23 <4.0.0", "from": "cjson@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.23.tgz", "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.5.0.tgz",
"dev": true, "dev": true
"dependencies": { },
"source-map": { "clean-css": {
"version": "0.4.4", "version": "4.0.4",
"from": "source-map@>=0.4.0 <0.5.0", "from": "clean-css@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.0.4.tgz",
"dev": true
},
"clean-css-cli": {
"version": "4.0.0",
"from": "clean-css-cli@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.0.0.tgz",
"dev": true "dev": true
}
}
}, },
"cli": { "cli": {
"version": "0.6.6", "version": "0.6.6",
@ -826,9 +840,9 @@
"dev": true "dev": true
}, },
"commander": { "commander": {
"version": "2.8.1", "version": "2.9.0",
"from": "commander@>=2.8.0 <2.9.0", "from": "commander@>=2.9.0 <3.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
"dev": true "dev": true
}, },
"compress-commons": { "compress-commons": {
@ -911,10 +925,16 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"dev": true "dev": true
}, },
"crc": {
"version": "3.4.4",
"from": "crc@>=3.4.4 <4.0.0",
"resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
"dev": true
},
"crc32-stream": { "crc32-stream": {
"version": "1.0.0", "version": "1.0.1",
"from": "crc32-stream@>=1.0.0 <2.0.0", "from": "crc32-stream@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz", "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.1.tgz",
"dev": true "dev": true
}, },
"cross-spawn": { "cross-spawn": {
@ -1035,6 +1055,12 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"dev": true "dev": true
}, },
"detect-file": {
"version": "0.1.0",
"from": "detect-file@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
"dev": true
},
"detect-indent": { "detect-indent": {
"version": "4.0.0", "version": "4.0.0",
"from": "detect-indent@>=4.0.0 <5.0.0", "from": "detect-indent@>=4.0.0 <5.0.0",
@ -1098,6 +1124,12 @@
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"dev": true "dev": true
}, },
"electron-to-chromium": {
"version": "1.2.1",
"from": "electron-to-chromium@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz",
"dev": true
},
"encodeurl": { "encodeurl": {
"version": "1.0.1", "version": "1.0.1",
"from": "encodeurl@>=1.0.1 <1.1.0", "from": "encodeurl@>=1.0.1 <1.1.0",
@ -1197,15 +1229,15 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "3.12.2", "version": "3.15.0",
"from": "eslint@>=3.12.2 <4.0.0", "from": "eslint@>=3.15.0 <4.0.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-3.12.2.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz",
"dev": true "dev": true
}, },
"espree": { "espree": {
"version": "3.3.2", "version": "3.4.0",
"from": "espree@>=3.3.1 <4.0.0", "from": "espree@>=3.4.0 <4.0.0",
"resolved": "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz",
"dev": true "dev": true
}, },
"esprima": { "esprima": {
@ -1274,15 +1306,19 @@
"version": "0.1.5", "version": "0.1.5",
"from": "expand-brackets@>=0.1.4 <0.2.0", "from": "expand-brackets@>=0.1.4 <0.2.0",
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
"dev": true, "dev": true
"optional": true
}, },
"expand-range": { "expand-range": {
"version": "1.8.2", "version": "1.8.2",
"from": "expand-range@>=1.8.1 <2.0.0", "from": "expand-range@>=1.8.1 <2.0.0",
"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
"dev": true, "dev": true
"optional": true },
"expand-tilde": {
"version": "1.2.2",
"from": "expand-tilde@>=1.2.2 <2.0.0",
"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
"dev": true
}, },
"extend": { "extend": {
"version": "3.0.0", "version": "3.0.0",
@ -1294,8 +1330,7 @@
"version": "0.3.2", "version": "0.3.2",
"from": "extglob@>=0.3.1 <0.4.0", "from": "extglob@>=0.3.1 <0.4.0",
"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
"dev": true, "dev": true
"optional": true
}, },
"extract-zip": { "extract-zip": {
"version": "1.5.0", "version": "1.5.0",
@ -1395,15 +1430,13 @@
"version": "2.0.0", "version": "2.0.0",
"from": "filename-regex@>=2.0.0 <3.0.0", "from": "filename-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz",
"dev": true, "dev": true
"optional": true
}, },
"fill-range": { "fill-range": {
"version": "2.2.3", "version": "2.2.3",
"from": "fill-range@>=2.1.0 <3.0.0", "from": "fill-range@>=2.1.0 <3.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
"dev": true, "dev": true
"optional": true
}, },
"finalhandler": { "finalhandler": {
"version": "0.5.0", "version": "0.5.0",
@ -1445,6 +1478,18 @@
} }
} }
}, },
"fined": {
"version": "1.0.2",
"from": "fined@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz",
"dev": true
},
"flagged-respawn": {
"version": "0.3.2",
"from": "flagged-respawn@>=0.3.2 <0.4.0",
"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
"dev": true
},
"flat-cache": { "flat-cache": {
"version": "1.2.2", "version": "1.2.2",
"from": "flat-cache@>=1.2.1 <2.0.0", "from": "flat-cache@>=1.2.1 <2.0.0",
@ -1455,15 +1500,13 @@
"version": "0.1.6", "version": "0.1.6",
"from": "for-in@>=0.1.5 <0.2.0", "from": "for-in@>=0.1.5 <0.2.0",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz", "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz",
"dev": true, "dev": true
"optional": true
}, },
"for-own": { "for-own": {
"version": "0.1.4", "version": "0.1.4",
"from": "for-own@>=0.1.4 <0.2.0", "from": "for-own@>=0.1.4 <0.2.0",
"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz",
"dev": true, "dev": true
"optional": true
}, },
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
@ -1483,6 +1526,12 @@
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
"dev": true "dev": true
}, },
"fs-exists-sync": {
"version": "0.1.0",
"from": "fs-exists-sync@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
"dev": true
},
"fs-extra": { "fs-extra": {
"version": "1.0.0", "version": "1.0.0",
"from": "fs-extra@>=1.0.0 <1.1.0", "from": "fs-extra@>=1.0.0 <1.1.0",
@ -1508,10 +1557,18 @@
"dev": true "dev": true
}, },
"gauge": { "gauge": {
"version": "2.6.0", "version": "2.7.2",
"from": "gauge@>=2.6.0 <2.7.0", "from": "gauge@>=2.7.1 <2.8.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz",
"dev": true,
"dependencies": {
"supports-color": {
"version": "0.2.0",
"from": "supports-color@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
"dev": true "dev": true
}
}
}, },
"gaze": { "gaze": {
"version": "1.1.2", "version": "1.1.2",
@ -1581,6 +1638,18 @@
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
"dev": true "dev": true
}, },
"global-modules": {
"version": "0.2.3",
"from": "global-modules@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
"dev": true
},
"global-prefix": {
"version": "0.1.5",
"from": "global-prefix@>=0.1.4 <0.2.0",
"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
"dev": true
},
"globals": { "globals": {
"version": "9.14.0", "version": "9.14.0",
"from": "globals@>=9.0.0 <10.0.0", "from": "globals@>=9.0.0 <10.0.0",
@ -1690,9 +1759,9 @@
"dev": true "dev": true
}, },
"grunt-contrib-compress": { "grunt-contrib-compress": {
"version": "1.3.0", "version": "1.4.1",
"from": "grunt-contrib-compress@>=1.3.0 <2.0.0", "from": "grunt-contrib-compress@>=1.4.1 <2.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.3.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.4.1.tgz",
"dev": true "dev": true
}, },
"grunt-contrib-concat": { "grunt-contrib-concat": {
@ -1739,24 +1808,10 @@
"resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-1.0.1.tgz", "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-1.0.1.tgz",
"dev": true "dev": true
}, },
"grunt-html": {
"version": "8.1.0",
"from": "grunt-html@>=8.1.0 <9.0.0",
"resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-8.1.0.tgz",
"dev": true,
"dependencies": {
"async": {
"version": "2.1.2",
"from": "async@2.1.2",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz",
"dev": true
}
}
},
"grunt-jekyll": { "grunt-jekyll": {
"version": "0.4.4", "version": "0.4.6",
"from": "grunt-jekyll@>=0.4.4 <0.5.0", "from": "grunt-jekyll@>=0.4.6 <0.5.0",
"resolved": "https://registry.npmjs.org/grunt-jekyll/-/grunt-jekyll-0.4.4.tgz", "resolved": "https://registry.npmjs.org/grunt-jekyll/-/grunt-jekyll-0.4.6.tgz",
"dev": true "dev": true
}, },
"grunt-known-options": { "grunt-known-options": {
@ -1837,15 +1892,7 @@
"version": "2.0.6", "version": "2.0.6",
"from": "har-validator@>=2.0.6 <2.1.0", "from": "har-validator@>=2.0.6 <2.1.0",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
"dev": true,
"dependencies": {
"commander": {
"version": "2.9.0",
"from": "commander@>=2.9.0 <3.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
"dev": true "dev": true
}
}
}, },
"has-ansi": { "has-ansi": {
"version": "2.0.0", "version": "2.0.0",
@ -1853,12 +1900,6 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"dev": true "dev": true
}, },
"has-color": {
"version": "0.1.7",
"from": "has-color@>=0.1.7 <0.2.0",
"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
"dev": true
},
"has-flag": { "has-flag": {
"version": "1.0.0", "version": "1.0.0",
"from": "has-flag@>=1.0.0 <2.0.0", "from": "has-flag@>=1.0.0 <2.0.0",
@ -1895,6 +1936,12 @@
"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
"dev": true "dev": true
}, },
"homedir-polyfill": {
"version": "1.0.1",
"from": "homedir-polyfill@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
"dev": true
},
"hooker": { "hooker": {
"version": "0.2.3", "version": "0.2.3",
"from": "hooker@>=0.2.3 <0.3.0", "from": "hooker@>=0.2.3 <0.3.0",
@ -1936,9 +1983,27 @@
"from": "glob@5.0.15", "from": "glob@5.0.15",
"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
"dev": true "dev": true
},
"strip-json-comments": {
"version": "1.0.4",
"from": "strip-json-comments@1.0.4",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
"dev": true
} }
} }
}, },
"htmllint": {
"version": "0.6.0",
"from": "htmllint@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/htmllint/-/htmllint-0.6.0.tgz",
"dev": true
},
"htmllint-cli": {
"version": "0.0.6",
"from": "htmllint-cli@0.0.6",
"resolved": "https://registry.npmjs.org/htmllint-cli/-/htmllint-cli-0.0.6.tgz",
"dev": true
},
"htmlparser2": { "htmlparser2": {
"version": "3.8.3", "version": "3.8.3",
"from": "htmlparser2@>=3.8.0 <3.9.0", "from": "htmlparser2@>=3.8.0 <3.9.0",
@ -1990,11 +2055,18 @@
"dev": true "dev": true
}, },
"ignore": { "ignore": {
"version": "3.2.0", "version": "3.2.2",
"from": "ignore@>=3.2.0 <4.0.0", "from": "ignore@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz",
"dev": true "dev": true
}, },
"iltorb": {
"version": "1.0.13",
"from": "iltorb@>=1.0.13 <2.0.0",
"resolved": "https://registry.npmjs.org/iltorb/-/iltorb-1.0.13.tgz",
"dev": true,
"optional": true
},
"imurmurhash": { "imurmurhash": {
"version": "0.1.4", "version": "0.1.4",
"from": "imurmurhash@>=0.1.4 <0.2.0", "from": "imurmurhash@>=0.1.4 <0.2.0",
@ -2025,6 +2097,12 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"dev": true "dev": true
}, },
"ini": {
"version": "1.3.4",
"from": "ini@>=1.3.4 <2.0.0",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
"dev": true
},
"inquirer": { "inquirer": {
"version": "0.12.0", "version": "0.12.0",
"from": "inquirer@>=0.12.0 <0.13.0", "from": "inquirer@>=0.12.0 <0.13.0",
@ -2049,6 +2127,12 @@
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
"dev": true "dev": true
}, },
"is-absolute": {
"version": "0.2.6",
"from": "is-absolute@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
"dev": true
},
"is-arrayish": { "is-arrayish": {
"version": "0.2.1", "version": "0.2.1",
"from": "is-arrayish@>=0.2.1 <0.3.0", "from": "is-arrayish@>=0.2.1 <0.3.0",
@ -2084,15 +2168,13 @@
"version": "0.1.3", "version": "0.1.3",
"from": "is-equal-shallow@>=0.1.3 <0.2.0", "from": "is-equal-shallow@>=0.1.3 <0.2.0",
"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
"dev": true, "dev": true
"optional": true
}, },
"is-extendable": { "is-extendable": {
"version": "0.1.1", "version": "0.1.1",
"from": "is-extendable@>=0.1.1 <0.2.0", "from": "is-extendable@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
"dev": true, "dev": true
"optional": true
}, },
"is-extglob": { "is-extglob": {
"version": "1.0.0", "version": "1.0.0",
@ -2152,8 +2234,7 @@
"version": "0.1.1", "version": "0.1.1",
"from": "is-posix-bracket@>=0.1.0 <0.2.0", "from": "is-posix-bracket@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
"dev": true, "dev": true
"optional": true
}, },
"is-primitive": { "is-primitive": {
"version": "2.0.0", "version": "2.0.0",
@ -2167,6 +2248,12 @@
"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
"dev": true "dev": true
}, },
"is-relative": {
"version": "0.2.1",
"from": "is-relative@>=0.2.1 <0.3.0",
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
"dev": true
},
"is-resolvable": { "is-resolvable": {
"version": "1.0.0", "version": "1.0.0",
"from": "is-resolvable@>=1.0.0 <2.0.0", "from": "is-resolvable@>=1.0.0 <2.0.0",
@ -2191,12 +2278,24 @@
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"dev": true "dev": true
}, },
"is-unc-path": {
"version": "0.1.2",
"from": "is-unc-path@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
"dev": true
},
"is-utf8": { "is-utf8": {
"version": "0.2.1", "version": "0.2.1",
"from": "is-utf8@>=0.2.0 <0.3.0", "from": "is-utf8@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"dev": true "dev": true
}, },
"is-windows": {
"version": "0.2.0",
"from": "is-windows@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
"dev": true
},
"isarray": { "isarray": {
"version": "1.0.0", "version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0", "from": "isarray@>=1.0.0 <1.1.0",
@ -2213,8 +2312,7 @@
"version": "2.1.0", "version": "2.1.0",
"from": "isobject@>=2.0.0 <3.0.0", "from": "isobject@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
"dev": true, "dev": true
"optional": true
}, },
"isstream": { "isstream": {
"version": "0.1.2", "version": "0.1.2",
@ -2222,6 +2320,12 @@
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"dev": true "dev": true
}, },
"jju": {
"version": "1.3.0",
"from": "jju@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz",
"dev": true
},
"jodid25519": { "jodid25519": {
"version": "1.0.2", "version": "1.0.2",
"from": "jodid25519@>=1.0.0 <2.0.0", "from": "jodid25519@>=1.0.0 <2.0.0",
@ -2241,9 +2345,9 @@
"dev": true "dev": true
}, },
"js-tokens": { "js-tokens": {
"version": "2.0.0", "version": "3.0.1",
"from": "js-tokens@>=2.0.0 <3.0.0", "from": "js-tokens@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
@ -2288,9 +2392,21 @@
"from": "shelljs@>=0.3.0 <0.4.0", "from": "shelljs@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
"dev": true "dev": true
},
"strip-json-comments": {
"version": "1.0.4",
"from": "strip-json-comments@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
"dev": true
} }
} }
}, },
"json-parse-helpfulerror": {
"version": "1.0.3",
"from": "json-parse-helpfulerror@>=1.0.3 <2.0.0",
"resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
"dev": true
},
"json-schema": { "json-schema": {
"version": "0.2.3", "version": "0.2.3",
"from": "json-schema@0.2.3", "from": "json-schema@0.2.3",
@ -2381,6 +2497,20 @@
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
"dev": true "dev": true
}, },
"liftoff": {
"version": "2.3.0",
"from": "liftoff@>=2.3.0 <3.0.0",
"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
"dev": true,
"dependencies": {
"findup-sync": {
"version": "0.4.3",
"from": "findup-sync@>=0.4.2 <0.5.0",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
"dev": true
}
}
},
"livereload-js": { "livereload-js": {
"version": "2.2.2", "version": "2.2.2",
"from": "livereload-js@>=2.2.0 <3.0.0", "from": "livereload-js@>=2.2.0 <3.0.0",
@ -2419,18 +2549,54 @@
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
"dev": true "dev": true
}, },
"lodash.assignwith": {
"version": "4.2.0",
"from": "lodash.assignwith@>=4.0.7 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz",
"dev": true
},
"lodash.clonedeep": { "lodash.clonedeep": {
"version": "4.5.0", "version": "4.5.0",
"from": "lodash.clonedeep@>=4.3.2 <5.0.0", "from": "lodash.clonedeep@>=4.3.2 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"dev": true "dev": true
}, },
"lodash.isempty": {
"version": "4.4.0",
"from": "lodash.isempty@>=4.2.1 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
"dev": true
},
"lodash.isplainobject": {
"version": "4.0.6",
"from": "lodash.isplainobject@>=4.0.4 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"dev": true
},
"lodash.isstring": {
"version": "4.0.1",
"from": "lodash.isstring@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
"dev": true
},
"lodash.mapvalues": {
"version": "4.6.0",
"from": "lodash.mapvalues@>=4.4.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
"dev": true
},
"lodash.mergewith": { "lodash.mergewith": {
"version": "4.6.0", "version": "4.6.0",
"from": "lodash.mergewith@>=4.6.0 <5.0.0", "from": "lodash.mergewith@>=4.6.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
"dev": true "dev": true
}, },
"lodash.pick": {
"version": "4.4.0",
"from": "lodash.pick@>=4.2.1 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
"dev": true
},
"lodash.pickby": { "lodash.pickby": {
"version": "4.6.0", "version": "4.6.0",
"from": "lodash.pickby@>=4.6.0 <5.0.0", "from": "lodash.pickby@>=4.6.0 <5.0.0",
@ -2444,9 +2610,9 @@
"dev": true "dev": true
}, },
"loose-envify": { "loose-envify": {
"version": "1.3.0", "version": "1.3.1",
"from": "loose-envify@>=1.0.0 <2.0.0", "from": "loose-envify@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
"dev": true "dev": true
}, },
"loud-rejection": { "loud-rejection": {
@ -2461,6 +2627,12 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
"dev": true "dev": true
}, },
"map-cache": {
"version": "0.2.2",
"from": "map-cache@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
"dev": true
},
"map-obj": { "map-obj": {
"version": "1.0.1", "version": "1.0.1",
"from": "map-obj@>=1.0.1 <2.0.0", "from": "map-obj@>=1.0.1 <2.0.0",
@ -2489,10 +2661,9 @@
}, },
"micromatch": { "micromatch": {
"version": "2.3.11", "version": "2.3.11",
"from": "micromatch@>=2.1.5 <3.0.0", "from": "micromatch@>=2.3.7 <3.0.0",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
"dev": true, "dev": true
"optional": true
}, },
"mime": { "mime": {
"version": "1.3.4", "version": "1.3.4",
@ -2501,15 +2672,15 @@
"dev": true "dev": true
}, },
"mime-db": { "mime-db": {
"version": "1.25.0", "version": "1.26.0",
"from": "mime-db@>=1.25.0 <1.26.0", "from": "mime-db@>=1.26.0 <1.27.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz",
"dev": true "dev": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.13", "version": "2.1.14",
"from": "mime-types@>=2.1.11 <2.2.0", "from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz",
"dev": true "dev": true
}, },
"minimatch": { "minimatch": {
@ -2569,9 +2740,9 @@
"dev": true "dev": true
}, },
"nan": { "nan": {
"version": "2.5.0", "version": "2.5.1",
"from": "nan@>=2.3.2 <3.0.0", "from": "nan@>=2.4.0 <3.0.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz",
"dev": true "dev": true
}, },
"natural-compare": { "natural-compare": {
@ -2593,23 +2764,15 @@
"dev": true "dev": true
}, },
"node-gyp": { "node-gyp": {
"version": "3.4.0", "version": "3.5.0",
"from": "node-gyp@>=3.3.1 <4.0.0", "from": "node-gyp@>=3.3.1 <4.0.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz",
"dev": true,
"dependencies": {
"npmlog": {
"version": "3.1.2",
"from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz",
"dev": true "dev": true
}
}
}, },
"node-sass": { "node-sass": {
"version": "4.1.1", "version": "4.5.0",
"from": "node-sass@>=4.1.1 <5.0.0", "from": "node-sass@>=4.5.0 <5.0.0",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.1.1.tgz", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.0.tgz",
"dev": true "dev": true
}, },
"nopt": { "nopt": {
@ -2640,22 +2803,8 @@
"version": "4.0.2", "version": "4.0.2",
"from": "npmlog@>=4.0.0 <5.0.0", "from": "npmlog@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
"dev": true,
"dependencies": {
"gauge": {
"version": "2.7.2",
"from": "gauge@>=2.7.1 <2.8.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz",
"dev": true "dev": true
}, },
"supports-color": {
"version": "0.2.0",
"from": "supports-color@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
"dev": true
}
}
},
"num2fraction": { "num2fraction": {
"version": "1.2.2", "version": "1.2.2",
"from": "num2fraction@>=1.2.2 <2.0.0", "from": "num2fraction@>=1.2.2 <2.0.0",
@ -2675,17 +2824,16 @@
"dev": true "dev": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.0", "version": "4.1.1",
"from": "object-assign@>=4.0.1 <5.0.0", "from": "object-assign@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"dev": true "dev": true
}, },
"object.omit": { "object.omit": {
"version": "2.0.1", "version": "2.0.1",
"from": "object.omit@>=2.0.0 <3.0.0", "from": "object.omit@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
"dev": true, "dev": true
"optional": true
}, },
"on-finished": { "on-finished": {
"version": "2.3.0", "version": "2.3.0",
@ -2753,6 +2901,12 @@
"resolved": "https://registry.npmjs.org/package/-/package-1.0.1.tgz", "resolved": "https://registry.npmjs.org/package/-/package-1.0.1.tgz",
"dev": true "dev": true
}, },
"parse-filepath": {
"version": "1.0.1",
"from": "parse-filepath@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
"dev": true
},
"parse-glob": { "parse-glob": {
"version": "3.0.4", "version": "3.0.4",
"from": "parse-glob@3.0.4", "from": "parse-glob@3.0.4",
@ -2771,6 +2925,12 @@
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz",
"dev": true "dev": true
}, },
"parse-passwd": {
"version": "1.0.0",
"from": "parse-passwd@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
"dev": true
},
"parserlib": { "parserlib": {
"version": "0.2.5", "version": "0.2.5",
"from": "parserlib@>=0.2.2 <0.3.0", "from": "parserlib@>=0.2.2 <0.3.0",
@ -2783,12 +2943,6 @@
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
"dev": true "dev": true
}, },
"path-array": {
"version": "1.0.1",
"from": "path-array@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz",
"dev": true
},
"path-exists": { "path-exists": {
"version": "2.1.0", "version": "2.1.0",
"from": "path-exists@>=2.0.0 <3.0.0", "from": "path-exists@>=2.0.0 <3.0.0",
@ -2807,6 +2961,18 @@
"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
"dev": true "dev": true
}, },
"path-root": {
"version": "0.1.1",
"from": "path-root@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
"dev": true
},
"path-root-regex": {
"version": "0.1.2",
"from": "path-root-regex@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
"dev": true
},
"path-type": { "path-type": {
"version": "1.1.0", "version": "1.1.0",
"from": "path-type@>=1.0.0 <2.0.0", "from": "path-type@>=1.0.0 <2.0.0",
@ -2868,9 +3034,9 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "5.2.8", "version": "5.2.11",
"from": "postcss@>=5.2.8 <6.0.0", "from": "postcss@>=5.2.11 <6.0.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.8.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.11.tgz",
"dev": true "dev": true
}, },
"postcss-cli": { "postcss-cli": {
@ -2879,6 +3045,12 @@
"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-2.6.0.tgz", "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-2.6.0.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"camelcase": {
"version": "3.0.0",
"from": "camelcase@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"dev": true
},
"glob": { "glob": {
"version": "6.0.4", "version": "6.0.4",
"from": "glob@>=6.0.1 <7.0.0", "from": "glob@>=6.0.1 <7.0.0",
@ -2890,6 +3062,18 @@
"from": "globby@>=4.1.0 <5.0.0", "from": "globby@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz", "resolved": "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz",
"dev": true "dev": true
},
"yargs": {
"version": "4.8.1",
"from": "yargs@>=4.7.1 <5.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
"dev": true
},
"yargs-parser": {
"version": "2.4.1",
"from": "yargs-parser@>=2.4.1 <3.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
"dev": true
} }
} }
}, },
@ -2915,8 +3099,7 @@
"version": "0.2.0", "version": "0.2.0",
"from": "preserve@>=0.2.0 <0.3.0", "from": "preserve@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
"dev": true, "dev": true
"optional": true
}, },
"pretty-bytes": { "pretty-bytes": {
"version": "3.0.1", "version": "3.0.1",
@ -2948,6 +3131,12 @@
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
"dev": true "dev": true
}, },
"promise": {
"version": "7.1.1",
"from": "promise@>=7.1.1 <8.0.0",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
"dev": true
},
"pseudomap": { "pseudomap": {
"version": "1.0.2", "version": "1.0.2",
"from": "pseudomap@>=1.0.1 <2.0.0", "from": "pseudomap@>=1.0.1 <2.0.0",
@ -2976,8 +3165,7 @@
"version": "1.1.6", "version": "1.1.6",
"from": "randomatic@>=1.1.3 <2.0.0", "from": "randomatic@>=1.1.3 <2.0.0",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
"dev": true, "dev": true
"optional": true
}, },
"range-parser": { "range-parser": {
"version": "1.2.0", "version": "1.2.0",
@ -3076,8 +3264,7 @@
"version": "0.4.3", "version": "0.4.3",
"from": "regex-cache@>=0.4.2 <0.5.0", "from": "regex-cache@>=0.4.2 <0.5.0",
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
"dev": true, "dev": true
"optional": true
}, },
"regexpu-core": { "regexpu-core": {
"version": "2.0.0", "version": "2.0.0",
@ -3157,6 +3344,12 @@
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz",
"dev": true "dev": true
}, },
"resolve-dir": {
"version": "0.1.1",
"from": "resolve-dir@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
"dev": true
},
"resolve-from": { "resolve-from": {
"version": "1.0.1", "version": "1.0.1",
"from": "resolve-from@>=1.0.0 <2.0.0", "from": "resolve-from@>=1.0.0 <2.0.0",
@ -3211,8 +3404,28 @@
"version": "2.1.2", "version": "2.1.2",
"from": "sass-graph@>=2.1.1 <3.0.0", "from": "sass-graph@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.2.tgz", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.2.tgz",
"dev": true,
"dependencies": {
"camelcase": {
"version": "3.0.0",
"from": "camelcase@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"dev": true "dev": true
}, },
"yargs": {
"version": "4.8.1",
"from": "yargs@>=4.7.1 <5.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
"dev": true
},
"yargs-parser": {
"version": "2.4.1",
"from": "yargs-parser@>=2.4.1 <3.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
"dev": true
}
}
},
"sauce-tunnel": { "sauce-tunnel": {
"version": "2.5.0", "version": "2.5.0",
"from": "sauce-tunnel@>=2.5.0 <2.6.0", "from": "sauce-tunnel@>=2.5.0 <2.6.0",
@ -3232,17 +3445,17 @@
"dev": true "dev": true
}, },
"send": { "send": {
"version": "0.14.1", "version": "0.14.2",
"from": "send@0.14.1", "from": "send@0.14.2",
"resolved": "https://registry.npmjs.org/send/-/send-0.14.1.tgz", "resolved": "https://registry.npmjs.org/send/-/send-0.14.2.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "2.2.0", "version": "2.2.0",
"from": "debug@>=2.2.0 <2.3.0", "from": "debug@>=2.2.0 <2.3.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"dev": true "dev": true,
}, "dependencies": {
"ms": { "ms": {
"version": "0.7.1", "version": "0.7.1",
"from": "ms@0.7.1", "from": "ms@0.7.1",
@ -3250,6 +3463,8 @@
"dev": true "dev": true
} }
} }
}
}
}, },
"serve-index": { "serve-index": {
"version": "1.8.0", "version": "1.8.0",
@ -3272,14 +3487,14 @@
} }
}, },
"serve-static": { "serve-static": {
"version": "1.11.1", "version": "1.11.2",
"from": "serve-static@>=1.10.0 <2.0.0", "from": "serve-static@>=1.10.0 <2.0.0",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz",
"dev": true "dev": true
}, },
"set-blocking": { "set-blocking": {
"version": "2.0.0", "version": "2.0.0",
"from": "set-blocking@>=2.0.0 <2.1.0", "from": "set-blocking@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"dev": true "dev": true
}, },
@ -3297,15 +3512,15 @@
"dev": true "dev": true
}, },
"shelljs": { "shelljs": {
"version": "0.7.5", "version": "0.7.6",
"from": "shelljs@>=0.7.5 <0.8.0", "from": "shelljs@>=0.7.6 <0.8.0",
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz",
"dev": true "dev": true
}, },
"shx": { "shx": {
"version": "0.2.1", "version": "0.2.2",
"from": "shx@>=0.2.1 <0.3.0", "from": "shx@>=0.2.2 <0.3.0",
"resolved": "https://registry.npmjs.org/shx/-/shx-0.2.1.tgz", "resolved": "https://registry.npmjs.org/shx/-/shx-0.2.2.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"minimist": { "minimist": {
@ -3353,9 +3568,9 @@
"dev": true "dev": true
}, },
"source-map-support": { "source-map-support": {
"version": "0.4.8", "version": "0.4.11",
"from": "source-map-support@>=0.4.2 <0.5.0", "from": "source-map-support@>=0.4.2 <0.5.0",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.8.tgz", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.11.tgz",
"dev": true "dev": true
}, },
"spdx-correct": { "spdx-correct": {
@ -3389,9 +3604,9 @@
"dev": true "dev": true
}, },
"sshpk": { "sshpk": {
"version": "1.10.1", "version": "1.10.2",
"from": "sshpk@>=1.7.0 <2.0.0", "from": "sshpk@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"assert-plus": { "assert-plus": {
@ -3457,15 +3672,15 @@
"dev": true "dev": true
}, },
"strip-json-comments": { "strip-json-comments": {
"version": "1.0.4", "version": "2.0.1",
"from": "strip-json-comments@>=1.0.1 <1.1.0", "from": "strip-json-comments@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "3.1.2", "version": "3.2.3",
"from": "supports-color@>=3.1.2 <4.0.0", "from": "supports-color@>=3.2.3 <4.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
"dev": true "dev": true
}, },
"table": { "table": {
@ -3568,9 +3783,9 @@
} }
}, },
"tmp": { "tmp": {
"version": "0.0.28", "version": "0.0.31",
"from": "tmp@>=0.0.28 <0.0.29", "from": "tmp@>=0.0.31 <0.0.32",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
"dev": true "dev": true
}, },
"to-fast-properties": { "to-fast-properties": {
@ -3678,6 +3893,12 @@
"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
"dev": true "dev": true
}, },
"unc-path-regex": {
"version": "0.1.2",
"from": "unc-path-regex@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
"dev": true
},
"underscore.string": { "underscore.string": {
"version": "3.2.3", "version": "3.2.3",
"from": "underscore.string@>=3.2.3 <3.3.0", "from": "underscore.string@>=3.2.3 <3.3.0",
@ -3726,12 +3947,6 @@
"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
"dev": true "dev": true
}, },
"vnu-jar": {
"version": "16.6.29",
"from": "vnu-jar@16.6.29",
"resolved": "https://registry.npmjs.org/vnu-jar/-/vnu-jar-16.6.29.tgz",
"dev": true
},
"walkdir": { "walkdir": {
"version": "0.0.11", "version": "0.0.11",
"from": "walkdir@>=0.0.11 <0.0.12", "from": "walkdir@>=0.0.11 <0.0.12",
@ -3829,15 +4044,23 @@
"dev": true "dev": true
}, },
"yargs": { "yargs": {
"version": "4.8.1", "version": "6.6.0",
"from": "yargs@>=4.7.1 <5.0.0", "from": "yargs@>=6.6.0 <7.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
"dev": true,
"dependencies": {
"camelcase": {
"version": "3.0.0",
"from": "camelcase@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"dev": true "dev": true
}
}
}, },
"yargs-parser": { "yargs-parser": {
"version": "2.4.1", "version": "4.2.1",
"from": "yargs-parser@>=2.4.1 <3.0.0", "from": "yargs-parser@>=4.2.0 <5.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"camelcase": { "camelcase": {
@ -3855,9 +4078,9 @@
"dev": true "dev": true
}, },
"zip-stream": { "zip-stream": {
"version": "1.1.0", "version": "1.1.1",
"from": "zip-stream@>=1.1.0 <2.0.0", "from": "zip-stream@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.0.tgz", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.1.tgz",
"dev": true "dev": true
} }
} }

26
js/tests/vendor/qunit.css vendored
View File

@ -1,12 +1,12 @@
/*! /*!
* QUnit 2.0.1 * QUnit 2.1.1
* https://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* https://jquery.org/license * https://jquery.org/license
* *
* Date: 2016-07-23T19:39Z * Date: 2017-01-06T01:52Z
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
@ -226,7 +226,8 @@
#qunit-tests li.running, #qunit-tests li.running,
#qunit-tests li.pass, #qunit-tests li.pass,
#qunit-tests li.fail, #qunit-tests li.fail,
#qunit-tests li.skipped { #qunit-tests li.skipped,
#qunit-tests li.aborted {
display: list-item; display: list-item;
} }
@ -374,6 +375,9 @@
#qunit-banner.qunit-fail { background-color: #EE5757; } #qunit-banner.qunit-fail { background-color: #EE5757; }
/*** Aborted tests */
#qunit-tests .aborted { color: #000; background-color: orange; }
/*** Skipped tests */ /*** Skipped tests */
#qunit-tests .skipped { #qunit-tests .skipped {
@ -393,16 +397,28 @@
/** Result */ /** Result */
#qunit-testresult { #qunit-testresult {
padding: 0.5em 1em 0.5em 1em;
color: #2B81AF; color: #2B81AF;
background-color: #D2E0E6; background-color: #D2E0E6;
border-bottom: 1px solid #FFF; border-bottom: 1px solid #FFF;
} }
#qunit-testresult .clearfix {
height: 0;
clear: both;
}
#qunit-testresult .module-name { #qunit-testresult .module-name {
font-weight: 700; font-weight: 700;
} }
#qunit-testresult-display {
padding: 0.5em 1em 0.5em 1em;
width: 85%;
float:left;
}
#qunit-testresult-controls {
padding: 0.5em 1em 0.5em 1em;
width: 10%;
float:left;
}
/** Fixture */ /** Fixture */

5753
js/tests/vendor/qunit.js vendored
View File

@ -1,134 +1,211 @@
/*! /*!
* QUnit 2.0.1 * QUnit 2.1.1
* https://qunitjs.com/ * https://qunitjs.com/
* *
* Copyright jQuery Foundation and other contributors * Copyright jQuery Foundation and other contributors
* Released under the MIT license * Released under the MIT license
* https://jquery.org/license * https://jquery.org/license
* *
* Date: 2016-07-23T19:39Z * Date: 2017-01-06T01:52Z
*/ */
(function (global$1) {
'use strict';
( function( global ) { global$1 = 'default' in global$1 ? global$1['default'] : global$1;
var QUnit = {}; var window = global$1.window;
var console = global$1.console;
var setTimeout = global$1.setTimeout;
var clearTimeout = global$1.clearTimeout;
var Date = global.Date; var document = window && window.document;
var now = Date.now || function() { var navigator = window && window.navigator;
return new Date().getTime(); var sessionStorage = window && window.sessionStorage;
};
var setTimeout = global.setTimeout; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
var clearTimeout = global.clearTimeout; return typeof obj;
} : function (obj) {
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};
// Store a local window from the global to allow direct references.
var window = global.window;
var defined = {
document: window && window.document !== undefined,
setTimeout: setTimeout !== undefined,
sessionStorage: ( function() {
var x = "qunit-test-string";
try {
sessionStorage.setItem( x, x );
sessionStorage.removeItem( x );
return true;
} catch ( e ) { var classCallCheck = function (instance, Constructor) {
return false; if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
} }
}() ) };
};
var fileName = ( sourceFromStacktrace( 0 ) || "" ).replace( /(:\d+)+\)?/, "" ).replace( /.+\//, "" ); var createClass = function () {
var globalStartCalled = false; function defineProperties(target, props) {
var runStarted = false; for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
var autorun = false; return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
var toString = Object.prototype.toString,
hasOwn = Object.prototype.hasOwnProperty;
// Returns a new Array with the elements that are in a but not in b
function diff( a, b ) {
var i, j,
var toConsumableArray = function (arr) {
if (Array.isArray(arr)) {
for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
return arr2;
} else {
return Array.from(arr);
}
};
var toString = Object.prototype.toString;
var hasOwn = Object.prototype.hasOwnProperty;
var now = Date.now || function () {
return new Date().getTime();
};
var defined = {
document: window && window.document !== undefined,
setTimeout: setTimeout !== undefined
};
// Returns a new Array with the elements that are in a but not in b
function diff(a, b) {
var i,
j,
result = a.slice(); result = a.slice();
for ( i = 0; i < result.length; i++ ) { for (i = 0; i < result.length; i++) {
for ( j = 0; j < b.length; j++ ) { for (j = 0; j < b.length; j++) {
if ( result[ i ] === b[ j ] ) { if (result[i] === b[j]) {
result.splice( i, 1 ); result.splice(i, 1);
i--; i--;
break; break;
} }
} }
} }
return result; return result;
}
// From jquery.js
function inArray( elem, array ) {
if ( array.indexOf ) {
return array.indexOf( elem );
} }
for ( var i = 0, length = array.length; i < length; i++ ) { // From jquery.js
if ( array[ i ] === elem ) { function inArray(elem, array) {
if (array.indexOf) {
return array.indexOf(elem);
}
for (var i = 0, length = array.length; i < length; i++) {
if (array[i] === elem) {
return i; return i;
} }
} }
return -1; return -1;
} }
/** /**
* Makes a clone of an object using only Array or Object as base, * Makes a clone of an object using only Array or Object as base,
* and copies over the own enumerable properties. * and copies over the own enumerable properties.
* *
* @param {Object} obj * @param {Object} obj
* @return {Object} New object with only the own properties (recursively). * @return {Object} New object with only the own properties (recursively).
*/ */
function objectValues ( obj ) { function objectValues(obj) {
var key, val, var key,
vals = QUnit.is( "array", obj ) ? [] : {}; val,
for ( key in obj ) { vals = is("array", obj) ? [] : {};
if ( hasOwn.call( obj, key ) ) { for (key in obj) {
val = obj[ key ]; if (hasOwn.call(obj, key)) {
vals[ key ] = val === Object( val ) ? objectValues( val ) : val; val = obj[key];
vals[key] = val === Object(val) ? objectValues(val) : val;
} }
} }
return vals; return vals;
} }
function extend( a, b, undefOnly ) { function extend(a, b, undefOnly) {
for ( var prop in b ) { for (var prop in b) {
if ( hasOwn.call( b, prop ) ) { if (hasOwn.call(b, prop)) {
if ( b[ prop ] === undefined ) { if (b[prop] === undefined) {
delete a[ prop ]; delete a[prop];
} else if ( !( undefOnly && typeof a[ prop ] !== "undefined" ) ) { } else if (!(undefOnly && typeof a[prop] !== "undefined")) {
a[ prop ] = b[ prop ]; a[prop] = b[prop];
} }
} }
} }
return a; return a;
} }
function objectType( obj ) { function objectType(obj) {
if ( typeof obj === "undefined" ) { if (typeof obj === "undefined") {
return "undefined"; return "undefined";
} }
// Consider: typeof null === object // Consider: typeof null === object
if ( obj === null ) { if (obj === null) {
return "null"; return "null";
} }
var match = toString.call( obj ).match( /^\[object\s(.*)\]$/ ), var match = toString.call(obj).match(/^\[object\s(.*)\]$/),
type = match && match[ 1 ]; type = match && match[1];
switch ( type ) { switch (type) {
case "Number": case "Number":
if ( isNaN( obj ) ) { if (isNaN(obj)) {
return "nan"; return "nan";
} }
return "number"; return "number";
@ -143,66 +220,284 @@ function objectType( obj ) {
case "Symbol": case "Symbol":
return type.toLowerCase(); return type.toLowerCase();
} }
if ( typeof obj === "object" ) {
if ((typeof obj === "undefined" ? "undefined" : _typeof(obj)) === "object") {
return "object"; return "object";
} }
}
// Safe object type checking
function is( type, obj ) {
return QUnit.objectType( obj ) === type;
}
// Doesn't support IE9, it will return undefined on these browsers
// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
function extractStacktrace( e, offset ) {
offset = offset === undefined ? 4 : offset;
var stack, include, i;
if ( e.stack ) {
stack = e.stack.split( "\n" );
if ( /^error$/i.test( stack[ 0 ] ) ) {
stack.shift();
} }
if ( fileName ) {
include = []; // Safe object type checking
for ( i = offset; i < stack.length; i++ ) { function is(type, obj) {
if ( stack[ i ].indexOf( fileName ) !== -1 ) { return objectType(obj) === type;
}
// Test for equality any JavaScript type.
// Author: Philippe Rathé <prathe@gmail.com>
var equiv = (function () {
// Stack to decide between skip/abort functions
var callers = [];
// Stack to avoiding loops from circular referencing
var parents = [];
var parentsB = [];
var getProto = Object.getPrototypeOf || function (obj) {
return obj.__proto__;
};
function useStrictEquality(b, a) {
// To catch short annotation VS 'new' annotation of a declaration. e.g.:
// `var i = 1;`
// `var j = new Number(1);`
if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") {
a = a.valueOf();
}
if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") {
b = b.valueOf();
}
return a === b;
}
function compareConstructors(a, b) {
var protoA = getProto(a);
var protoB = getProto(b);
// Comparing constructors is more strict than using `instanceof`
if (a.constructor === b.constructor) {
return true;
}
// Ref #851
// If the obj prototype descends from a null constructor, treat it
// as a null prototype.
if (protoA && protoA.constructor === null) {
protoA = null;
}
if (protoB && protoB.constructor === null) {
protoB = null;
}
// Allow objects with no prototype to be equivalent to
// objects with Object as their constructor.
if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) {
return true;
}
return false;
}
function getRegExpFlags(regexp) {
return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0];
}
var callbacks = {
"string": useStrictEquality,
"boolean": useStrictEquality,
"number": useStrictEquality,
"null": useStrictEquality,
"undefined": useStrictEquality,
"symbol": useStrictEquality,
"date": useStrictEquality,
"nan": function nan() {
return true;
},
"regexp": function regexp(b, a) {
return a.source === b.source &&
// Include flags in the comparison
getRegExpFlags(a) === getRegExpFlags(b);
},
// - skip when the property is a method of an instance (OOP)
// - abort otherwise,
// initial === would have catch identical references anyway
"function": function _function(b, a) {
var caller = callers[callers.length - 1];
return caller !== Object && typeof caller !== "undefined" && a.toString() === b.toString();
},
"array": function array(b, a) {
var i, j, len, loop, aCircular, bCircular;
len = a.length;
if (len !== b.length) {
// Safe and faster
return false;
}
// Track reference to avoid circular references
parents.push(a);
parentsB.push(b);
for (i = 0; i < len; i++) {
loop = false;
for (j = 0; j < parents.length; j++) {
aCircular = parents[j] === a[i];
bCircular = parentsB[j] === b[i];
if (aCircular || bCircular) {
if (a[i] === b[i] || aCircular && bCircular) {
loop = true;
} else {
parents.pop();
parentsB.pop();
return false;
}
}
}
if (!loop && !innerEquiv(a[i], b[i])) {
parents.pop();
parentsB.pop();
return false;
}
}
parents.pop();
parentsB.pop();
return true;
},
"set": function set$$1(b, a) {
var innerEq,
outerEq = true;
if (a.size !== b.size) {
return false;
}
a.forEach(function (aVal) {
innerEq = false;
b.forEach(function (bVal) {
if (innerEquiv(bVal, aVal)) {
innerEq = true;
}
});
if (!innerEq) {
outerEq = false;
}
});
return outerEq;
},
"map": function map(b, a) {
var innerEq,
outerEq = true;
if (a.size !== b.size) {
return false;
}
a.forEach(function (aVal, aKey) {
innerEq = false;
b.forEach(function (bVal, bKey) {
if (innerEquiv([bVal, bKey], [aVal, aKey])) {
innerEq = true;
}
});
if (!innerEq) {
outerEq = false;
}
});
return outerEq;
},
"object": function object(b, a) {
var i, j, loop, aCircular, bCircular;
// Default to true
var eq = true;
var aProperties = [];
var bProperties = [];
if (compareConstructors(a, b) === false) {
return false;
}
// Stack constructor before traversing properties
callers.push(a.constructor);
// Track reference to avoid circular references
parents.push(a);
parentsB.push(b);
// Be strict: don't ensure hasOwnProperty and go deep
for (i in a) {
loop = false;
for (j = 0; j < parents.length; j++) {
aCircular = parents[j] === a[i];
bCircular = parentsB[j] === b[i];
if (aCircular || bCircular) {
if (a[i] === b[i] || aCircular && bCircular) {
loop = true;
} else {
eq = false;
break; break;
} }
include.push( stack[ i ] );
}
if ( include.length ) {
return include.join( "\n" );
} }
} }
return stack[ offset ]; aProperties.push(i);
} if (!loop && !innerEquiv(a[i], b[i])) {
} eq = false;
break;
function sourceFromStacktrace( offset ) {
var error = new Error();
// Support: Safari <=7 only, IE <=10 - 11 only
// Not all browsers generate the `stack` property for `new Error()`, see also #636
if ( !error.stack ) {
try {
throw error;
} catch ( err ) {
error = err;
} }
} }
return extractStacktrace( error, offset ); parents.pop();
} parentsB.pop();
/** // Unstack, we are done
callers.pop();
for (i in b) {
// Collect b's properties
bProperties.push(i);
}
// Ensures identical properties name
return eq && innerEquiv(aProperties.sort(), bProperties.sort());
}
};
function typeEquiv(a, b) {
var type = objectType(a);
return objectType(b) === type && callbacks[type](b, a);
}
// The real equiv function
function innerEquiv(a, b) {
// We're done when there's nothing more to compare
if (arguments.length < 2) {
return true;
}
// Require type-specific equality
return (a === b || typeEquiv(a, b)) && (
// ...across all consecutive argument pairs
arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1)));
}
return innerEquiv;
})();
/**
* Config object: Maintain internal state * Config object: Maintain internal state
* Later exposed as QUnit.config * Later exposed as QUnit.config
* `config` initialized at top of scope * `config` initialized at top of scope
*/ */
var config = { var config = {
// The queue of tests to run // The queue of tests to run
queue: [], queue: [],
@ -242,1684 +537,73 @@ var config = {
// The first unnamed module // The first unnamed module
currentModule: { currentModule: {
name: "", name: "",
tests: []
},
callbacks: {}
};
// Push a loose unnamed module to the modules collection
config.modules.push( config.currentModule );
// Register logging callbacks
function registerLoggingCallbacks( obj ) {
var i, l, key,
callbackNames = [ "begin", "done", "log", "testStart", "testDone",
"moduleStart", "moduleDone" ];
function registerLoggingCallback( key ) {
var loggingCallback = function( callback ) {
if ( objectType( callback ) !== "function" ) {
throw new Error(
"QUnit logging methods require a callback function as their first parameters."
);
}
config.callbacks[ key ].push( callback );
};
return loggingCallback;
}
for ( i = 0, l = callbackNames.length; i < l; i++ ) {
key = callbackNames[ i ];
// Initialize key collection of logging callback
if ( objectType( config.callbacks[ key ] ) === "undefined" ) {
config.callbacks[ key ] = [];
}
obj[ key ] = registerLoggingCallback( key );
}
}
function runLoggingCallbacks( key, args ) {
var i, l, callbacks;
callbacks = config.callbacks[ key ];
for ( i = 0, l = callbacks.length; i < l; i++ ) {
callbacks[ i ]( args );
}
}
( function() {
if ( !defined.document ) {
return;
}
// `onErrorFnPrev` initialized at top of scope
// Preserve other handlers
var onErrorFnPrev = window.onerror;
// Cover uncaught exceptions
// Returning true will suppress the default browser handler,
// returning false will let it run.
window.onerror = function( error, filePath, linerNr ) {
var ret = false;
if ( onErrorFnPrev ) {
ret = onErrorFnPrev( error, filePath, linerNr );
}
// Treat return value as window.onerror itself does,
// Only do our handling if not suppressed.
if ( ret !== true ) {
if ( QUnit.config.current ) {
if ( QUnit.config.current.ignoreGlobalErrors ) {
return true;
}
QUnit.pushFailure( error, filePath + ":" + linerNr );
} else {
QUnit.test( "global failure", extend( function() {
QUnit.pushFailure( error, filePath + ":" + linerNr );
}, { validTest: true } ) );
}
return false;
}
return ret;
};
}() );
// Figure out if we're running the tests from a server or not
QUnit.isLocal = !( defined.document && window.location.protocol !== "file:" );
// Expose the current QUnit version
QUnit.version = "2.0.1";
extend( QUnit, {
// Call on start of module test to prepend name to all tests
module: function( name, testEnvironment, executeNow ) {
var module, moduleFns;
var currentModule = config.currentModule;
if ( arguments.length === 2 ) {
if ( objectType( testEnvironment ) === "function" ) {
executeNow = testEnvironment;
testEnvironment = undefined;
}
}
module = createModule();
if ( testEnvironment && ( testEnvironment.setup || testEnvironment.teardown ) ) {
console.warn(
"Module's `setup` and `teardown` are not hooks anymore on QUnit 2.0, use " +
"`beforeEach` and `afterEach` instead\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
}
moduleFns = {
before: setHook( module, "before" ),
beforeEach: setHook( module, "beforeEach" ),
afterEach: setHook( module, "afterEach" ),
after: setHook( module, "after" )
};
if ( objectType( executeNow ) === "function" ) {
config.moduleStack.push( module );
setCurrentModule( module );
executeNow.call( module.testEnvironment, moduleFns );
config.moduleStack.pop();
module = module.parentModule || currentModule;
}
setCurrentModule( module );
function createModule() {
var parentModule = config.moduleStack.length ?
config.moduleStack.slice( -1 )[ 0 ] : null;
var moduleName = parentModule !== null ?
[ parentModule.name, name ].join( " > " ) : name;
var module = {
name: moduleName,
parentModule: parentModule,
tests: [], tests: [],
moduleId: generateHash( moduleName ), childModules: [],
testsRun: 0 testsRun: 0
},
callbacks: {},
// The storage module to use for reordering tests
storage: sessionStorage
}; };
var env = {}; // take a predefined QUnit.config and extend the defaults
if ( parentModule ) { var globalConfig = window && window.QUnit && window.QUnit.config;
parentModule.childModule = module;
extend( env, parentModule.testEnvironment );
delete env.beforeEach;
delete env.afterEach;
}
extend( env, testEnvironment );
module.testEnvironment = env;
config.modules.push( module );
return module;
}
function setCurrentModule( module ) {
config.currentModule = module;
}
},
test: test,
skip: skip,
only: only,
start: function( count ) {
var globalStartAlreadyCalled = globalStartCalled;
if ( !config.current ) {
globalStartCalled = true;
if ( runStarted ) {
throw new Error( "Called start() while test already started running" );
} else if ( globalStartAlreadyCalled || count > 1 ) {
throw new Error( "Called start() outside of a test context too many times" );
} else if ( config.autostart ) {
throw new Error( "Called start() outside of a test context when " +
"QUnit.config.autostart was true" );
} else if ( !config.pageLoaded ) {
// The page isn't completely loaded yet, so bail out and let `QUnit.load` handle it
config.autostart = true;
return;
}
} else {
throw new Error(
"QUnit.start cannot be called inside a test context. This feature is removed in " +
"QUnit 2.0. For async tests, use QUnit.test() with assert.async() instead.\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
}
scheduleBegin();
},
config: config,
is: is,
objectType: objectType,
extend: extend,
load: function() {
config.pageLoaded = true;
// Initialize the configuration options
extend( config, {
stats: { all: 0, bad: 0 },
moduleStats: { all: 0, bad: 0 },
started: 0,
updateRate: 1000,
autostart: true,
filter: ""
}, true );
if ( !runStarted ) {
config.blocking = false;
if ( config.autostart ) {
scheduleBegin();
}
}
},
stack: function( offset ) {
offset = ( offset || 0 ) + 2;
return sourceFromStacktrace( offset );
}
} );
registerLoggingCallbacks( QUnit );
function scheduleBegin() {
runStarted = true;
// Add a slight delay to allow definition of more modules and tests.
if ( defined.setTimeout ) {
setTimeout( function() {
begin();
}, 13 );
} else {
begin();
}
}
function begin() {
var i, l,
modulesLog = [];
// If the test run hasn't officially begun yet
if ( !config.started ) {
// Record the time of the test run's beginning
config.started = now();
// Delete the loose unnamed module if unused.
if ( config.modules[ 0 ].name === "" && config.modules[ 0 ].tests.length === 0 ) {
config.modules.shift();
}
// Avoid unnecessary information by not logging modules' test environments
for ( i = 0, l = config.modules.length; i < l; i++ ) {
modulesLog.push( {
name: config.modules[ i ].name,
tests: config.modules[ i ].tests
} );
}
// The test run is officially beginning now
runLoggingCallbacks( "begin", {
totalTests: Test.count,
modules: modulesLog
} );
}
config.blocking = false;
process( true );
}
function process( last ) {
function next() {
process( last );
}
var start = now();
config.depth = ( config.depth || 0 ) + 1;
while ( config.queue.length && !config.blocking ) {
if ( !defined.setTimeout || config.updateRate <= 0 ||
( ( now() - start ) < config.updateRate ) ) {
if ( config.current ) {
// Reset async tracking for each phase of the Test lifecycle
config.current.usedAsync = false;
}
config.queue.shift()();
} else {
setTimeout( next, 13 );
break;
}
}
config.depth--;
if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
done();
}
}
function done() {
var runtime, passed;
autorun = true;
// Log the last module results
if ( config.previousModule ) {
runLoggingCallbacks( "moduleDone", {
name: config.previousModule.name,
tests: config.previousModule.tests,
failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all,
runtime: now() - config.moduleStats.started
} );
}
delete config.previousModule;
runtime = now() - config.started;
passed = config.stats.all - config.stats.bad;
runLoggingCallbacks( "done", {
failed: config.stats.bad,
passed: passed,
total: config.stats.all,
runtime: runtime
} );
}
function setHook( module, hookName ) {
if ( module.testEnvironment === undefined ) {
module.testEnvironment = {};
}
return function( callback ) {
module.testEnvironment[ hookName ] = callback;
};
}
var unitSampler,
focused = false,
priorityCount = 0;
function Test( settings ) {
var i, l;
++Test.count;
this.expected = null;
extend( this, settings );
this.assertions = [];
this.semaphore = 0;
this.usedAsync = false;
this.module = config.currentModule;
this.stack = sourceFromStacktrace( 3 );
// Register unique strings
for ( i = 0, l = this.module.tests; i < l.length; i++ ) {
if ( this.module.tests[ i ].name === this.testName ) {
this.testName += " ";
}
}
this.testId = generateHash( this.module.name, this.testName );
this.module.tests.push( {
name: this.testName,
testId: this.testId
} );
if ( settings.skip ) {
// Skipped tests will fully ignore any sent callback
this.callback = function() {};
this.async = false;
this.expected = 0;
} else {
this.assert = new Assert( this );
}
}
Test.count = 0;
Test.prototype = {
before: function() {
if (
// Emit moduleStart when we're switching from one module to another
this.module !== config.previousModule ||
// They could be equal (both undefined) but if the previousModule property doesn't
// yet exist it means this is the first test in a suite that isn't wrapped in a
// module, in which case we'll just emit a moduleStart event for 'undefined'.
// Without this, reporters can get testStart before moduleStart which is a problem.
!hasOwn.call( config, "previousModule" )
) {
if ( hasOwn.call( config, "previousModule" ) ) {
runLoggingCallbacks( "moduleDone", {
name: config.previousModule.name,
tests: config.previousModule.tests,
failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all,
runtime: now() - config.moduleStats.started
} );
}
config.previousModule = this.module;
config.moduleStats = { all: 0, bad: 0, started: now() };
runLoggingCallbacks( "moduleStart", {
name: this.module.name,
tests: this.module.tests
} );
}
config.current = this;
if ( this.module.testEnvironment ) {
delete this.module.testEnvironment.before;
delete this.module.testEnvironment.beforeEach;
delete this.module.testEnvironment.afterEach;
delete this.module.testEnvironment.after;
}
this.testEnvironment = extend( {}, this.module.testEnvironment );
this.started = now();
runLoggingCallbacks( "testStart", {
name: this.testName,
module: this.module.name,
testId: this.testId
} );
if ( !config.pollution ) {
saveGlobal();
}
},
run: function() {
var promise;
config.current = this;
this.callbackStarted = now();
if ( config.notrycatch ) {
runTest( this );
return;
}
try {
runTest( this );
} catch ( e ) {
this.pushFailure( "Died on test #" + ( this.assertions.length + 1 ) + " " +
this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
// Else next test will carry the responsibility
saveGlobal();
// Restart the tests if they're blocking
if ( config.blocking ) {
internalRecover( this );
}
}
function runTest( test ) {
promise = test.callback.call( test.testEnvironment, test.assert );
test.resolvePromise( promise );
}
},
after: function() {
checkPollution();
},
queueHook: function( hook, hookName, hookOwner ) {
var promise,
test = this;
return function runHook() {
if ( hookName === "before" ) {
if ( hookOwner.testsRun !== 0 ) {
return;
}
test.preserveEnvironment = true;
}
if ( hookName === "after" && hookOwner.testsRun !== numberOfTests( hookOwner ) - 1 ) {
return;
}
config.current = test;
if ( config.notrycatch ) {
callHook();
return;
}
try {
callHook();
} catch ( error ) {
test.pushFailure( hookName + " failed on " + test.testName + ": " +
( error.message || error ), extractStacktrace( error, 0 ) );
}
function callHook() {
promise = hook.call( test.testEnvironment, test.assert );
test.resolvePromise( promise, hookName );
}
};
},
// Currently only used for module level hooks, can be used to add global level ones
hooks: function( handler ) {
var hooks = [];
function processHooks( test, module ) {
if ( module.parentModule ) {
processHooks( test, module.parentModule );
}
if ( module.testEnvironment &&
QUnit.objectType( module.testEnvironment[ handler ] ) === "function" ) {
hooks.push( test.queueHook( module.testEnvironment[ handler ], handler, module ) );
}
}
// Hooks are ignored on skipped tests
if ( !this.skip ) {
processHooks( this, this.module );
}
return hooks;
},
finish: function() {
config.current = this;
if ( config.requireExpects && this.expected === null ) {
this.pushFailure( "Expected number of assertions to be defined, but expect() was " +
"not called.", this.stack );
} else if ( this.expected !== null && this.expected !== this.assertions.length ) {
this.pushFailure( "Expected " + this.expected + " assertions, but " +
this.assertions.length + " were run", this.stack );
} else if ( this.expected === null && !this.assertions.length ) {
this.pushFailure( "Expected at least one assertion, but none were run - call " +
"expect(0) to accept zero assertions.", this.stack );
}
var i,
skipped = !!this.skip,
bad = 0;
this.runtime = now() - this.started;
config.stats.all += this.assertions.length;
config.moduleStats.all += this.assertions.length;
for ( i = 0; i < this.assertions.length; i++ ) {
if ( !this.assertions[ i ].result ) {
bad++;
config.stats.bad++;
config.moduleStats.bad++;
}
}
notifyTestsRan( this.module );
runLoggingCallbacks( "testDone", {
name: this.testName,
module: this.module.name,
skipped: skipped,
failed: bad,
passed: this.assertions.length - bad,
total: this.assertions.length,
runtime: skipped ? 0 : this.runtime,
// HTML Reporter use
assertions: this.assertions,
testId: this.testId,
// Source of Test
source: this.stack
} );
config.current = undefined;
},
preserveTestEnvironment: function() {
if ( this.preserveEnvironment ) {
this.module.testEnvironment = this.testEnvironment;
this.testEnvironment = extend( {}, this.module.testEnvironment );
}
},
queue: function() {
var priority,
test = this;
if ( !this.valid() ) {
return;
}
function run() {
// Each of these can by async
synchronize( [
function() {
test.before();
},
test.hooks( "before" ),
function() {
test.preserveTestEnvironment();
},
test.hooks( "beforeEach" ),
function() {
test.run();
},
test.hooks( "afterEach" ).reverse(),
test.hooks( "after" ).reverse(),
function() {
test.after();
},
function() {
test.finish();
}
] );
}
// Prioritize previously failed tests, detected from sessionStorage
priority = QUnit.config.reorder && defined.sessionStorage &&
+sessionStorage.getItem( "qunit-test-" + this.module.name + "-" + this.testName );
return synchronize( run, priority, config.seed );
},
pushResult: function( resultInfo ) {
// Destructure of resultInfo = { result, actual, expected, message, negative }
var source,
details = {
module: this.module.name,
name: this.testName,
result: resultInfo.result,
message: resultInfo.message,
actual: resultInfo.actual,
expected: resultInfo.expected,
testId: this.testId,
negative: resultInfo.negative || false,
runtime: now() - this.started
};
if ( !resultInfo.result ) {
source = sourceFromStacktrace();
if ( source ) {
details.source = source;
}
}
runLoggingCallbacks( "log", details );
this.assertions.push( {
result: !!resultInfo.result,
message: resultInfo.message
} );
},
pushFailure: function( message, source, actual ) {
if ( !( this instanceof Test ) ) {
throw new Error( "pushFailure() assertion outside test context, was " +
sourceFromStacktrace( 2 ) );
}
var details = {
module: this.module.name,
name: this.testName,
result: false,
message: message || "error",
actual: actual || null,
testId: this.testId,
runtime: now() - this.started
};
if ( source ) {
details.source = source;
}
runLoggingCallbacks( "log", details );
this.assertions.push( {
result: false,
message: message
} );
},
resolvePromise: function( promise, phase ) {
var then, resume, message,
test = this;
if ( promise != null ) {
then = promise.then;
if ( QUnit.objectType( then ) === "function" ) {
resume = internalStop( test );
then.call(
promise,
function() { resume(); },
function( error ) {
message = "Promise rejected " +
( !phase ? "during" : phase.replace( /Each$/, "" ) ) +
" " + test.testName + ": " + ( error.message || error );
test.pushFailure( message, extractStacktrace( error, 0 ) );
// Else next test will carry the responsibility
saveGlobal();
// Unblock
resume();
}
);
}
}
},
valid: function() {
var filter = config.filter,
regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec( filter ),
module = config.module && config.module.toLowerCase(),
fullName = ( this.module.name + ": " + this.testName );
function moduleChainNameMatch( testModule ) {
var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
if ( testModuleName === module ) {
return true;
} else if ( testModule.parentModule ) {
return moduleChainNameMatch( testModule.parentModule );
} else {
return false;
}
}
function moduleChainIdMatch( testModule ) {
return inArray( testModule.moduleId, config.moduleId ) > -1 ||
testModule.parentModule && moduleChainIdMatch( testModule.parentModule );
}
// Internally-generated tests are always valid
if ( this.callback && this.callback.validTest ) {
return true;
}
if ( config.moduleId && config.moduleId.length > 0 &&
!moduleChainIdMatch( this.module ) ) {
return false;
}
if ( config.testId && config.testId.length > 0 &&
inArray( this.testId, config.testId ) < 0 ) {
return false;
}
if ( module && !moduleChainNameMatch( this.module ) ) {
return false;
}
if ( !filter ) {
return true;
}
return regexFilter ?
this.regexFilter( !!regexFilter[ 1 ], regexFilter[ 2 ], regexFilter[ 3 ], fullName ) :
this.stringFilter( filter, fullName );
},
regexFilter: function( exclude, pattern, flags, fullName ) {
var regex = new RegExp( pattern, flags );
var match = regex.test( fullName );
return match !== exclude;
},
stringFilter: function( filter, fullName ) {
filter = filter.toLowerCase();
fullName = fullName.toLowerCase();
var include = filter.charAt( 0 ) !== "!";
if ( !include ) {
filter = filter.slice( 1 );
}
// If the filter matches, we need to honour include
if ( fullName.indexOf( filter ) !== -1 ) {
return include;
}
// Otherwise, do the opposite
return !include;
}
};
QUnit.pushFailure = function() {
if ( !QUnit.config.current ) {
throw new Error( "pushFailure() assertion outside test context, in " +
sourceFromStacktrace( 2 ) );
}
// Gets current test obj
var currentTest = QUnit.config.current;
return currentTest.pushFailure.apply( currentTest, arguments );
};
// Based on Java's String.hashCode, a simple but not
// rigorously collision resistant hashing function
function generateHash( module, testName ) {
var hex,
i = 0,
hash = 0,
str = module + "\x1C" + testName,
len = str.length;
for ( ; i < len; i++ ) {
hash = ( ( hash << 5 ) - hash ) + str.charCodeAt( i );
hash |= 0;
}
// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
// strictly necessary but increases user understanding that the id is a SHA-like hash
hex = ( 0x100000000 + hash ).toString( 16 );
if ( hex.length < 8 ) {
hex = "0000000" + hex;
}
return hex.slice( -8 );
}
function synchronize( callback, priority, seed ) {
var last = !priority,
index;
if ( QUnit.objectType( callback ) === "array" ) {
while ( callback.length ) {
synchronize( callback.shift() );
}
return;
}
if ( priority ) {
config.queue.splice( priorityCount++, 0, callback );
} else if ( seed ) {
if ( !unitSampler ) {
unitSampler = unitSamplerGenerator( seed );
}
// Insert into a random position after all priority items
index = Math.floor( unitSampler() * ( config.queue.length - priorityCount + 1 ) );
config.queue.splice( priorityCount + index, 0, callback );
} else {
config.queue.push( callback );
}
if ( autorun && !config.blocking ) {
process( last );
}
}
function unitSamplerGenerator( seed ) {
// 32-bit xorshift, requires only a nonzero seed
// http://excamera.com/sphinx/article-xorshift.html
var sample = parseInt( generateHash( seed ), 16 ) || -1;
return function() {
sample ^= sample << 13;
sample ^= sample >>> 17;
sample ^= sample << 5;
// ECMAScript has no unsigned number type
if ( sample < 0 ) {
sample += 0x100000000;
}
return sample / 0x100000000;
};
}
function saveGlobal() {
config.pollution = [];
if ( config.noglobals ) {
for ( var key in global ) {
if ( hasOwn.call( global, key ) ) {
// In Opera sometimes DOM element ids show up here, ignore them
if ( /^qunit-test-output/.test( key ) ) {
continue;
}
config.pollution.push( key );
}
}
}
}
function checkPollution() {
var newGlobals,
deletedGlobals,
old = config.pollution;
saveGlobal();
newGlobals = diff( config.pollution, old );
if ( newGlobals.length > 0 ) {
QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join( ", " ) );
}
deletedGlobals = diff( old, config.pollution );
if ( deletedGlobals.length > 0 ) {
QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join( ", " ) );
}
}
// Will be exposed as QUnit.test
function test( testName, callback ) {
if ( focused ) { return; }
var newTest;
newTest = new Test( {
testName: testName,
callback: callback
} );
newTest.queue();
}
// Will be exposed as QUnit.skip
function skip( testName ) {
if ( focused ) { return; }
var test = new Test( {
testName: testName,
skip: true
} );
test.queue();
}
// Will be exposed as QUnit.only
function only( testName, callback ) {
var newTest;
if ( focused ) { return; }
QUnit.config.queue.length = 0;
focused = true;
newTest = new Test( {
testName: testName,
callback: callback
} );
newTest.queue();
}
// Put a hold on processing and return a function that will release it.
function internalStop( test ) {
var released = false;
test.semaphore += 1;
config.blocking = true;
// Set a recovery timeout, if so configured.
if ( config.testTimeout && defined.setTimeout ) {
clearTimeout( config.timeout );
config.timeout = setTimeout( function() {
QUnit.pushFailure( "Test timed out", sourceFromStacktrace( 2 ) );
internalRecover( test );
}, config.testTimeout );
}
return function resume() {
if ( released ) {
return;
}
released = true;
test.semaphore -= 1;
internalStart( test );
};
}
// Forcefully release all processing holds.
function internalRecover( test ) {
test.semaphore = 0;
internalStart( test );
}
// Release a processing hold, scheduling a resumption attempt if no holds remain.
function internalStart( test ) {
// If semaphore is non-numeric, throw error
if ( isNaN( test.semaphore ) ) {
test.semaphore = 0;
QUnit.pushFailure(
"Invalid value on test.semaphore",
sourceFromStacktrace( 2 )
);
return;
}
// Don't start until equal number of stop-calls
if ( test.semaphore > 0 ) {
return;
}
// Throw an Error if start is called more often than stop
if ( test.semaphore < 0 ) {
test.semaphore = 0;
QUnit.pushFailure(
"Tried to restart test while already started (test's semaphore was 0 already)",
sourceFromStacktrace( 2 )
);
return;
}
// Add a slight delay to allow more assertions etc.
if ( defined.setTimeout ) {
if ( config.timeout ) {
clearTimeout( config.timeout );
}
config.timeout = setTimeout( function() {
if ( test.semaphore > 0 ) {
return;
}
if ( config.timeout ) {
clearTimeout( config.timeout );
}
begin();
}, 13 );
} else {
begin();
}
}
function numberOfTests( module ) {
var count = module.tests.length;
while ( module = module.childModule ) {
count += module.tests.length;
}
return count;
}
function notifyTestsRan( module ) {
module.testsRun++;
while ( module = module.parentModule ) {
module.testsRun++;
}
}
function Assert( testContext ) {
this.test = testContext;
}
// Assert helpers
QUnit.assert = Assert.prototype = {
// Specify the number of expected assertions to guarantee that failed test
// (no assertions are run at all) don't slip through.
expect: function( asserts ) {
if ( arguments.length === 1 ) {
this.test.expected = asserts;
} else {
return this.test.expected;
}
},
// Put a hold on processing and return a function that will release it a maximum of once.
async: function( count ) {
var resume,
test = this.test,
popped = false,
acceptCallCount = count;
if ( typeof acceptCallCount === "undefined" ) {
acceptCallCount = 1;
}
test.usedAsync = true;
resume = internalStop( test );
return function done() {
if ( popped ) {
test.pushFailure( "Too many calls to the `assert.async` callback",
sourceFromStacktrace( 2 ) );
return;
}
acceptCallCount -= 1;
if ( acceptCallCount > 0 ) {
return;
}
popped = true;
resume();
};
},
// Exports test.push() to the user API
// Alias of pushResult.
push: function( result, actual, expected, message, negative ) {
var currentAssert = this instanceof Assert ? this : QUnit.config.current.assert;
return currentAssert.pushResult( {
result: result,
actual: actual,
expected: expected,
message: message,
negative: negative
} );
},
pushResult: function( resultInfo ) {
// Destructure of resultInfo = { result, actual, expected, message, negative }
var assert = this,
currentTest = ( assert instanceof Assert && assert.test ) || QUnit.config.current;
// Backwards compatibility fix.
// Allows the direct use of global exported assertions and QUnit.assert.*
// Although, it's use is not recommended as it can leak assertions
// to other tests from async tests, because we only get a reference to the current test,
// not exactly the test where assertion were intended to be called.
if ( !currentTest ) {
throw new Error( "assertion outside test context, in " + sourceFromStacktrace( 2 ) );
}
if ( currentTest.usedAsync === true && currentTest.semaphore === 0 ) {
currentTest.pushFailure( "Assertion after the final `assert.async` was resolved",
sourceFromStacktrace( 2 ) );
// Allow this assertion to continue running anyway...
}
if ( !( assert instanceof Assert ) ) {
assert = currentTest.assert;
}
return assert.test.pushResult( resultInfo );
},
ok: function( result, message ) {
message = message || ( result ? "okay" : "failed, expected argument to be truthy, was: " +
QUnit.dump.parse( result ) );
this.pushResult( {
result: !!result,
actual: result,
expected: true,
message: message
} );
},
notOk: function( result, message ) {
message = message || ( !result ? "okay" : "failed, expected argument to be falsy, was: " +
QUnit.dump.parse( result ) );
this.pushResult( {
result: !result,
actual: result,
expected: false,
message: message
} );
},
equal: function( actual, expected, message ) {
/*jshint eqeqeq:false */
this.pushResult( {
result: expected == actual,
actual: actual,
expected: expected,
message: message
} );
},
notEqual: function( actual, expected, message ) {
/*jshint eqeqeq:false */
this.pushResult( {
result: expected != actual,
actual: actual,
expected: expected,
message: message,
negative: true
} );
},
propEqual: function( actual, expected, message ) {
actual = objectValues( actual );
expected = objectValues( expected );
this.pushResult( {
result: QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message
} );
},
notPropEqual: function( actual, expected, message ) {
actual = objectValues( actual );
expected = objectValues( expected );
this.pushResult( {
result: !QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message,
negative: true
} );
},
deepEqual: function( actual, expected, message ) {
this.pushResult( {
result: QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message
} );
},
notDeepEqual: function( actual, expected, message ) {
this.pushResult( {
result: !QUnit.equiv( actual, expected ),
actual: actual,
expected: expected,
message: message,
negative: true
} );
},
strictEqual: function( actual, expected, message ) {
this.pushResult( {
result: expected === actual,
actual: actual,
expected: expected,
message: message
} );
},
notStrictEqual: function( actual, expected, message ) {
this.pushResult( {
result: expected !== actual,
actual: actual,
expected: expected,
message: message,
negative: true
} );
},
"throws": function( block, expected, message ) {
var actual, expectedType,
expectedOutput = expected,
ok = false,
currentTest = ( this instanceof Assert && this.test ) || QUnit.config.current;
// 'expected' is optional unless doing string comparison
if ( QUnit.objectType( expected ) === "string" ) {
if ( message == null ) {
message = expected;
expected = null;
} else {
throw new Error(
"throws/raises does not accept a string value for the expected argument.\n" +
"Use a non-string object value (e.g. regExp) instead if it's necessary." +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
}
}
currentTest.ignoreGlobalErrors = true;
try {
block.call( currentTest.testEnvironment );
} catch ( e ) {
actual = e;
}
currentTest.ignoreGlobalErrors = false;
if ( actual ) {
expectedType = QUnit.objectType( expected );
// We don't want to validate thrown error
if ( !expected ) {
ok = true;
expectedOutput = null;
// Expected is a regexp
} else if ( expectedType === "regexp" ) {
ok = expected.test( errorString( actual ) );
// Expected is a constructor, maybe an Error constructor
} else if ( expectedType === "function" && actual instanceof expected ) {
ok = true;
// Expected is an Error object
} else if ( expectedType === "object" ) {
ok = actual instanceof expected.constructor &&
actual.name === expected.name &&
actual.message === expected.message;
// Expected is a validation function which returns true if validation passed
} else if ( expectedType === "function" && expected.call( {}, actual ) === true ) {
expectedOutput = null;
ok = true;
}
}
currentTest.assert.pushResult( {
result: ok,
actual: actual,
expected: expectedOutput,
message: message
} );
}
};
// Provide an alternative to assert.throws(), for environments that consider throws a reserved word
// Known to us are: Closure Compiler, Narwhal
( function() {
/*jshint sub:true */
Assert.prototype.raises = Assert.prototype [ "throws" ]; //jscs:ignore requireDotNotation
}() );
function errorString( error ) {
var name, message,
resultErrorString = error.toString();
if ( resultErrorString.substring( 0, 7 ) === "[object" ) {
name = error.name ? error.name.toString() : "Error";
message = error.message ? error.message.toString() : "";
if ( name && message ) {
return name + ": " + message;
} else if ( name ) {
return name;
} else if ( message ) {
return message;
} else {
return "Error";
}
} else {
return resultErrorString;
}
}
// Test for equality any JavaScript type.
// Author: Philippe Rathé <prathe@gmail.com>
QUnit.equiv = ( function() {
// Stack to decide between skip/abort functions
var callers = [];
// Stack to avoiding loops from circular referencing
var parents = [];
var parentsB = [];
var getProto = Object.getPrototypeOf || function( obj ) {
/*jshint proto: true */
return obj.__proto__;
};
function useStrictEquality( b, a ) {
// To catch short annotation VS 'new' annotation of a declaration. e.g.:
// `var i = 1;`
// `var j = new Number(1);`
if ( typeof a === "object" ) {
a = a.valueOf();
}
if ( typeof b === "object" ) {
b = b.valueOf();
}
return a === b;
}
function compareConstructors( a, b ) {
var protoA = getProto( a );
var protoB = getProto( b );
// Comparing constructors is more strict than using `instanceof`
if ( a.constructor === b.constructor ) {
return true;
}
// Ref #851
// If the obj prototype descends from a null constructor, treat it
// as a null prototype.
if ( protoA && protoA.constructor === null ) {
protoA = null;
}
if ( protoB && protoB.constructor === null ) {
protoB = null;
}
// Allow objects with no prototype to be equivalent to
// objects with Object as their constructor.
if ( ( protoA === null && protoB === Object.prototype ) ||
( protoB === null && protoA === Object.prototype ) ) {
return true;
}
return false;
}
function getRegExpFlags( regexp ) {
return "flags" in regexp ? regexp.flags : regexp.toString().match( /[gimuy]*$/ )[ 0 ];
}
var callbacks = {
"string": useStrictEquality,
"boolean": useStrictEquality,
"number": useStrictEquality,
"null": useStrictEquality,
"undefined": useStrictEquality,
"symbol": useStrictEquality,
"date": useStrictEquality,
"nan": function() {
return true;
},
"regexp": function( b, a ) {
return a.source === b.source &&
// Include flags in the comparison
getRegExpFlags( a ) === getRegExpFlags( b );
},
// - skip when the property is a method of an instance (OOP)
// - abort otherwise,
// initial === would have catch identical references anyway
"function": function() {
var caller = callers[ callers.length - 1 ];
return caller !== Object && typeof caller !== "undefined";
},
"array": function( b, a ) {
var i, j, len, loop, aCircular, bCircular;
len = a.length;
if ( len !== b.length ) {
// Safe and faster
return false;
}
// Track reference to avoid circular references
parents.push( a );
parentsB.push( b );
for ( i = 0; i < len; i++ ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[ j ] === a[ i ];
bCircular = parentsB[ j ] === b[ i ];
if ( aCircular || bCircular ) {
if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true;
} else {
parents.pop();
parentsB.pop();
return false;
}
}
}
if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
parents.pop();
parentsB.pop();
return false;
}
}
parents.pop();
parentsB.pop();
return true;
},
"set": function( b, a ) {
var innerEq,
outerEq = true;
if ( a.size !== b.size ) {
return false;
}
a.forEach( function( aVal ) {
innerEq = false;
b.forEach( function( bVal ) {
if ( innerEquiv( bVal, aVal ) ) {
innerEq = true;
}
} );
if ( !innerEq ) {
outerEq = false;
}
} );
return outerEq;
},
"map": function( b, a ) {
var innerEq,
outerEq = true;
if ( a.size !== b.size ) {
return false;
}
a.forEach( function( aVal, aKey ) {
innerEq = false;
b.forEach( function( bVal, bKey ) {
if ( innerEquiv( [ bVal, bKey ], [ aVal, aKey ] ) ) {
innerEq = true;
}
} );
if ( !innerEq ) {
outerEq = false;
}
} );
return outerEq;
},
"object": function( b, a ) {
var i, j, loop, aCircular, bCircular;
// Default to true
var eq = true;
var aProperties = [];
var bProperties = [];
if ( compareConstructors( a, b ) === false ) {
return false;
}
// Stack constructor before traversing properties
callers.push( a.constructor );
// Track reference to avoid circular references
parents.push( a );
parentsB.push( b );
// Be strict: don't ensure hasOwnProperty and go deep
for ( i in a ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[ j ] === a[ i ];
bCircular = parentsB[ j ] === b[ i ];
if ( aCircular || bCircular ) {
if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
loop = true;
} else {
eq = false;
break;
}
}
}
aProperties.push( i );
if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
eq = false;
break;
}
}
parents.pop();
parentsB.pop();
// Unstack, we are done
callers.pop();
for ( i in b ) {
// Collect b's properties
bProperties.push( i );
}
// Ensures identical properties name
return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
}
};
function typeEquiv( a, b ) {
var type = QUnit.objectType( a );
return QUnit.objectType( b ) === type && callbacks[ type ]( b, a );
}
// The real equiv function
function innerEquiv( a, b ) {
// We're done when there's nothing more to compare
if ( arguments.length < 2 ) {
return true;
}
// Require type-specific equality
return ( a === b || typeEquiv( a, b ) ) &&
// ...across all consecutive argument pairs // only extend the global config if there is no QUnit overload
( arguments.length === 2 || innerEquiv.apply( this, [].slice.call( arguments, 1 ) ) ); if (window && window.QUnit && !window.QUnit.version) {
extend(config, globalConfig);
} }
return innerEquiv; // Push a loose unnamed module to the modules collection
}() ); config.modules.push(config.currentModule);
// Based on jsDump by Ariel Flesler // Based on jsDump by Ariel Flesler
// http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
QUnit.dump = ( function() { var dump = (function () {
function quote( str ) { function quote(str) {
return "\"" + str.toString().replace( /\\/g, "\\\\" ).replace( /"/g, "\\\"" ) + "\""; return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
} }
function literal( o ) { function literal(o) {
return o + ""; return o + "";
} }
function join( pre, arr, post ) { function join(pre, arr, post) {
var s = dump.separator(), var s = dump.separator(),
base = dump.indent(), base = dump.indent(),
inner = dump.indent( 1 ); inner = dump.indent(1);
if ( arr.join ) { if (arr.join) {
arr = arr.join( "," + s + inner ); arr = arr.join("," + s + inner);
} }
if ( !arr ) { if (!arr) {
return pre + post; return pre + post;
} }
return [ pre, inner + arr, base + post ].join( s ); return [pre, inner + arr, base + post].join(s);
} }
function array( arr, stack ) { function array(arr, stack) {
var i = arr.length, var i = arr.length,
ret = new Array( i ); ret = new Array(i);
if ( dump.maxDepth && dump.depth > dump.maxDepth ) { if (dump.maxDepth && dump.depth > dump.maxDepth) {
return "[object Array]"; return "[object Array]";
} }
this.up(); this.up();
while ( i-- ) { while (i--) {
ret[ i ] = this.parse( arr[ i ], undefined, stack ); ret[i] = this.parse(arr[i], undefined, stack);
} }
this.down(); this.down();
return join( "[", ret, "]" ); return join("[", ret, "]");
} }
function isArray( obj ) { function isArray(obj) {
return ( return (
//Native Arrays //Native Arrays
toString.call( obj ) === "[object Array]" || toString.call(obj) === "[object Array]" ||
// NodeList objects // NodeList objects
( typeof obj.length === "number" && obj.item !== undefined ) && typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined)
( obj.length ?
obj.item( 0 ) === obj[ 0 ] :
( obj.item( 0 ) === null && obj[ 0 ] === undefined )
)
); );
} }
@ -1927,81 +611,85 @@ QUnit.dump = ( function() {
dump = { dump = {
// The objType is used mostly internally, you can fix a (custom) type in advance // The objType is used mostly internally, you can fix a (custom) type in advance
parse: function( obj, objType, stack ) { parse: function parse(obj, objType, stack) {
stack = stack || []; stack = stack || [];
var res, parser, parserType, var res,
inStack = inArray( obj, stack ); parser,
parserType,
inStack = inArray(obj, stack);
if ( inStack !== -1 ) { if (inStack !== -1) {
return "recursion(" + ( inStack - stack.length ) + ")"; return "recursion(" + (inStack - stack.length) + ")";
} }
objType = objType || this.typeOf( obj ); objType = objType || this.typeOf(obj);
parser = this.parsers[ objType ]; parser = this.parsers[objType];
parserType = typeof parser; parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser);
if ( parserType === "function" ) { if (parserType === "function") {
stack.push( obj ); stack.push(obj);
res = parser.call( this, obj, stack ); res = parser.call(this, obj, stack);
stack.pop(); stack.pop();
return res; return res;
} }
return ( parserType === "string" ) ? parser : this.parsers.error; return parserType === "string" ? parser : this.parsers.error;
}, },
typeOf: function( obj ) { typeOf: function typeOf(obj) {
var type; var type;
if ( obj === null ) { if (obj === null) {
type = "null"; type = "null";
} else if ( typeof obj === "undefined" ) { } else if (typeof obj === "undefined") {
type = "undefined"; type = "undefined";
} else if ( QUnit.is( "regexp", obj ) ) { } else if (is("regexp", obj)) {
type = "regexp"; type = "regexp";
} else if ( QUnit.is( "date", obj ) ) { } else if (is("date", obj)) {
type = "date"; type = "date";
} else if ( QUnit.is( "function", obj ) ) { } else if (is("function", obj)) {
type = "function"; type = "function";
} else if ( obj.setInterval !== undefined && } else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) {
obj.document !== undefined &&
obj.nodeType === undefined ) {
type = "window"; type = "window";
} else if ( obj.nodeType === 9 ) { } else if (obj.nodeType === 9) {
type = "document"; type = "document";
} else if ( obj.nodeType ) { } else if (obj.nodeType) {
type = "node"; type = "node";
} else if ( isArray( obj ) ) { } else if (isArray(obj)) {
type = "array"; type = "array";
} else if ( obj.constructor === Error.prototype.constructor ) { } else if (obj.constructor === Error.prototype.constructor) {
type = "error"; type = "error";
} else { } else {
type = typeof obj; type = typeof obj === "undefined" ? "undefined" : _typeof(obj);
} }
return type; return type;
}, },
separator: function() { separator: function separator() {
return this.multiline ? this.HTML ? "<br />" : "\n" : this.HTML ? "&#160;" : " "; if (this.multiline) {
return this.HTML ? "<br />" : "\n";
} else {
return this.HTML ? "&#160;" : " ";
}
}, },
// Extra can be a number, shortcut for increasing-calling-decreasing // Extra can be a number, shortcut for increasing-calling-decreasing
indent: function( extra ) { indent: function indent(extra) {
if ( !this.multiline ) { if (!this.multiline) {
return ""; return "";
} }
var chr = this.indentChar; var chr = this.indentChar;
if ( this.HTML ) { if (this.HTML) {
chr = chr.replace( /\t/g, " " ).replace( / /g, "&#160;" ); chr = chr.replace(/\t/g, " ").replace(/ /g, "&#160;");
} }
return new Array( this.depth + ( extra || 0 ) ).join( chr ); return new Array(this.depth + (extra || 0)).join(chr);
}, },
up: function( a ) { up: function up(a) {
this.depth += a || 1; this.depth += a || 1;
}, },
down: function( a ) { down: function down(a) {
this.depth -= a || 1; this.depth -= a || 1;
}, },
setParser: function( name, parser ) { setParser: function setParser(name, parser) {
this.parsers[ name ] = parser; this.parsers[name] = parser;
}, },
// The next 3 are exposed so you can use them // The next 3 are exposed so you can use them
@ -2009,114 +697,119 @@ QUnit.dump = ( function() {
literal: literal, literal: literal,
join: join, join: join,
depth: 1, depth: 1,
maxDepth: QUnit.config.maxDepth, maxDepth: config.maxDepth,
// This is the list of parsers, to modify them, use dump.setParser // This is the list of parsers, to modify them, use dump.setParser
parsers: { parsers: {
window: "[Window]", window: "[Window]",
document: "[Document]", document: "[Document]",
error: function( error ) { error: function error(_error) {
return "Error(\"" + error.message + "\")"; return "Error(\"" + _error.message + "\")";
}, },
unknown: "[Unknown]", unknown: "[Unknown]",
"null": "null", "null": "null",
"undefined": "undefined", "undefined": "undefined",
"function": function( fn ) { "function": function _function(fn) {
var ret = "function", var ret = "function",
// Functions never have name in IE
name = "name" in fn ? fn.name : ( reName.exec( fn ) || [] )[ 1 ];
if ( name ) { // Functions never have name in IE
name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
if (name) {
ret += " " + name; ret += " " + name;
} }
ret += "("; ret += "(";
ret = [ ret, dump.parse( fn, "functionArgs" ), "){" ].join( "" ); ret = [ret, dump.parse(fn, "functionArgs"), "){"].join("");
return join( ret, dump.parse( fn, "functionCode" ), "}" ); return join(ret, dump.parse(fn, "functionCode"), "}");
}, },
array: array, array: array,
nodelist: array, nodelist: array,
"arguments": array, "arguments": array,
object: function( map, stack ) { object: function object(map, stack) {
var keys, key, val, i, nonEnumerableProperties, var keys,
key,
val,
i,
nonEnumerableProperties,
ret = []; ret = [];
if ( dump.maxDepth && dump.depth > dump.maxDepth ) { if (dump.maxDepth && dump.depth > dump.maxDepth) {
return "[object Object]"; return "[object Object]";
} }
dump.up(); dump.up();
keys = []; keys = [];
for ( key in map ) { for (key in map) {
keys.push( key ); keys.push(key);
} }
// Some properties are not always enumerable on Error objects. // Some properties are not always enumerable on Error objects.
nonEnumerableProperties = [ "message", "name" ]; nonEnumerableProperties = ["message", "name"];
for ( i in nonEnumerableProperties ) { for (i in nonEnumerableProperties) {
key = nonEnumerableProperties[ i ]; key = nonEnumerableProperties[i];
if ( key in map && inArray( key, keys ) < 0 ) { if (key in map && inArray(key, keys) < 0) {
keys.push( key ); keys.push(key);
} }
} }
keys.sort(); keys.sort();
for ( i = 0; i < keys.length; i++ ) { for (i = 0; i < keys.length; i++) {
key = keys[ i ]; key = keys[i];
val = map[ key ]; val = map[key];
ret.push( dump.parse( key, "key" ) + ": " + ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack));
dump.parse( val, undefined, stack ) );
} }
dump.down(); dump.down();
return join( "{", ret, "}" ); return join("{", ret, "}");
}, },
node: function( node ) { node: function node(_node) {
var len, i, val, var len,
i,
val,
open = dump.HTML ? "&lt;" : "<", open = dump.HTML ? "&lt;" : "<",
close = dump.HTML ? "&gt;" : ">", close = dump.HTML ? "&gt;" : ">",
tag = node.nodeName.toLowerCase(), tag = _node.nodeName.toLowerCase(),
ret = open + tag, ret = open + tag,
attrs = node.attributes; attrs = _node.attributes;
if ( attrs ) { if (attrs) {
for ( i = 0, len = attrs.length; i < len; i++ ) { for (i = 0, len = attrs.length; i < len; i++) {
val = attrs[ i ].nodeValue; val = attrs[i].nodeValue;
// IE6 includes all attributes in .attributes, even ones not explicitly // IE6 includes all attributes in .attributes, even ones not explicitly
// set. Those have values like undefined, null, 0, false, "" or // set. Those have values like undefined, null, 0, false, "" or
// "inherit". // "inherit".
if ( val && val !== "inherit" ) { if (val && val !== "inherit") {
ret += " " + attrs[ i ].nodeName + "=" + ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute");
dump.parse( val, "attribute" );
} }
} }
} }
ret += close; ret += close;
// Show content of TextNode or CDATASection // Show content of TextNode or CDATASection
if ( node.nodeType === 3 || node.nodeType === 4 ) { if (_node.nodeType === 3 || _node.nodeType === 4) {
ret += node.nodeValue; ret += _node.nodeValue;
} }
return ret + open + "/" + tag + close; return ret + open + "/" + tag + close;
}, },
// Function calls it internally, it's the arguments part of the function // Function calls it internally, it's the arguments part of the function
functionArgs: function( fn ) { functionArgs: function functionArgs(fn) {
var args, var args,
l = fn.length; l = fn.length;
if ( !l ) { if (!l) {
return ""; return "";
} }
args = new Array( l ); args = new Array(l);
while ( l-- ) { while (l--) {
// 97 is 'a' // 97 is 'a'
args[ l ] = String.fromCharCode( 97 + l ); args[l] = String.fromCharCode(97 + l);
} }
return " " + args.join( ", " ) + " "; return " " + args.join(", ") + " ";
}, },
// Object calls it internally, the key part of an item in a map // Object calls it internally, the key part of an item in a map
@ -2132,7 +825,7 @@ QUnit.dump = ( function() {
regexp: literal, regexp: literal,
number: literal, number: literal,
"boolean": literal, "boolean": literal,
symbol: function( sym ) { symbol: function symbol(sym) {
return sym.toString(); return sym.toString();
} }
}, },
@ -2148,288 +841,1631 @@ QUnit.dump = ( function() {
}; };
return dump; return dump;
}() ); })();
// Back compat // Register logging callbacks
QUnit.jsDump = QUnit.dump; function registerLoggingCallbacks(obj) {
var i,
l,
key,
callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"];
function applyDeprecated( name ) { function registerLoggingCallback(key) {
return function() { var loggingCallback = function loggingCallback(callback) {
throw new Error( if (objectType(callback) !== "function") {
name + " is removed in QUnit 2.0.\n" + throw new Error("QUnit logging methods require a callback function as their first parameters.");
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
};
}
Object.keys( Assert.prototype ).forEach( function( key ) {
QUnit[ key ] = applyDeprecated( "`QUnit." + key + "`" );
} );
QUnit.asyncTest = function() {
throw new Error(
"asyncTest is removed in QUnit 2.0, use QUnit.test() with assert.async() instead.\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
};
QUnit.stop = function() {
throw new Error(
"QUnit.stop is removed in QUnit 2.0, use QUnit.test() with assert.async() instead.\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
};
function resetThrower() {
throw new Error(
"QUnit.reset is removed in QUnit 2.0 without replacement.\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
}
Object.defineProperty( QUnit, "reset", {
get: function() {
return resetThrower;
},
set: resetThrower
} );
if ( defined.document ) {
if ( window.QUnit ) {
throw new Error( "QUnit has already been defined." );
} }
[ config.callbacks[key].push(callback);
"test", };
"module",
"expect", return loggingCallback;
"start", }
"ok",
"notOk", for (i = 0, l = callbackNames.length; i < l; i++) {
"equal", key = callbackNames[i];
"notEqual",
"propEqual", // Initialize key collection of logging callback
"notPropEqual", if (objectType(config.callbacks[key]) === "undefined") {
"deepEqual", config.callbacks[key] = [];
"notDeepEqual", }
"strictEqual",
"notStrictEqual", obj[key] = registerLoggingCallback(key);
"throws", }
"raises" }
].forEach( function( key ) {
window[ key ] = applyDeprecated( "The global `" + key + "`" ); function runLoggingCallbacks(key, args) {
} ); var i, l, callbacks;
callbacks = config.callbacks[key];
for (i = 0, l = callbacks.length; i < l; i++) {
callbacks[i](args);
}
}
// Doesn't support IE9, it will return undefined on these browsers
// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
var fileName = (sourceFromStacktrace(0) || "").replace(/(:\d+)+\)?/, "").replace(/.+\//, "");
function extractStacktrace(e, offset) {
offset = offset === undefined ? 4 : offset;
var stack, include, i;
if (e && e.stack) {
stack = e.stack.split("\n");
if (/^error$/i.test(stack[0])) {
stack.shift();
}
if (fileName) {
include = [];
for (i = offset; i < stack.length; i++) {
if (stack[i].indexOf(fileName) !== -1) {
break;
}
include.push(stack[i]);
}
if (include.length) {
return include.join("\n");
}
}
return stack[offset];
}
}
function sourceFromStacktrace(offset) {
var error = new Error();
// Support: Safari <=7 only, IE <=10 - 11 only
// Not all browsers generate the `stack` property for `new Error()`, see also #636
if (!error.stack) {
try {
throw error;
} catch (err) {
error = err;
}
}
return extractStacktrace(error, offset);
}
var unitSampler;
var focused = false;
var priorityCount = 0;
function Test(settings) {
var i, l;
++Test.count;
this.expected = null;
extend(this, settings);
this.assertions = [];
this.semaphore = 0;
this.usedAsync = false;
this.module = config.currentModule;
this.stack = sourceFromStacktrace(3);
// Register unique strings
for (i = 0, l = this.module.tests; i < l.length; i++) {
if (this.module.tests[i].name === this.testName) {
this.testName += " ";
}
}
this.testId = generateHash(this.module.name, this.testName);
this.module.tests.push({
name: this.testName,
testId: this.testId
});
if (settings.skip) {
// Skipped tests will fully ignore any sent callback
this.callback = function () {};
this.async = false;
this.expected = 0;
} else {
this.assert = new Assert(this);
}
}
Test.count = 0;
function getNotStartedModules(startModule) {
var module = startModule,
modules = [];
while (module && module.testsRun === 0) {
modules.push(module);
module = module.parentModule;
}
return modules;
}
Test.prototype = {
before: function before() {
var i,
startModule,
module = this.module,
notStartedModules = getNotStartedModules(module);
for (i = notStartedModules.length - 1; i >= 0; i--) {
startModule = notStartedModules[i];
startModule.stats = { all: 0, bad: 0, started: now() };
runLoggingCallbacks("moduleStart", {
name: startModule.name,
tests: startModule.tests
});
}
config.current = this;
if (module.testEnvironment) {
delete module.testEnvironment.before;
delete module.testEnvironment.beforeEach;
delete module.testEnvironment.afterEach;
delete module.testEnvironment.after;
}
this.testEnvironment = extend({}, module.testEnvironment);
this.started = now();
runLoggingCallbacks("testStart", {
name: this.testName,
module: module.name,
testId: this.testId,
previousFailure: this.previousFailure
});
if (!config.pollution) {
saveGlobal();
}
},
run: function run() {
var promise;
config.current = this;
this.callbackStarted = now();
if (config.notrycatch) {
runTest(this);
return;
}
try {
runTest(this);
} catch (e) {
this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0));
// Else next test will carry the responsibility
saveGlobal();
// Restart the tests if they're blocking
if (config.blocking) {
internalRecover(this);
}
}
function runTest(test) {
promise = test.callback.call(test.testEnvironment, test.assert);
test.resolvePromise(promise);
}
},
after: function after() {
checkPollution();
},
queueHook: function queueHook(hook, hookName, hookOwner) {
var promise,
test = this;
return function runHook() {
if (hookName === "before") {
if (hookOwner.testsRun !== 0) {
return;
}
test.preserveEnvironment = true;
}
if (hookName === "after" && hookOwner.testsRun !== numberOfTests(hookOwner) - 1) {
return;
}
config.current = test;
if (config.notrycatch) {
callHook();
return;
}
try {
callHook();
} catch (error) {
test.pushFailure(hookName + " failed on " + test.testName + ": " + (error.message || error), extractStacktrace(error, 0));
}
function callHook() {
promise = hook.call(test.testEnvironment, test.assert);
test.resolvePromise(promise, hookName);
}
};
},
// Currently only used for module level hooks, can be used to add global level ones
hooks: function hooks(handler) {
var hooks = [];
function processHooks(test, module) {
if (module.parentModule) {
processHooks(test, module.parentModule);
}
if (module.testEnvironment && objectType(module.testEnvironment[handler]) === "function") {
hooks.push(test.queueHook(module.testEnvironment[handler], handler, module));
}
}
// Hooks are ignored on skipped tests
if (!this.skip) {
processHooks(this, this.module);
}
return hooks;
},
finish: function finish() {
config.current = this;
if (config.requireExpects && this.expected === null) {
this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack);
} else if (this.expected !== null && this.expected !== this.assertions.length) {
this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack);
} else if (this.expected === null && !this.assertions.length) {
this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack);
}
var i,
module = this.module,
moduleName = module.name,
testName = this.testName,
skipped = !!this.skip,
bad = 0,
storage = config.storage;
this.runtime = now() - this.started;
config.stats.all += this.assertions.length;
module.stats.all += this.assertions.length;
for (i = 0; i < this.assertions.length; i++) {
if (!this.assertions[i].result) {
bad++;
config.stats.bad++;
module.stats.bad++;
}
}
notifyTestsRan(module);
// Store result when possible
if (storage) {
if (bad) {
storage.setItem("qunit-test-" + moduleName + "-" + testName, bad);
} else {
storage.removeItem("qunit-test-" + moduleName + "-" + testName);
}
}
runLoggingCallbacks("testDone", {
name: testName,
module: moduleName,
skipped: skipped,
failed: bad,
passed: this.assertions.length - bad,
total: this.assertions.length,
runtime: skipped ? 0 : this.runtime,
// HTML Reporter use
assertions: this.assertions,
testId: this.testId,
// Source of Test
source: this.stack
});
if (module.testsRun === numberOfTests(module)) {
runLoggingCallbacks("moduleDone", {
name: module.name,
tests: module.tests,
failed: module.stats.bad,
passed: module.stats.all - module.stats.bad,
total: module.stats.all,
runtime: now() - module.stats.started
});
}
config.current = undefined;
},
preserveTestEnvironment: function preserveTestEnvironment() {
if (this.preserveEnvironment) {
this.module.testEnvironment = this.testEnvironment;
this.testEnvironment = extend({}, this.module.testEnvironment);
}
},
queue: function queue() {
var priority,
previousFailCount,
test = this;
if (!this.valid()) {
return;
}
function run() {
// Each of these can by async
synchronize([function () {
test.before();
}, test.hooks("before"), function () {
test.preserveTestEnvironment();
}, test.hooks("beforeEach"), function () {
test.run();
}, test.hooks("afterEach").reverse(), test.hooks("after").reverse(), function () {
test.after();
}, function () {
test.finish();
}]);
}
previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName);
// Prioritize previously failed tests, detected from storage
priority = config.reorder && previousFailCount;
this.previousFailure = !!previousFailCount;
return synchronize(run, priority, config.seed);
},
pushResult: function pushResult(resultInfo) {
// Destructure of resultInfo = { result, actual, expected, message, negative }
var source,
details = {
module: this.module.name,
name: this.testName,
result: resultInfo.result,
message: resultInfo.message,
actual: resultInfo.actual,
expected: resultInfo.expected,
testId: this.testId,
negative: resultInfo.negative || false,
runtime: now() - this.started
};
if (!resultInfo.result) {
source = sourceFromStacktrace();
if (source) {
details.source = source;
}
}
runLoggingCallbacks("log", details);
this.assertions.push({
result: !!resultInfo.result,
message: resultInfo.message
});
},
pushFailure: function pushFailure(message, source, actual) {
if (!(this instanceof Test)) {
throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2));
}
var details = {
module: this.module.name,
name: this.testName,
result: false,
message: message || "error",
actual: actual || null,
testId: this.testId,
runtime: now() - this.started
};
if (source) {
details.source = source;
}
runLoggingCallbacks("log", details);
this.assertions.push({
result: false,
message: message
});
},
resolvePromise: function resolvePromise(promise, phase) {
var then,
resume,
message,
test = this;
if (promise != null) {
then = promise.then;
if (objectType(then) === "function") {
resume = internalStop(test);
then.call(promise, function () {
resume();
}, function (error) {
message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error);
test.pushFailure(message, extractStacktrace(error, 0));
// Else next test will carry the responsibility
saveGlobal();
// Unblock
resume();
});
}
}
},
valid: function valid() {
var filter = config.filter,
regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter),
module = config.module && config.module.toLowerCase(),
fullName = this.module.name + ": " + this.testName;
function moduleChainNameMatch(testModule) {
var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
if (testModuleName === module) {
return true;
} else if (testModule.parentModule) {
return moduleChainNameMatch(testModule.parentModule);
} else {
return false;
}
}
function moduleChainIdMatch(testModule) {
return inArray(testModule.moduleId, config.moduleId) > -1 || testModule.parentModule && moduleChainIdMatch(testModule.parentModule);
}
// Internally-generated tests are always valid
if (this.callback && this.callback.validTest) {
return true;
}
if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) {
return false;
}
if (config.testId && config.testId.length > 0 && inArray(this.testId, config.testId) < 0) {
return false;
}
if (module && !moduleChainNameMatch(this.module)) {
return false;
}
if (!filter) {
return true;
}
return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName);
},
regexFilter: function regexFilter(exclude, pattern, flags, fullName) {
var regex = new RegExp(pattern, flags);
var match = regex.test(fullName);
return match !== exclude;
},
stringFilter: function stringFilter(filter, fullName) {
filter = filter.toLowerCase();
fullName = fullName.toLowerCase();
var include = filter.charAt(0) !== "!";
if (!include) {
filter = filter.slice(1);
}
// If the filter matches, we need to honour include
if (fullName.indexOf(filter) !== -1) {
return include;
}
// Otherwise, do the opposite
return !include;
}
};
function pushFailure() {
if (!config.current) {
throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2));
}
// Gets current test obj
var currentTest = config.current;
return currentTest.pushFailure.apply(currentTest, arguments);
}
// Based on Java's String.hashCode, a simple but not
// rigorously collision resistant hashing function
function generateHash(module, testName) {
var hex,
i = 0,
hash = 0,
str = module + "\x1C" + testName,
len = str.length;
for (; i < len; i++) {
hash = (hash << 5) - hash + str.charCodeAt(i);
hash |= 0;
}
// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
// strictly necessary but increases user understanding that the id is a SHA-like hash
hex = (0x100000000 + hash).toString(16);
if (hex.length < 8) {
hex = "0000000" + hex;
}
return hex.slice(-8);
}
function synchronize(callback, priority, seed) {
var last = !priority,
index;
if (objectType(callback) === "array") {
while (callback.length) {
synchronize(callback.shift());
}
return;
}
if (priority) {
config.queue.splice(priorityCount++, 0, callback);
} else if (seed) {
if (!unitSampler) {
unitSampler = unitSamplerGenerator(seed);
}
// Insert into a random position after all priority items
index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1));
config.queue.splice(priorityCount + index, 0, callback);
} else {
config.queue.push(callback);
}
if (internalState.autorun && !config.blocking) {
process(last);
}
}
function unitSamplerGenerator(seed) {
// 32-bit xorshift, requires only a nonzero seed
// http://excamera.com/sphinx/article-xorshift.html
var sample = parseInt(generateHash(seed), 16) || -1;
return function () {
sample ^= sample << 13;
sample ^= sample >>> 17;
sample ^= sample << 5;
// ECMAScript has no unsigned number type
if (sample < 0) {
sample += 0x100000000;
}
return sample / 0x100000000;
};
}
function saveGlobal() {
config.pollution = [];
if (config.noglobals) {
for (var key in global$1) {
if (hasOwn.call(global$1, key)) {
// In Opera sometimes DOM element ids show up here, ignore them
if (/^qunit-test-output/.test(key)) {
continue;
}
config.pollution.push(key);
}
}
}
}
function checkPollution() {
var newGlobals,
deletedGlobals,
old = config.pollution;
saveGlobal();
newGlobals = diff(config.pollution, old);
if (newGlobals.length > 0) {
pushFailure("Introduced global variable(s): " + newGlobals.join(", "));
}
deletedGlobals = diff(old, config.pollution);
if (deletedGlobals.length > 0) {
pushFailure("Deleted global variable(s): " + deletedGlobals.join(", "));
}
}
// Will be exposed as QUnit.test
function test(testName, callback) {
if (focused) {
return;
}
var newTest;
newTest = new Test({
testName: testName,
callback: callback
});
newTest.queue();
}
// Will be exposed as QUnit.skip
function skip(testName) {
if (focused) {
return;
}
var test = new Test({
testName: testName,
skip: true
});
test.queue();
}
// Will be exposed as QUnit.only
function only(testName, callback) {
var newTest;
if (focused) {
return;
}
config.queue.length = 0;
focused = true;
newTest = new Test({
testName: testName,
callback: callback
});
newTest.queue();
}
// Put a hold on processing and return a function that will release it.
function internalStop(test) {
var released = false;
test.semaphore += 1;
config.blocking = true;
// Set a recovery timeout, if so configured.
if (config.testTimeout && defined.setTimeout) {
clearTimeout(config.timeout);
config.timeout = setTimeout(function () {
pushFailure("Test timed out", sourceFromStacktrace(2));
internalRecover(test);
}, config.testTimeout);
}
return function resume() {
if (released) {
return;
}
released = true;
test.semaphore -= 1;
internalStart(test);
};
}
// Forcefully release all processing holds.
function internalRecover(test) {
test.semaphore = 0;
internalStart(test);
}
// Release a processing hold, scheduling a resumption attempt if no holds remain.
function internalStart(test) {
// If semaphore is non-numeric, throw error
if (isNaN(test.semaphore)) {
test.semaphore = 0;
pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2));
return;
}
// Don't start until equal number of stop-calls
if (test.semaphore > 0) {
return;
}
// Throw an Error if start is called more often than stop
if (test.semaphore < 0) {
test.semaphore = 0;
pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2));
return;
}
// Add a slight delay to allow more assertions etc.
if (defined.setTimeout) {
if (config.timeout) {
clearTimeout(config.timeout);
}
config.timeout = setTimeout(function () {
if (test.semaphore > 0) {
return;
}
if (config.timeout) {
clearTimeout(config.timeout);
}
begin();
}, 13);
} else {
begin();
}
}
function numberOfTests(module) {
var count = module.tests.length,
modules = [].concat(toConsumableArray(module.childModules));
// Do a breadth-first traversal of the child modules
while (modules.length) {
var nextModule = modules.shift();
count += nextModule.tests.length;
modules.push.apply(modules, toConsumableArray(nextModule.childModules));
}
return count;
}
function notifyTestsRan(module) {
module.testsRun++;
while (module = module.parentModule) {
module.testsRun++;
}
}
var Assert = function () {
function Assert(testContext) {
classCallCheck(this, Assert);
this.test = testContext;
}
// Assert helpers
// Specify the number of expected assertions to guarantee that failed test
// (no assertions are run at all) don't slip through.
createClass(Assert, [{
key: "expect",
value: function expect(asserts) {
if (arguments.length === 1) {
this.test.expected = asserts;
} else {
return this.test.expected;
}
}
// Put a hold on processing and return a function that will release it a maximum of once.
}, {
key: "async",
value: function async(count) {
var test$$1 = this.test,
popped = false,
acceptCallCount = count;
if (typeof acceptCallCount === "undefined") {
acceptCallCount = 1;
}
test$$1.usedAsync = true;
var resume = internalStop(test$$1);
return function done() {
if (popped) {
test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2));
return;
}
acceptCallCount -= 1;
if (acceptCallCount > 0) {
return;
}
popped = true;
resume();
};
}
// Exports test.push() to the user API
// Alias of pushResult.
}, {
key: "push",
value: function push(result, actual, expected, message, negative) {
console.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (http://api.qunitjs.com/pushResult/).");
var currentAssert = this instanceof Assert ? this : config.current.assert;
return currentAssert.pushResult({
result: result,
actual: actual,
expected: expected,
message: message,
negative: negative
});
}
}, {
key: "pushResult",
value: function pushResult(resultInfo) {
// Destructure of resultInfo = { result, actual, expected, message, negative }
var assert = this,
currentTest = assert instanceof Assert && assert.test || config.current;
// Backwards compatibility fix.
// Allows the direct use of global exported assertions and QUnit.assert.*
// Although, it's use is not recommended as it can leak assertions
// to other tests from async tests, because we only get a reference to the current test,
// not exactly the test where assertion were intended to be called.
if (!currentTest) {
throw new Error("assertion outside test context, in " + sourceFromStacktrace(2));
}
if (currentTest.usedAsync === true && currentTest.semaphore === 0) {
currentTest.pushFailure("Assertion after the final `assert.async` was resolved", sourceFromStacktrace(2));
// Allow this assertion to continue running anyway...
}
if (!(assert instanceof Assert)) {
assert = currentTest.assert;
}
return assert.test.pushResult(resultInfo);
}
}, {
key: "ok",
value: function ok(result, message) {
if (!message) {
message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result);
}
this.pushResult({
result: !!result,
actual: result,
expected: true,
message: message
});
}
}, {
key: "notOk",
value: function notOk(result, message) {
if (!message) {
message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result);
}
this.pushResult({
result: !result,
actual: result,
expected: false,
message: message
});
}
}, {
key: "equal",
value: function equal(actual, expected, message) {
// eslint-disable-next-line eqeqeq
var result = expected == actual;
this.pushResult({
result: result,
actual: actual,
expected: expected,
message: message
});
}
}, {
key: "notEqual",
value: function notEqual(actual, expected, message) {
// eslint-disable-next-line eqeqeq
var result = expected != actual;
this.pushResult({
result: result,
actual: actual,
expected: expected,
message: message,
negative: true
});
}
}, {
key: "propEqual",
value: function propEqual(actual, expected, message) {
actual = objectValues(actual);
expected = objectValues(expected);
this.pushResult({
result: equiv(actual, expected),
actual: actual,
expected: expected,
message: message
});
}
}, {
key: "notPropEqual",
value: function notPropEqual(actual, expected, message) {
actual = objectValues(actual);
expected = objectValues(expected);
this.pushResult({
result: !equiv(actual, expected),
actual: actual,
expected: expected,
message: message,
negative: true
});
}
}, {
key: "deepEqual",
value: function deepEqual(actual, expected, message) {
this.pushResult({
result: equiv(actual, expected),
actual: actual,
expected: expected,
message: message
});
}
}, {
key: "notDeepEqual",
value: function notDeepEqual(actual, expected, message) {
this.pushResult({
result: !equiv(actual, expected),
actual: actual,
expected: expected,
message: message,
negative: true
});
}
}, {
key: "strictEqual",
value: function strictEqual(actual, expected, message) {
this.pushResult({
result: expected === actual,
actual: actual,
expected: expected,
message: message
});
}
}, {
key: "notStrictEqual",
value: function notStrictEqual(actual, expected, message) {
this.pushResult({
result: expected !== actual,
actual: actual,
expected: expected,
message: message,
negative: true
});
}
}, {
key: "throws",
value: function throws(block, expected, message) {
var actual = void 0,
result = false,
currentTest = this instanceof Assert && this.test || config.current;
// 'expected' is optional unless doing string comparison
if (objectType(expected) === "string") {
if (message == null) {
message = expected;
expected = null;
} else {
throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary.");
}
}
currentTest.ignoreGlobalErrors = true;
try {
block.call(currentTest.testEnvironment);
} catch (e) {
actual = e;
}
currentTest.ignoreGlobalErrors = false;
if (actual) {
var expectedType = objectType(expected);
// We don't want to validate thrown error
if (!expected) {
result = true;
expected = null;
// Expected is a regexp
} else if (expectedType === "regexp") {
result = expected.test(errorString(actual));
// Expected is a constructor, maybe an Error constructor
} else if (expectedType === "function" && actual instanceof expected) {
result = true;
// Expected is an Error object
} else if (expectedType === "object") {
result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
// Expected is a validation function which returns true if validation passed
} else if (expectedType === "function" && expected.call({}, actual) === true) {
expected = null;
result = true;
}
}
currentTest.assert.pushResult({
result: result,
actual: actual,
expected: expected,
message: message
});
}
}]);
return Assert;
}();
// Provide an alternative to assert.throws(), for environments that consider throws a reserved word
// Known to us are: Closure Compiler, Narwhal
// eslint-disable-next-line dot-notation
Assert.prototype.raises = Assert.prototype["throws"];
/**
* Converts an error into a simple string for comparisons.
*
* @param {Error} error
* @return {String}
*/
function errorString(error) {
var resultErrorString = error.toString();
if (resultErrorString.substring(0, 7) === "[object") {
var name = error.name ? error.name.toString() : "Error";
var message = error.message ? error.message.toString() : "";
if (name && message) {
return name + ": " + message;
} else if (name) {
return name;
} else if (message) {
return message;
} else {
return "Error";
}
} else {
return resultErrorString;
}
}
/* global module, exports, define */
function exportQUnit(QUnit) {
if (defined.document) {
// QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined.
if (window.QUnit && window.QUnit.version) {
throw new Error("QUnit has already been defined.");
}
window.QUnit = QUnit; window.QUnit = QUnit;
} }
// For nodejs // For nodejs
if ( typeof module !== "undefined" && module && module.exports ) { if (typeof module !== "undefined" && module && module.exports) {
module.exports = QUnit; module.exports = QUnit;
// For consistency with CommonJS environments' exports // For consistency with CommonJS environments' exports
module.exports.QUnit = QUnit; module.exports.QUnit = QUnit;
} }
// For CommonJS with exports, but without module.exports, like Rhino // For CommonJS with exports, but without module.exports, like Rhino
if ( typeof exports !== "undefined" && exports ) { if (typeof exports !== "undefined" && exports) {
exports.QUnit = QUnit; exports.QUnit = QUnit;
} }
if ( typeof define === "function" && define.amd ) { if (typeof define === "function" && define.amd) {
define( function() { define(function () {
return QUnit; return QUnit;
} ); });
QUnit.config.autostart = false; QUnit.config.autostart = false;
} }
}
// Get a reference to the global object, like window in browsers (function () {
}( ( function() { if (!defined.document) {
return this;
}() ) ) );
( function() {
if ( typeof window === "undefined" || !window.document ) {
return; return;
} }
var config = QUnit.config, // `onErrorFnPrev` initialized at top of scope
// Preserve other handlers
var onErrorFnPrev = window.onerror;
// Cover uncaught exceptions
// Returning true will suppress the default browser handler,
// returning false will let it run.
window.onerror = function (error, filePath, linerNr) {
var ret = false;
if (onErrorFnPrev) {
ret = onErrorFnPrev(error, filePath, linerNr);
}
// Treat return value as window.onerror itself does,
// Only do our handling if not suppressed.
if (ret !== true) {
if (config.current) {
if (config.current.ignoreGlobalErrors) {
return true;
}
pushFailure(error, filePath + ":" + linerNr);
} else {
test("global failure", extend(function () {
pushFailure(error, filePath + ":" + linerNr);
}, { validTest: true }));
}
return false;
}
return ret;
};
})();
var QUnit = {};
var globalStartCalled = false;
var runStarted = false;
var internalState = {
autorun: false
};
// Figure out if we're running the tests from a server or not
QUnit.isLocal = !(defined.document && window.location.protocol !== "file:");
// Expose the current QUnit version
QUnit.version = "2.1.1";
extend(QUnit, {
// Call on start of module test to prepend name to all tests
module: function module(name, testEnvironment, executeNow) {
var module, moduleFns;
var currentModule = config.currentModule;
if (arguments.length === 2) {
if (objectType(testEnvironment) === "function") {
executeNow = testEnvironment;
testEnvironment = undefined;
}
}
module = createModule();
moduleFns = {
before: setHook(module, "before"),
beforeEach: setHook(module, "beforeEach"),
afterEach: setHook(module, "afterEach"),
after: setHook(module, "after")
};
if (objectType(executeNow) === "function") {
config.moduleStack.push(module);
setCurrentModule(module);
executeNow.call(module.testEnvironment, moduleFns);
config.moduleStack.pop();
module = module.parentModule || currentModule;
}
setCurrentModule(module);
function createModule() {
var parentModule = config.moduleStack.length ? config.moduleStack.slice(-1)[0] : null;
var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name;
var module = {
name: moduleName,
parentModule: parentModule,
tests: [],
moduleId: generateHash(moduleName),
testsRun: 0,
childModules: []
};
var env = {};
if (parentModule) {
parentModule.childModules.push(module);
extend(env, parentModule.testEnvironment);
delete env.beforeEach;
delete env.afterEach;
}
extend(env, testEnvironment);
module.testEnvironment = env;
config.modules.push(module);
return module;
}
function setCurrentModule(module) {
config.currentModule = module;
}
},
test: test,
skip: skip,
only: only,
start: function start(count) {
var globalStartAlreadyCalled = globalStartCalled;
if (!config.current) {
globalStartCalled = true;
if (runStarted) {
throw new Error("Called start() while test already started running");
} else if (globalStartAlreadyCalled || count > 1) {
throw new Error("Called start() outside of a test context too many times");
} else if (config.autostart) {
throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true");
} else if (!defined.document && !config.pageLoaded) {
// Starts from Node even if .load was not previously called
QUnit.load();
} else if (!config.pageLoaded) {
// The page isn't completely loaded yet, so bail out and let `QUnit.load` handle it
config.autostart = true;
return;
}
} else {
throw new Error("QUnit.start cannot be called inside a test context.");
}
scheduleBegin();
},
config: config,
is: is,
objectType: objectType,
extend: extend,
load: function load() {
config.pageLoaded = true;
// Initialize the configuration options
extend(config, {
stats: { all: 0, bad: 0 },
started: 0,
updateRate: 1000,
autostart: true,
filter: ""
}, true);
if (!runStarted) {
config.blocking = false;
if (config.autostart) {
scheduleBegin();
}
}
},
stack: function stack(offset) {
offset = (offset || 0) + 2;
return sourceFromStacktrace(offset);
}
});
QUnit.pushFailure = pushFailure;
QUnit.assert = Assert.prototype;
QUnit.equiv = equiv;
QUnit.dump = dump;
registerLoggingCallbacks(QUnit);
function scheduleBegin() {
runStarted = true;
// Add a slight delay to allow definition of more modules and tests.
if (defined.setTimeout) {
setTimeout(function () {
begin();
}, 13);
} else {
begin();
}
}
function begin() {
var i,
l,
modulesLog = [];
// If the test run hasn't officially begun yet
if (!config.started) {
// Record the time of the test run's beginning
config.started = now();
// Delete the loose unnamed module if unused.
if (config.modules[0].name === "" && config.modules[0].tests.length === 0) {
config.modules.shift();
}
// Avoid unnecessary information by not logging modules' test environments
for (i = 0, l = config.modules.length; i < l; i++) {
modulesLog.push({
name: config.modules[i].name,
tests: config.modules[i].tests
});
}
// The test run is officially beginning now
runLoggingCallbacks("begin", {
totalTests: Test.count,
modules: modulesLog
});
}
config.blocking = false;
process(true);
}
function process(last) {
function next() {
process(last);
}
var start = now();
config.depth = (config.depth || 0) + 1;
while (config.queue.length && !config.blocking) {
if (!defined.setTimeout || config.updateRate <= 0 || now() - start < config.updateRate) {
if (config.current) {
// Reset async tracking for each phase of the Test lifecycle
config.current.usedAsync = false;
}
config.queue.shift()();
} else {
setTimeout(next, 13);
break;
}
}
config.depth--;
if (last && !config.blocking && !config.queue.length && config.depth === 0) {
done();
}
}
function done() {
var runtime,
passed,
i,
key,
storage = config.storage;
internalState.autorun = true;
runtime = now() - config.started;
passed = config.stats.all - config.stats.bad;
runLoggingCallbacks("done", {
failed: config.stats.bad,
passed: passed,
total: config.stats.all,
runtime: runtime
});
// Clear own storage items if all tests passed
if (storage && config.stats.bad === 0) {
for (i = storage.length - 1; i >= 0; i--) {
key = storage.key(i);
if (key.indexOf("qunit-test-") === 0) {
storage.removeItem(key);
}
}
}
}
function setHook(module, hookName) {
if (module.testEnvironment === undefined) {
module.testEnvironment = {};
}
return function (callback) {
module.testEnvironment[hookName] = callback;
};
}
exportQUnit(QUnit);
(function () {
if (typeof window === "undefined" || typeof document === "undefined") {
return;
}
var config = QUnit.config,
hasOwn = Object.prototype.hasOwnProperty; hasOwn = Object.prototype.hasOwnProperty;
// Stores fixture HTML for resetting later // Stores fixture HTML for resetting later
function storeFixture() { function storeFixture() {
// Avoid overwriting user-defined values // Avoid overwriting user-defined values
if ( hasOwn.call( config, "fixture" ) ) { if (hasOwn.call(config, "fixture")) {
return; return;
} }
var fixture = document.getElementById( "qunit-fixture" ); var fixture = document.getElementById("qunit-fixture");
if ( fixture ) { if (fixture) {
config.fixture = fixture.innerHTML; config.fixture = fixture.innerHTML;
} }
} }
QUnit.begin( storeFixture ); QUnit.begin(storeFixture);
// Resets the fixture DOM element if available. // Resets the fixture DOM element if available.
function resetFixture() { function resetFixture() {
if ( config.fixture == null ) { if (config.fixture == null) {
return; return;
} }
var fixture = document.getElementById( "qunit-fixture" ); var fixture = document.getElementById("qunit-fixture");
if ( fixture ) { if (fixture) {
fixture.innerHTML = config.fixture; fixture.innerHTML = config.fixture;
} }
} }
QUnit.testStart( resetFixture ); QUnit.testStart(resetFixture);
})();
}() ); (function () {
( function() { // Only interact with URLs via window.location
var location = typeof window !== "undefined" && window.location;
// Only interact with URLs via window.location if (!location) {
var location = typeof window !== "undefined" && window.location;
if ( !location ) {
return; return;
} }
var urlParams = getUrlParams(); var urlParams = getUrlParams();
QUnit.urlParams = urlParams; QUnit.urlParams = urlParams;
// Match module/test by inclusion in an array // Match module/test by inclusion in an array
QUnit.config.moduleId = [].concat( urlParams.moduleId || [] ); QUnit.config.moduleId = [].concat(urlParams.moduleId || []);
QUnit.config.testId = [].concat( urlParams.testId || [] ); QUnit.config.testId = [].concat(urlParams.testId || []);
// Exact case-insensitive match of the module name // Exact case-insensitive match of the module name
QUnit.config.module = urlParams.module; QUnit.config.module = urlParams.module;
// Regular expression or case-insenstive substring match against "moduleName: testName" // Regular expression or case-insenstive substring match against "moduleName: testName"
QUnit.config.filter = urlParams.filter; QUnit.config.filter = urlParams.filter;
// Test order randomization // Test order randomization
if ( urlParams.seed === true ) { if (urlParams.seed === true) {
// Generate a random seed if the option is specified without a value // Generate a random seed if the option is specified without a value
QUnit.config.seed = Math.random().toString( 36 ).slice( 2 ); QUnit.config.seed = Math.random().toString(36).slice(2);
} else if ( urlParams.seed ) { } else if (urlParams.seed) {
QUnit.config.seed = urlParams.seed; QUnit.config.seed = urlParams.seed;
} }
// Add URL-parameter-mapped config values with UI form rendering data // Add URL-parameter-mapped config values with UI form rendering data
QUnit.config.urlConfig.push( QUnit.config.urlConfig.push({
{
id: "hidepassed", id: "hidepassed",
label: "Hide passed tests", label: "Hide passed tests",
tooltip: "Only show tests and assertions that fail. Stored as query-strings." tooltip: "Only show tests and assertions that fail. Stored as query-strings."
}, }, {
{
id: "noglobals", id: "noglobals",
label: "Check for Globals", label: "Check for Globals",
tooltip: "Enabling this will test if any test introduces new properties on the " + tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings."
"global object (`window` in Browsers). Stored as query-strings." }, {
},
{
id: "notrycatch", id: "notrycatch",
label: "No try-catch", label: "No try-catch",
tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings."
"exceptions in IE reasonable. Stored as query-strings." });
}
);
QUnit.begin( function() { QUnit.begin(function () {
var i, option, var i,
option,
urlConfig = QUnit.config.urlConfig; urlConfig = QUnit.config.urlConfig;
for ( i = 0; i < urlConfig.length; i++ ) { for (i = 0; i < urlConfig.length; i++) {
// Options can be either strings or objects with nonempty "id" properties // Options can be either strings or objects with nonempty "id" properties
option = QUnit.config.urlConfig[ i ]; option = QUnit.config.urlConfig[i];
if ( typeof option !== "string" ) { if (typeof option !== "string") {
option = option.id; option = option.id;
} }
if ( QUnit.config[ option ] === undefined ) { if (QUnit.config[option] === undefined) {
QUnit.config[ option ] = urlParams[ option ]; QUnit.config[option] = urlParams[option];
} }
} }
} ); });
function getUrlParams() { function getUrlParams() {
var i, param, name, value; var i, param, name, value;
var urlParams = {}; var urlParams = Object.create(null);
var params = location.search.slice( 1 ).split( "&" ); var params = location.search.slice(1).split("&");
var length = params.length; var length = params.length;
for ( i = 0; i < length; i++ ) { for (i = 0; i < length; i++) {
if ( params[ i ] ) { if (params[i]) {
param = params[ i ].split( "=" ); param = params[i].split("=");
name = decodeQueryParam( param[ 0 ] ); name = decodeQueryParam(param[0]);
// Allow just a key to turn on a flag, e.g., test.html?noglobals // Allow just a key to turn on a flag, e.g., test.html?noglobals
value = param.length === 1 || value = param.length === 1 || decodeQueryParam(param.slice(1).join("="));
decodeQueryParam( param.slice( 1 ).join( "=" ) ) ; if (name in urlParams) {
if ( urlParams[ name ] ) { urlParams[name] = [].concat(urlParams[name], value);
urlParams[ name ] = [].concat( urlParams[ name ], value );
} else { } else {
urlParams[ name ] = value; urlParams[name] = value;
} }
} }
} }
return urlParams; return urlParams;
}
function decodeQueryParam( param ) {
return decodeURIComponent( param.replace( /\+/g, "%20" ) );
}
// Don't load the HTML Reporter on non-browser environments
if ( typeof window === "undefined" || !window.document ) {
return;
}
QUnit.init = function() {
throw new Error(
"QUnit.init is removed in QUnit 2.0, use QUnit.test() with assert.async() instead.\n" +
"Details in our upgrade guide at https://qunitjs.com/upgrade-guide-2.x/"
);
};
var config = QUnit.config,
document = window.document,
collapseNext = false,
hasOwn = Object.prototype.hasOwnProperty,
unfilteredUrl = setUrl( { filter: undefined, module: undefined,
moduleId: undefined, testId: undefined } ),
defined = {
sessionStorage: ( function() {
var x = "qunit-test-string";
try {
sessionStorage.setItem( x, x );
sessionStorage.removeItem( x );
return true;
} catch ( e ) {
return false;
} }
}() )
},
modulesList = [];
// Escape text for attribute or text content. function decodeQueryParam(param) {
function escapeText( s ) { return decodeURIComponent(param.replace(/\+/g, "%20"));
if ( !s ) { }
})();
// Escape text for attribute or text content.
function escapeText(s) {
if (!s) {
return ""; return "";
} }
s = s + ""; s = s + "";
// Both single quotes and double quotes (for attributes) // Both single quotes and double quotes (for attributes)
return s.replace( /['"<>&]/g, function( s ) { return s.replace(/['"<>&]/g, function (s) {
switch ( s ) { switch (s) {
case "'": case "'":
return "&#039;"; return "&#039;";
case "\"": case "\"":
@ -2441,231 +2477,255 @@ function escapeText( s ) {
case "&": case "&":
return "&amp;"; return "&amp;";
} }
} ); });
} }
function addEvent( elem, type, fn ) { (function () {
elem.addEventListener( type, fn, false );
}
function removeEvent( elem, type, fn ) { // Don't load the HTML Reporter on non-browser environments
elem.removeEventListener( type, fn, false ); if (typeof window === "undefined" || !window.document) {
} return;
}
function addEvents( elems, type, fn ) { var config = QUnit.config,
document$$1 = window.document,
collapseNext = false,
hasOwn = Object.prototype.hasOwnProperty,
unfilteredUrl = setUrl({ filter: undefined, module: undefined,
moduleId: undefined, testId: undefined }),
modulesList = [];
function addEvent(elem, type, fn) {
elem.addEventListener(type, fn, false);
}
function removeEvent(elem, type, fn) {
elem.removeEventListener(type, fn, false);
}
function addEvents(elems, type, fn) {
var i = elems.length; var i = elems.length;
while ( i-- ) { while (i--) {
addEvent( elems[ i ], type, fn ); addEvent(elems[i], type, fn);
} }
}
function hasClass( elem, name ) {
return ( " " + elem.className + " " ).indexOf( " " + name + " " ) >= 0;
}
function addClass( elem, name ) {
if ( !hasClass( elem, name ) ) {
elem.className += ( elem.className ? " " : "" ) + name;
} }
}
function toggleClass( elem, name, force ) { function hasClass(elem, name) {
if ( force || typeof force === "undefined" && !hasClass( elem, name ) ) { return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0;
addClass( elem, name ); }
function addClass(elem, name) {
if (!hasClass(elem, name)) {
elem.className += (elem.className ? " " : "") + name;
}
}
function toggleClass(elem, name, force) {
if (force || typeof force === "undefined" && !hasClass(elem, name)) {
addClass(elem, name);
} else { } else {
removeClass( elem, name ); removeClass(elem, name);
}
} }
}
function removeClass( elem, name ) { function removeClass(elem, name) {
var set = " " + elem.className + " "; var set = " " + elem.className + " ";
// Class name may appear multiple times // Class name may appear multiple times
while ( set.indexOf( " " + name + " " ) >= 0 ) { while (set.indexOf(" " + name + " ") >= 0) {
set = set.replace( " " + name + " ", " " ); set = set.replace(" " + name + " ", " ");
} }
// Trim for prettiness // Trim for prettiness
elem.className = typeof set.trim === "function" ? set.trim() : set.replace( /^\s+|\s+$/g, "" ); elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
} }
function id( name ) { function id(name) {
return document.getElementById && document.getElementById( name ); return document$$1.getElementById && document$$1.getElementById(name);
} }
function interceptNavigation( ev ) { function abortTests() {
var abortButton = id("qunit-abort-tests-button");
if (abortButton) {
abortButton.disabled = true;
abortButton.innerHTML = "Aborting...";
}
QUnit.config.queue.length = 0;
return false;
}
function interceptNavigation(ev) {
applyUrlParams(); applyUrlParams();
if ( ev && ev.preventDefault ) { if (ev && ev.preventDefault) {
ev.preventDefault(); ev.preventDefault();
} }
return false; return false;
} }
function getUrlConfigHtml() { function getUrlConfigHtml() {
var i, j, val, var i,
escaped, escapedTooltip, j,
val,
escaped,
escapedTooltip,
selection = false, selection = false,
urlConfig = config.urlConfig, urlConfig = config.urlConfig,
urlConfigHtml = ""; urlConfigHtml = "";
for ( i = 0; i < urlConfig.length; i++ ) { for (i = 0; i < urlConfig.length; i++) {
// Options can be either strings or objects with nonempty "id" properties // Options can be either strings or objects with nonempty "id" properties
val = config.urlConfig[ i ]; val = config.urlConfig[i];
if ( typeof val === "string" ) { if (typeof val === "string") {
val = { val = {
id: val, id: val,
label: val label: val
}; };
} }
escaped = escapeText( val.id ); escaped = escapeText(val.id);
escapedTooltip = escapeText( val.tooltip ); escapedTooltip = escapeText(val.tooltip);
if ( !val.value || typeof val.value === "string" ) { if (!val.value || typeof val.value === "string") {
urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>";
"' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped +
"' name='" + escaped + "' type='checkbox'" +
( val.value ? " value='" + escapeText( val.value ) + "'" : "" ) +
( config[ val.id ] ? " checked='checked'" : "" ) +
" title='" + escapedTooltip + "' />" + escapeText( val.label ) + "</label>";
} else { } else {
urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
"' title='" + escapedTooltip + "'>" + val.label +
": </label><select id='qunit-urlconfig-" + escaped +
"' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
if ( QUnit.is( "array", val.value ) ) { if (QUnit.is("array", val.value)) {
for ( j = 0; j < val.value.length; j++ ) { for (j = 0; j < val.value.length; j++) {
escaped = escapeText( val.value[ j ] ); escaped = escapeText(val.value[j]);
urlConfigHtml += "<option value='" + escaped + "'" + urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>";
( config[ val.id ] === val.value[ j ] ?
( selection = true ) && " selected='selected'" : "" ) +
">" + escaped + "</option>";
} }
} else { } else {
for ( j in val.value ) { for (j in val.value) {
if ( hasOwn.call( val.value, j ) ) { if (hasOwn.call(val.value, j)) {
urlConfigHtml += "<option value='" + escapeText( j ) + "'" + urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>";
( config[ val.id ] === j ?
( selection = true ) && " selected='selected'" : "" ) +
">" + escapeText( val.value[ j ] ) + "</option>";
} }
} }
} }
if ( config[ val.id ] && !selection ) { if (config[val.id] && !selection) {
escaped = escapeText( config[ val.id ] ); escaped = escapeText(config[val.id]);
urlConfigHtml += "<option value='" + escaped + urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>";
"' selected='selected' disabled='disabled'>" + escaped + "</option>";
} }
urlConfigHtml += "</select>"; urlConfigHtml += "</select>";
} }
} }
return urlConfigHtml; return urlConfigHtml;
} }
// Handle "click" events on toolbar checkboxes and "change" for select menus. // Handle "click" events on toolbar checkboxes and "change" for select menus.
// Updates the URL with the new state of `config.urlConfig` values. // Updates the URL with the new state of `config.urlConfig` values.
function toolbarChanged() { function toolbarChanged() {
var updatedUrl, value, tests, var updatedUrl,
value,
tests,
field = this, field = this,
params = {}; params = {};
// Detect if field is a select menu or a checkbox // Detect if field is a select menu or a checkbox
if ( "selectedIndex" in field ) { if ("selectedIndex" in field) {
value = field.options[ field.selectedIndex ].value || undefined; value = field.options[field.selectedIndex].value || undefined;
} else { } else {
value = field.checked ? ( field.defaultValue || true ) : undefined; value = field.checked ? field.defaultValue || true : undefined;
} }
params[ field.name ] = value; params[field.name] = value;
updatedUrl = setUrl( params ); updatedUrl = setUrl(params);
// Check if we can apply the change without a page refresh // Check if we can apply the change without a page refresh
if ( "hidepassed" === field.name && "replaceState" in window.history ) { if ("hidepassed" === field.name && "replaceState" in window.history) {
QUnit.urlParams[ field.name ] = value; QUnit.urlParams[field.name] = value;
config[ field.name ] = value || false; config[field.name] = value || false;
tests = id( "qunit-tests" ); tests = id("qunit-tests");
if ( tests ) { if (tests) {
toggleClass( tests, "hidepass", value || false ); toggleClass(tests, "hidepass", value || false);
} }
window.history.replaceState( null, "", updatedUrl ); window.history.replaceState(null, "", updatedUrl);
} else { } else {
window.location = updatedUrl; window.location = updatedUrl;
} }
} }
function setUrl( params ) { function setUrl(params) {
var key, arrValue, i, var key,
arrValue,
i,
querystring = "?", querystring = "?",
location = window.location; location = window.location;
params = QUnit.extend( QUnit.extend( {}, QUnit.urlParams ), params ); params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params);
for ( key in params ) { for (key in params) {
// Skip inherited or undefined properties // Skip inherited or undefined properties
if ( hasOwn.call( params, key ) && params[ key ] !== undefined ) { if (hasOwn.call(params, key) && params[key] !== undefined) {
// Output a parameter for each value of this key (but usually just one) // Output a parameter for each value of this key (but usually just one)
arrValue = [].concat( params[ key ] ); arrValue = [].concat(params[key]);
for ( i = 0; i < arrValue.length; i++ ) { for (i = 0; i < arrValue.length; i++) {
querystring += encodeURIComponent( key ); querystring += encodeURIComponent(key);
if ( arrValue[ i ] !== true ) { if (arrValue[i] !== true) {
querystring += "=" + encodeURIComponent( arrValue[ i ] ); querystring += "=" + encodeURIComponent(arrValue[i]);
} }
querystring += "&"; querystring += "&";
} }
} }
} }
return location.protocol + "//" + location.host + return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1);
location.pathname + querystring.slice( 0, -1 ); }
}
function applyUrlParams() { function applyUrlParams() {
var i, var i,
selectedModules = [], selectedModules = [],
modulesList = id( "qunit-modulefilter-dropdown-list" ).getElementsByTagName( "input" ), modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"),
filter = id( "qunit-filter-input" ).value; filter = id("qunit-filter-input").value;
for ( i = 0; i < modulesList.length; i++ ) { for (i = 0; i < modulesList.length; i++) {
if ( modulesList[ i ].checked ) { if (modulesList[i].checked) {
selectedModules.push( modulesList[ i ].value ); selectedModules.push(modulesList[i].value);
} }
} }
window.location = setUrl( { window.location = setUrl({
filter: ( filter === "" ) ? undefined : filter, filter: filter === "" ? undefined : filter,
moduleId: ( selectedModules.length === 0 ) ? undefined : selectedModules, moduleId: selectedModules.length === 0 ? undefined : selectedModules,
// Remove module and testId filter // Remove module and testId filter
module: undefined, module: undefined,
testId: undefined testId: undefined
} ); });
} }
function toolbarUrlConfigContainer() { function toolbarUrlConfigContainer() {
var urlConfigContainer = document.createElement( "span" ); var urlConfigContainer = document$$1.createElement("span");
urlConfigContainer.innerHTML = getUrlConfigHtml(); urlConfigContainer.innerHTML = getUrlConfigHtml();
addClass( urlConfigContainer, "qunit-url-config" ); addClass(urlConfigContainer, "qunit-url-config");
addEvents( urlConfigContainer.getElementsByTagName( "input" ), "change", toolbarChanged ); addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged);
addEvents( urlConfigContainer.getElementsByTagName( "select" ), "change", toolbarChanged ); addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged);
return urlConfigContainer; return urlConfigContainer;
} }
function toolbarLooseFilter() { function abortTestsButton() {
var filter = document.createElement( "form" ), var button = document$$1.createElement("button");
label = document.createElement( "label" ), button.id = "qunit-abort-tests-button";
input = document.createElement( "input" ), button.innerHTML = "Abort";
button = document.createElement( "button" ); addEvent(button, "click", abortTests);
return button;
}
addClass( filter, "qunit-filter" ); function toolbarLooseFilter() {
var filter = document$$1.createElement("form"),
label = document$$1.createElement("label"),
input = document$$1.createElement("input"),
button = document$$1.createElement("button");
addClass(filter, "qunit-filter");
label.innerHTML = "Filter: "; label.innerHTML = "Filter: ";
@ -2676,107 +2736,101 @@ function toolbarLooseFilter() {
button.innerHTML = "Go"; button.innerHTML = "Go";
label.appendChild( input ); label.appendChild(input);
filter.appendChild( label ); filter.appendChild(label);
filter.appendChild( document.createTextNode( " " ) ); filter.appendChild(document$$1.createTextNode(" "));
filter.appendChild( button ); filter.appendChild(button);
addEvent( filter, "submit", interceptNavigation ); addEvent(filter, "submit", interceptNavigation);
return filter; return filter;
} }
function moduleListHtml () { function moduleListHtml() {
var i, checked, var i,
checked,
html = ""; html = "";
for ( i = 0; i < config.modules.length; i++ ) { for (i = 0; i < config.modules.length; i++) {
if ( config.modules[ i ].name !== "" ) { if (config.modules[i].name !== "") {
checked = config.moduleId.indexOf( config.modules[ i ].moduleId ) > -1; checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1;
html += "<li><label class='clickable" + ( checked ? " checked" : "" ) + html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>";
"'><input type='checkbox' " + "value='" + config.modules[ i ].moduleId + "'" +
( checked ? " checked='checked'" : "" ) + " />" +
escapeText( config.modules[ i ].name ) + "</label></li>";
} }
} }
return html; return html;
} }
function toolbarModuleFilter () { function toolbarModuleFilter() {
var allCheckbox, commit, reset, var allCheckbox,
moduleFilter = document.createElement( "form" ), commit,
label = document.createElement( "label" ), reset,
moduleSearch = document.createElement( "input" ), moduleFilter = document$$1.createElement("form"),
dropDown = document.createElement( "div" ), label = document$$1.createElement("label"),
actions = document.createElement( "span" ), moduleSearch = document$$1.createElement("input"),
dropDownList = document.createElement( "ul" ), dropDown = document$$1.createElement("div"),
actions = document$$1.createElement("span"),
dropDownList = document$$1.createElement("ul"),
dirty = false; dirty = false;
moduleSearch.id = "qunit-modulefilter-search"; moduleSearch.id = "qunit-modulefilter-search";
addEvent( moduleSearch, "input", searchInput ); addEvent(moduleSearch, "input", searchInput);
addEvent( moduleSearch, "input", searchFocus ); addEvent(moduleSearch, "input", searchFocus);
addEvent( moduleSearch, "focus", searchFocus ); addEvent(moduleSearch, "focus", searchFocus);
addEvent( moduleSearch, "click", searchFocus ); addEvent(moduleSearch, "click", searchFocus);
label.id = "qunit-modulefilter-search-container"; label.id = "qunit-modulefilter-search-container";
label.innerHTML = "Module: "; label.innerHTML = "Module: ";
label.appendChild( moduleSearch ); label.appendChild(moduleSearch);
actions.id = "qunit-modulefilter-actions"; actions.id = "qunit-modulefilter-actions";
actions.innerHTML = actions.innerHTML = "<button style='display:none'>Apply</button>" + "<button type='reset' style='display:none'>Reset</button>" + "<label class='clickable" + (config.moduleId.length ? "" : " checked") + "'><input type='checkbox'" + (config.moduleId.length ? "" : " checked='checked'") + ">All modules</label>";
"<button style='display:none'>Apply</button>" +
"<button type='reset' style='display:none'>Reset</button>" +
"<label class='clickable" +
( config.moduleId.length ? "" : " checked" ) +
"'><input type='checkbox'" + ( config.moduleId.length ? "" : " checked='checked'" ) +
">All modules</label>";
allCheckbox = actions.lastChild.firstChild; allCheckbox = actions.lastChild.firstChild;
commit = actions.firstChild; commit = actions.firstChild;
reset = commit.nextSibling; reset = commit.nextSibling;
addEvent( commit, "click", applyUrlParams ); addEvent(commit, "click", applyUrlParams);
dropDownList.id = "qunit-modulefilter-dropdown-list"; dropDownList.id = "qunit-modulefilter-dropdown-list";
dropDownList.innerHTML = moduleListHtml(); dropDownList.innerHTML = moduleListHtml();
dropDown.id = "qunit-modulefilter-dropdown"; dropDown.id = "qunit-modulefilter-dropdown";
dropDown.style.display = "none"; dropDown.style.display = "none";
dropDown.appendChild( actions ); dropDown.appendChild(actions);
dropDown.appendChild( dropDownList ); dropDown.appendChild(dropDownList);
addEvent( dropDown, "change", selectionChange ); addEvent(dropDown, "change", selectionChange);
selectionChange(); selectionChange();
moduleFilter.id = "qunit-modulefilter"; moduleFilter.id = "qunit-modulefilter";
moduleFilter.appendChild( label ); moduleFilter.appendChild(label);
moduleFilter.appendChild( dropDown ) ; moduleFilter.appendChild(dropDown);
addEvent( moduleFilter, "submit", interceptNavigation ); addEvent(moduleFilter, "submit", interceptNavigation);
addEvent( moduleFilter, "reset", function() { addEvent(moduleFilter, "reset", function () {
// Let the reset happen, then update styles // Let the reset happen, then update styles
window.setTimeout( selectionChange ); window.setTimeout(selectionChange);
} ); });
// Enables show/hide for the dropdown // Enables show/hide for the dropdown
function searchFocus() { function searchFocus() {
if ( dropDown.style.display !== "none" ) { if (dropDown.style.display !== "none") {
return; return;
} }
dropDown.style.display = "block"; dropDown.style.display = "block";
addEvent( document, "click", hideHandler ); addEvent(document$$1, "click", hideHandler);
addEvent( document, "keydown", hideHandler ); addEvent(document$$1, "keydown", hideHandler);
// Hide on Escape keydown or outside-container click // Hide on Escape keydown or outside-container click
function hideHandler( e ) { function hideHandler(e) {
var inContainer = moduleFilter.contains( e.target ); var inContainer = moduleFilter.contains(e.target);
if ( e.keyCode === 27 || !inContainer ) { if (e.keyCode === 27 || !inContainer) {
if ( e.keyCode === 27 && inContainer ) { if (e.keyCode === 27 && inContainer) {
moduleSearch.focus(); moduleSearch.focus();
} }
dropDown.style.display = "none"; dropDown.style.display = "none";
removeEvent( document, "click", hideHandler ); removeEvent(document$$1, "click", hideHandler);
removeEvent( document, "keydown", hideHandler ); removeEvent(document$$1, "keydown", hideHandler);
moduleSearch.value = ""; moduleSearch.value = "";
searchInput(); searchInput();
} }
@ -2785,13 +2839,14 @@ function toolbarModuleFilter () {
// Processes module search box input // Processes module search box input
function searchInput() { function searchInput() {
var i, item, var i,
item,
searchText = moduleSearch.value.toLowerCase(), searchText = moduleSearch.value.toLowerCase(),
listItems = dropDownList.children; listItems = dropDownList.children;
for ( i = 0; i < listItems.length; i++ ) { for (i = 0; i < listItems.length; i++) {
item = listItems[ i ]; item = listItems[i];
if ( !searchText || item.textContent.toLowerCase().indexOf( searchText ) > -1 ) { if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) {
item.style.display = ""; item.style.display = "";
} else { } else {
item.style.display = "none"; item.style.display = "none";
@ -2800,124 +2855,115 @@ function toolbarModuleFilter () {
} }
// Processes selection changes // Processes selection changes
function selectionChange( evt ) { function selectionChange(evt) {
var i, item, var i,
item,
checkbox = evt && evt.target || allCheckbox, checkbox = evt && evt.target || allCheckbox,
modulesList = dropDownList.getElementsByTagName( "input" ), modulesList = dropDownList.getElementsByTagName("input"),
selectedNames = []; selectedNames = [];
toggleClass( checkbox.parentNode, "checked", checkbox.checked ); toggleClass(checkbox.parentNode, "checked", checkbox.checked);
dirty = false; dirty = false;
if ( checkbox.checked && checkbox !== allCheckbox ) { if (checkbox.checked && checkbox !== allCheckbox) {
allCheckbox.checked = false; allCheckbox.checked = false;
removeClass( allCheckbox.parentNode, "checked" ); removeClass(allCheckbox.parentNode, "checked");
} }
for ( i = 0; i < modulesList.length; i++ ) { for (i = 0; i < modulesList.length; i++) {
item = modulesList[ i ]; item = modulesList[i];
if ( !evt ) { if (!evt) {
toggleClass( item.parentNode, "checked", item.checked ); toggleClass(item.parentNode, "checked", item.checked);
} else if ( checkbox === allCheckbox && checkbox.checked ) { } else if (checkbox === allCheckbox && checkbox.checked) {
item.checked = false; item.checked = false;
removeClass( item.parentNode, "checked" ); removeClass(item.parentNode, "checked");
} }
dirty = dirty || ( item.checked !== item.defaultChecked ); dirty = dirty || item.checked !== item.defaultChecked;
if ( item.checked ) { if (item.checked) {
selectedNames.push( item.parentNode.textContent ); selectedNames.push(item.parentNode.textContent);
} }
} }
commit.style.display = reset.style.display = dirty ? "" : "none"; commit.style.display = reset.style.display = dirty ? "" : "none";
moduleSearch.placeholder = selectedNames.join( ", " ) || allCheckbox.parentNode.textContent; moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent;
moduleSearch.title = "Type to filter list. Current selection:\n" + moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent);
( selectedNames.join( "\n" ) || allCheckbox.parentNode.textContent );
} }
return moduleFilter; return moduleFilter;
}
function appendToolbar() {
var toolbar = id( "qunit-testrunner-toolbar" );
if ( toolbar ) {
toolbar.appendChild( toolbarUrlConfigContainer() );
toolbar.appendChild( toolbarModuleFilter() );
toolbar.appendChild( toolbarLooseFilter() );
toolbar.appendChild( document.createElement( "div" ) ).className = "clearfix";
} }
}
function appendHeader() { function appendToolbar() {
var header = id( "qunit-header" ); var toolbar = id("qunit-testrunner-toolbar");
if ( header ) { if (toolbar) {
header.innerHTML = "<a href='" + escapeText( unfilteredUrl ) + "'>" + header.innerHTML + toolbar.appendChild(toolbarUrlConfigContainer());
"</a> "; toolbar.appendChild(toolbarModuleFilter());
toolbar.appendChild(toolbarLooseFilter());
toolbar.appendChild(document$$1.createElement("div")).className = "clearfix";
}
} }
}
function appendBanner() { function appendHeader() {
var banner = id( "qunit-banner" ); var header = id("qunit-header");
if ( banner ) { if (header) {
header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> ";
}
}
function appendBanner() {
var banner = id("qunit-banner");
if (banner) {
banner.className = ""; banner.className = "";
} }
}
function appendTestResults() {
var tests = id( "qunit-tests" ),
result = id( "qunit-testresult" );
if ( result ) {
result.parentNode.removeChild( result );
} }
if ( tests ) { function appendTestResults() {
var tests = id("qunit-tests"),
result = id("qunit-testresult"),
controls;
if (result) {
result.parentNode.removeChild(result);
}
if (tests) {
tests.innerHTML = ""; tests.innerHTML = "";
result = document.createElement( "p" ); result = document$$1.createElement("p");
result.id = "qunit-testresult"; result.id = "qunit-testresult";
result.className = "result"; result.className = "result";
tests.parentNode.insertBefore( result, tests ); tests.parentNode.insertBefore(result, tests);
result.innerHTML = "Running...<br />&#160;"; result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br />&#160;</div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>";
controls = id("qunit-testresult-controls");
} }
}
function appendFilteredTest() { if (controls) {
controls.appendChild(abortTestsButton());
}
}
function appendFilteredTest() {
var testId = QUnit.config.testId; var testId = QUnit.config.testId;
if ( !testId || testId.length <= 0 ) { if (!testId || testId.length <= 0) {
return ""; return "";
} }
return "<div id='qunit-filteredTest'>Rerunning selected tests: " + return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>";
escapeText( testId.join( ", " ) ) +
" <a id='qunit-clearFilter' href='" +
escapeText( unfilteredUrl ) +
"'>Run all tests</a></div>";
}
function appendUserAgent() {
var userAgent = id( "qunit-userAgent" );
if ( userAgent ) {
userAgent.innerHTML = "";
userAgent.appendChild(
document.createTextNode(
"QUnit " + QUnit.version + "; " + navigator.userAgent
)
);
} }
}
function appendInterface() { function appendUserAgent() {
var qunit = id( "qunit" ); var userAgent = id("qunit-userAgent");
if ( qunit ) { if (userAgent) {
qunit.innerHTML = userAgent.innerHTML = "";
"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" + userAgent.appendChild(document$$1.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent));
"<h2 id='qunit-banner'></h2>" + }
"<div id='qunit-testrunner-toolbar'></div>" + }
appendFilteredTest() +
"<h2 id='qunit-userAgent'></h2>" + function appendInterface() {
"<ol id='qunit-tests'></ol>"; var qunit = id("qunit");
if (qunit) {
qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document$$1.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>";
} }
appendHeader(); appendHeader();
@ -2925,349 +2971,330 @@ function appendInterface() {
appendTestResults(); appendTestResults();
appendUserAgent(); appendUserAgent();
appendToolbar(); appendToolbar();
} }
function appendTestsList( modules ) { function appendTestsList(modules) {
var i, l, x, z, test, moduleObj; var i, l, x, z, test, moduleObj;
for ( i = 0, l = modules.length; i < l; i++ ) { for (i = 0, l = modules.length; i < l; i++) {
moduleObj = modules[ i ]; moduleObj = modules[i];
for ( x = 0, z = moduleObj.tests.length; x < z; x++ ) { for (x = 0, z = moduleObj.tests.length; x < z; x++) {
test = moduleObj.tests[ x ]; test = moduleObj.tests[x];
appendTest( test.name, test.testId, moduleObj.name ); appendTest(test.name, test.testId, moduleObj.name);
}
} }
} }
}
function appendTest( name, testId, moduleName ) { function appendTest(name, testId, moduleName) {
var title, rerunTrigger, testBlock, assertList, var title,
tests = id( "qunit-tests" ); rerunTrigger,
testBlock,
assertList,
tests = id("qunit-tests");
if ( !tests ) { if (!tests) {
return; return;
} }
title = document.createElement( "strong" ); title = document$$1.createElement("strong");
title.innerHTML = getNameHtml( name, moduleName ); title.innerHTML = getNameHtml(name, moduleName);
rerunTrigger = document.createElement( "a" ); rerunTrigger = document$$1.createElement("a");
rerunTrigger.innerHTML = "Rerun"; rerunTrigger.innerHTML = "Rerun";
rerunTrigger.href = setUrl( { testId: testId } ); rerunTrigger.href = setUrl({ testId: testId });
testBlock = document.createElement( "li" ); testBlock = document$$1.createElement("li");
testBlock.appendChild( title ); testBlock.appendChild(title);
testBlock.appendChild( rerunTrigger ); testBlock.appendChild(rerunTrigger);
testBlock.id = "qunit-test-output-" + testId; testBlock.id = "qunit-test-output-" + testId;
assertList = document.createElement( "ol" ); assertList = document$$1.createElement("ol");
assertList.className = "qunit-assert-list"; assertList.className = "qunit-assert-list";
testBlock.appendChild( assertList ); testBlock.appendChild(assertList);
tests.appendChild( testBlock ); tests.appendChild(testBlock);
} }
// HTML Reporter initialization and load // HTML Reporter initialization and load
QUnit.begin( function( details ) { QUnit.begin(function (details) {
var i, moduleObj, tests; var i, moduleObj, tests;
// Sort modules by name for the picker // Sort modules by name for the picker
for ( i = 0; i < details.modules.length; i++ ) { for (i = 0; i < details.modules.length; i++) {
moduleObj = details.modules[ i ]; moduleObj = details.modules[i];
if ( moduleObj.name ) { if (moduleObj.name) {
modulesList.push( moduleObj.name ); modulesList.push(moduleObj.name);
} }
} }
modulesList.sort( function( a, b ) { modulesList.sort(function (a, b) {
return a.localeCompare( b ); return a.localeCompare(b);
} ); });
// Initialize QUnit elements // Initialize QUnit elements
appendInterface(); appendInterface();
appendTestsList( details.modules ); appendTestsList(details.modules);
tests = id( "qunit-tests" ); tests = id("qunit-tests");
if ( tests && config.hidepassed ) { if (tests && config.hidepassed) {
addClass( tests, "hidepass" ); addClass(tests, "hidepass");
} }
} ); });
QUnit.done( function( details ) { QUnit.done(function (details) {
var i, key, var banner = id("qunit-banner"),
banner = id( "qunit-banner" ), tests = id("qunit-tests"),
tests = id( "qunit-tests" ), abortButton = id("qunit-abort-tests-button"),
html = [ html = ["Tests completed in ", details.runtime, " milliseconds.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""),
"Tests completed in ", test,
details.runtime, assertLi,
" milliseconds.<br />", assertList;
"<span class='passed'>",
details.passed,
"</span> assertions of <span class='total'>",
details.total,
"</span> passed, <span class='failed'>",
details.failed,
"</span> failed."
].join( "" );
if ( banner ) { // Update remaing tests to aborted
if (abortButton && abortButton.disabled) {
html = "Tests aborted after " + details.runtime + " milliseconds.";
for (var i = 0; i < tests.children.length; i++) {
test = tests.children[i];
if (test.className === "" || test.className === "running") {
test.className = "aborted";
assertList = test.getElementsByTagName("ol")[0];
assertLi = document$$1.createElement("li");
assertLi.className = "fail";
assertLi.innerHTML = "Test aborted.";
assertList.appendChild(assertLi);
}
}
}
if (banner && (!abortButton || abortButton.disabled === false)) {
banner.className = details.failed ? "qunit-fail" : "qunit-pass"; banner.className = details.failed ? "qunit-fail" : "qunit-pass";
} }
if ( tests ) { if (abortButton) {
id( "qunit-testresult" ).innerHTML = html; abortButton.parentNode.removeChild(abortButton);
} }
if ( config.altertitle && document.title ) { if (tests) {
id("qunit-testresult-display").innerHTML = html;
}
if (config.altertitle && document$$1.title) {
// Show ✖ for good, ✔ for bad suite result in title // Show ✖ for good, ✔ for bad suite result in title
// use escape sequences in case file gets loaded with non-utf-8-charset // use escape sequences in case file gets loaded with non-utf-8-charset
document.title = [ document$$1.title = [details.failed ? "\u2716" : "\u2714", document$$1.title.replace(/^[\u2714\u2716] /i, "")].join(" ");
( details.failed ? "\u2716" : "\u2714" ),
document.title.replace( /^[\u2714\u2716] /i, "" )
].join( " " );
}
// Clear own sessionStorage items if all tests passed
if ( config.reorder && defined.sessionStorage && details.failed === 0 ) {
for ( i = 0; i < sessionStorage.length; i++ ) {
key = sessionStorage.key( i++ );
if ( key.indexOf( "qunit-test-" ) === 0 ) {
sessionStorage.removeItem( key );
}
}
} }
// Scroll back to top to show results // Scroll back to top to show results
if ( config.scrolltop && window.scrollTo ) { if (config.scrolltop && window.scrollTo) {
window.scrollTo( 0, 0 ); window.scrollTo(0, 0);
} }
} ); });
function getNameHtml( name, module ) { function getNameHtml(name, module) {
var nameHtml = ""; var nameHtml = "";
if ( module ) { if (module) {
nameHtml = "<span class='module-name'>" + escapeText( module ) + "</span>: "; nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: ";
} }
nameHtml += "<span class='test-name'>" + escapeText( name ) + "</span>"; nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>";
return nameHtml; return nameHtml;
} }
QUnit.testStart( function( details ) { QUnit.testStart(function (details) {
var running, testBlock, bad; var running, testBlock, bad;
testBlock = id( "qunit-test-output-" + details.testId ); testBlock = id("qunit-test-output-" + details.testId);
if ( testBlock ) { if (testBlock) {
testBlock.className = "running"; testBlock.className = "running";
} else { } else {
// Report later registered tests // Report later registered tests
appendTest( details.name, details.testId, details.module ); appendTest(details.name, details.testId, details.module);
} }
running = id( "qunit-testresult" ); running = id("qunit-testresult-display");
if ( running ) { if (running) {
bad = QUnit.config.reorder && defined.sessionStorage && bad = QUnit.config.reorder && details.previousFailure;
+sessionStorage.getItem( "qunit-test-" + details.module + "-" + details.name );
running.innerHTML = ( bad ? running.innerHTML = (bad ? "Rerunning previously failed test: <br />" : "Running: <br />") + getNameHtml(details.name, details.module);
"Rerunning previously failed test: <br />" :
"Running: <br />" ) +
getNameHtml( details.name, details.module );
} }
});
} ); function stripHtml(string) {
function stripHtml( string ) {
// Strip tags, html entity and whitespaces // Strip tags, html entity and whitespaces
return string.replace( /<\/?[^>]+(>|$)/g, "" ).replace( /\&quot;/g, "" ).replace( /\s+/g, "" ); return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/\&quot;/g, "").replace(/\s+/g, "");
} }
QUnit.log( function( details ) { QUnit.log(function (details) {
var assertList, assertLi, var assertList,
message, expected, actual, diff, assertLi,
message,
expected,
actual,
diff,
showDiff = false, showDiff = false,
testItem = id( "qunit-test-output-" + details.testId ); testItem = id("qunit-test-output-" + details.testId);
if ( !testItem ) { if (!testItem) {
return; return;
} }
message = escapeText( details.message ) || ( details.result ? "okay" : "failed" ); message = escapeText(details.message) || (details.result ? "okay" : "failed");
message = "<span class='test-message'>" + message + "</span>"; message = "<span class='test-message'>" + message + "</span>";
message += "<span class='runtime'>@ " + details.runtime + " ms</span>"; message += "<span class='runtime'>@ " + details.runtime + " ms</span>";
// The pushFailure doesn't provide details.expected // The pushFailure doesn't provide details.expected
// when it calls, it's implicit to also not show expected and diff stuff // when it calls, it's implicit to also not show expected and diff stuff
// Also, we need to check details.expected existence, as it can exist and be undefined // Also, we need to check details.expected existence, as it can exist and be undefined
if ( !details.result && hasOwn.call( details, "expected" ) ) { if (!details.result && hasOwn.call(details, "expected")) {
if ( details.negative ) { if (details.negative) {
expected = "NOT " + QUnit.dump.parse( details.expected ); expected = "NOT " + QUnit.dump.parse(details.expected);
} else { } else {
expected = QUnit.dump.parse( details.expected ); expected = QUnit.dump.parse(details.expected);
} }
actual = QUnit.dump.parse( details.actual ); actual = QUnit.dump.parse(details.actual);
message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>";
escapeText( expected ) +
"</pre></td></tr>";
if ( actual !== expected ) { if (actual !== expected) {
message += "<tr class='test-actual'><th>Result: </th><td><pre>" + message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>";
escapeText( actual ) + "</pre></td></tr>";
// Don't show diff if actual or expected are booleans // Don't show diff if actual or expected are booleans
if ( !( /^(true|false)$/.test( actual ) ) && if (!/^(true|false)$/.test(actual) && !/^(true|false)$/.test(expected)) {
!( /^(true|false)$/.test( expected ) ) ) { diff = QUnit.diff(expected, actual);
diff = QUnit.diff( expected, actual ); showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length;
showDiff = stripHtml( diff ).length !==
stripHtml( expected ).length +
stripHtml( actual ).length;
} }
// Don't show diff if expected and actual are totally different // Don't show diff if expected and actual are totally different
if ( showDiff ) { if (showDiff) {
message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>";
diff + "</pre></td></tr>";
} }
} else if ( expected.indexOf( "[object Array]" ) !== -1 || } else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) {
expected.indexOf( "[object Object]" ) !== -1 ) { message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({ maxDepth: -1 })) + "'>" + "Rerun</a> without max depth.</p></td></tr>";
message += "<tr class='test-message'><th>Message: </th><td>" +
"Diff suppressed as the depth of object is more than current max depth (" +
QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " +
" run with a higher max depth or <a href='" +
escapeText( setUrl( { maxDepth: -1 } ) ) + "'>" +
"Rerun</a> without max depth.</p></td></tr>";
} else { } else {
message += "<tr class='test-message'><th>Message: </th><td>" + message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>";
"Diff suppressed as the expected and actual results have an equivalent" +
" serialization</td></tr>";
} }
if ( details.source ) { if (details.source) {
message += "<tr class='test-source'><th>Source: </th><td><pre>" + message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>";
escapeText( details.source ) + "</pre></td></tr>";
} }
message += "</table>"; message += "</table>";
// This occurs when pushFailure is set and we have an extracted stack trace // This occurs when pushFailure is set and we have an extracted stack trace
} else if ( !details.result && details.source ) { } else if (!details.result && details.source) {
message += "<table>" + message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>";
"<tr class='test-source'><th>Source: </th><td><pre>" +
escapeText( details.source ) + "</pre></td></tr>" +
"</table>";
} }
assertList = testItem.getElementsByTagName( "ol" )[ 0 ]; assertList = testItem.getElementsByTagName("ol")[0];
assertLi = document.createElement( "li" ); assertLi = document$$1.createElement("li");
assertLi.className = details.result ? "pass" : "fail"; assertLi.className = details.result ? "pass" : "fail";
assertLi.innerHTML = message; assertLi.innerHTML = message;
assertList.appendChild( assertLi ); assertList.appendChild(assertLi);
} ); });
QUnit.testDone( function( details ) { QUnit.testDone(function (details) {
var testTitle, time, testItem, assertList, var testTitle,
good, bad, testCounts, skipped, sourceName, time,
tests = id( "qunit-tests" ); testItem,
assertList,
good,
bad,
testCounts,
skipped,
sourceName,
tests = id("qunit-tests");
if ( !tests ) { if (!tests) {
return; return;
} }
testItem = id( "qunit-test-output-" + details.testId ); testItem = id("qunit-test-output-" + details.testId);
assertList = testItem.getElementsByTagName( "ol" )[ 0 ]; assertList = testItem.getElementsByTagName("ol")[0];
good = details.passed; good = details.passed;
bad = details.failed; bad = details.failed;
// Store result when possible if (bad === 0) {
if ( config.reorder && defined.sessionStorage ) {
if ( bad ) {
sessionStorage.setItem( "qunit-test-" + details.module + "-" + details.name, bad );
} else {
sessionStorage.removeItem( "qunit-test-" + details.module + "-" + details.name );
}
}
if ( bad === 0 ) {
// Collapse the passing tests // Collapse the passing tests
addClass( assertList, "qunit-collapsed" ); addClass(assertList, "qunit-collapsed");
} else if ( bad && config.collapse && !collapseNext ) { } else if (config.collapse) {
if (!collapseNext) {
// Skip collapsing the first failing test // Skip collapsing the first failing test
collapseNext = true; collapseNext = true;
} else { } else {
// Collapse remaining tests // Collapse remaining tests
addClass( assertList, "qunit-collapsed" ); addClass(assertList, "qunit-collapsed");
}
} }
// The testItem.firstChild is the test name // The testItem.firstChild is the test name
testTitle = testItem.firstChild; testTitle = testItem.firstChild;
testCounts = bad ? testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : "";
"<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " :
"";
testTitle.innerHTML += " <b class='counts'>(" + testCounts + testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>";
details.assertions.length + ")</b>";
if ( details.skipped ) { if (details.skipped) {
testItem.className = "skipped"; testItem.className = "skipped";
skipped = document.createElement( "em" ); skipped = document$$1.createElement("em");
skipped.className = "qunit-skipped-label"; skipped.className = "qunit-skipped-label";
skipped.innerHTML = "skipped"; skipped.innerHTML = "skipped";
testItem.insertBefore( skipped, testTitle ); testItem.insertBefore(skipped, testTitle);
} else { } else {
addEvent( testTitle, "click", function() { addEvent(testTitle, "click", function () {
toggleClass( assertList, "qunit-collapsed" ); toggleClass(assertList, "qunit-collapsed");
} ); });
testItem.className = bad ? "fail" : "pass"; testItem.className = bad ? "fail" : "pass";
time = document.createElement( "span" ); time = document$$1.createElement("span");
time.className = "runtime"; time.className = "runtime";
time.innerHTML = details.runtime + " ms"; time.innerHTML = details.runtime + " ms";
testItem.insertBefore( time, assertList ); testItem.insertBefore(time, assertList);
} }
// Show the source of the test when showing assertions // Show the source of the test when showing assertions
if ( details.source ) { if (details.source) {
sourceName = document.createElement( "p" ); sourceName = document$$1.createElement("p");
sourceName.innerHTML = "<strong>Source: </strong>" + details.source; sourceName.innerHTML = "<strong>Source: </strong>" + details.source;
addClass( sourceName, "qunit-source" ); addClass(sourceName, "qunit-source");
if ( bad === 0 ) { if (bad === 0) {
addClass( sourceName, "qunit-collapsed" ); addClass(sourceName, "qunit-collapsed");
} }
addEvent( testTitle, "click", function() { addEvent(testTitle, "click", function () {
toggleClass( sourceName, "qunit-collapsed" ); toggleClass(sourceName, "qunit-collapsed");
} ); });
testItem.appendChild( sourceName ); testItem.appendChild(sourceName);
} }
} ); });
// Avoid readyState issue with phantomjs // Avoid readyState issue with phantomjs
// Ref: #818 // Ref: #818
var notPhantom = ( function( p ) { var notPhantom = function (p) {
return !( p && p.version && p.version.major > 0 ); return !(p && p.version && p.version.major > 0);
} )( window.phantom ); }(window.phantom);
if ( notPhantom && document.readyState === "complete" ) { if (notPhantom && document$$1.readyState === "complete") {
QUnit.load(); QUnit.load();
} else { } else {
addEvent( window, "load", QUnit.load ); addEvent(window, "load", QUnit.load);
} }
})();
/* /*
* This file is a modified version of google-diff-match-patch's JavaScript implementation * This file is a modified version of google-diff-match-patch's JavaScript implementation
* (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js), * (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
* modifications are licensed as more fully set forth in LICENSE.txt. * modifications are licensed as more fully set forth in LICENSE.txt.
@ -3295,9 +3322,8 @@ if ( notPhantom && document.readyState === "complete" ) {
* Usage: QUnit.diff(expected, actual) * Usage: QUnit.diff(expected, actual)
* *
*/ */
QUnit.diff = ( function() { QUnit.diff = function () {
function DiffMatchPatch() { function DiffMatchPatch() {}
}
// DIFF FUNCTIONS // DIFF FUNCTIONS
@ -3320,57 +3346,54 @@ QUnit.diff = ( function() {
* Defaults to true, which does a faster, slightly less optimal diff. * Defaults to true, which does a faster, slightly less optimal diff.
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
*/ */
DiffMatchPatch.prototype.DiffMain = function( text1, text2, optChecklines ) { DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) {
var deadline, checklines, commonlength, var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs;
commonprefix, commonsuffix, diffs;
// The diff must be complete in up to 1 second. // The diff must be complete in up to 1 second.
deadline = ( new Date() ).getTime() + 1000; deadline = new Date().getTime() + 1000;
// Check for null inputs. // Check for null inputs.
if ( text1 === null || text2 === null ) { if (text1 === null || text2 === null) {
throw new Error( "Null input. (DiffMain)" ); throw new Error("Null input. (DiffMain)");
} }
// Check for equality (speedup). // Check for equality (speedup).
if ( text1 === text2 ) { if (text1 === text2) {
if ( text1 ) { if (text1) {
return [ return [[DIFF_EQUAL, text1]];
[ DIFF_EQUAL, text1 ]
];
} }
return []; return [];
} }
if ( typeof optChecklines === "undefined" ) { if (typeof optChecklines === "undefined") {
optChecklines = true; optChecklines = true;
} }
checklines = optChecklines; checklines = optChecklines;
// Trim off common prefix (speedup). // Trim off common prefix (speedup).
commonlength = this.diffCommonPrefix( text1, text2 ); commonlength = this.diffCommonPrefix(text1, text2);
commonprefix = text1.substring( 0, commonlength ); commonprefix = text1.substring(0, commonlength);
text1 = text1.substring( commonlength ); text1 = text1.substring(commonlength);
text2 = text2.substring( commonlength ); text2 = text2.substring(commonlength);
// Trim off common suffix (speedup). // Trim off common suffix (speedup).
commonlength = this.diffCommonSuffix( text1, text2 ); commonlength = this.diffCommonSuffix(text1, text2);
commonsuffix = text1.substring( text1.length - commonlength ); commonsuffix = text1.substring(text1.length - commonlength);
text1 = text1.substring( 0, text1.length - commonlength ); text1 = text1.substring(0, text1.length - commonlength);
text2 = text2.substring( 0, text2.length - commonlength ); text2 = text2.substring(0, text2.length - commonlength);
// Compute the diff on the middle block. // Compute the diff on the middle block.
diffs = this.diffCompute( text1, text2, checklines, deadline ); diffs = this.diffCompute(text1, text2, checklines, deadline);
// Restore the prefix and suffix. // Restore the prefix and suffix.
if ( commonprefix ) { if (commonprefix) {
diffs.unshift( [ DIFF_EQUAL, commonprefix ] ); diffs.unshift([DIFF_EQUAL, commonprefix]);
} }
if ( commonsuffix ) { if (commonsuffix) {
diffs.push( [ DIFF_EQUAL, commonsuffix ] ); diffs.push([DIFF_EQUAL, commonsuffix]);
} }
this.diffCleanupMerge( diffs ); this.diffCleanupMerge(diffs);
return diffs; return diffs;
}; };
@ -3378,9 +3401,8 @@ QUnit.diff = ( function() {
* Reduce the number of edits by eliminating operationally trivial equalities. * Reduce the number of edits by eliminating operationally trivial equalities.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/ */
DiffMatchPatch.prototype.diffCleanupEfficiency = function( diffs ) { DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) {
var changes, equalities, equalitiesLength, lastequality, var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, postDel;
pointer, preIns, preDel, postIns, postDel;
changes = false; changes = false;
equalities = []; // Stack of indices where equalities are found. equalities = []; // Stack of indices where equalities are found.
equalitiesLength = 0; // Keeping our own length var is faster in JS. equalitiesLength = 0; // Keeping our own length var is faster in JS.
@ -3401,17 +3423,17 @@ QUnit.diff = ( function() {
// Is there a deletion operation after the last equality. // Is there a deletion operation after the last equality.
postDel = false; postDel = false;
while ( pointer < diffs.length ) { while (pointer < diffs.length) {
// Equality found. // Equality found.
if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) { if (diffs[pointer][0] === DIFF_EQUAL) {
if ( diffs[ pointer ][ 1 ].length < 4 && ( postIns || postDel ) ) { if (diffs[pointer][1].length < 4 && (postIns || postDel)) {
// Candidate found. // Candidate found.
equalities[ equalitiesLength++ ] = pointer; equalities[equalitiesLength++] = pointer;
preIns = postIns; preIns = postIns;
preDel = postDel; preDel = postDel;
lastequality = diffs[ pointer ][ 1 ]; lastequality = diffs[pointer][1];
} else { } else {
// Not a candidate, and can never become one. // Not a candidate, and can never become one.
@ -3423,7 +3445,7 @@ QUnit.diff = ( function() {
// An insertion or deletion. // An insertion or deletion.
} else { } else {
if ( diffs[ pointer ][ 0 ] === DIFF_DELETE ) { if (diffs[pointer][0] === DIFF_DELETE) {
postDel = true; postDel = true;
} else { } else {
postIns = true; postIns = true;
@ -3437,29 +3459,23 @@ QUnit.diff = ( function() {
* <ins>A</del>X<ins>C</ins><del>D</del> * <ins>A</del>X<ins>C</ins><del>D</del>
* <ins>A</ins><del>B</del>X<del>C</del> * <ins>A</ins><del>B</del>X<del>C</del>
*/ */
if ( lastequality && ( ( preIns && preDel && postIns && postDel ) || if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) {
( ( lastequality.length < 2 ) &&
( preIns + preDel + postIns + postDel ) === 3 ) ) ) {
// Duplicate record. // Duplicate record.
diffs.splice( diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
equalities[ equalitiesLength - 1 ],
0,
[ DIFF_DELETE, lastequality ]
);
// Change second copy to insert. // Change second copy to insert.
diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT; diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
equalitiesLength--; // Throw away the equality we just deleted; equalitiesLength--; // Throw away the equality we just deleted;
lastequality = null; lastequality = null;
if ( preIns && preDel ) { if (preIns && preDel) {
// No changes made which could affect previous entry, keep going. // No changes made which could affect previous entry, keep going.
postIns = postDel = true; postIns = postDel = true;
equalitiesLength = 0; equalitiesLength = 0;
} else { } else {
equalitiesLength--; // Throw away the previous equality. equalitiesLength--; // Throw away the previous equality.
pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1; pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
postIns = postDel = false; postIns = postDel = false;
} }
changes = true; changes = true;
@ -3468,8 +3484,8 @@ QUnit.diff = ( function() {
pointer++; pointer++;
} }
if ( changes ) { if (changes) {
this.diffCleanupMerge( diffs ); this.diffCleanupMerge(diffs);
} }
}; };
@ -3479,25 +3495,27 @@ QUnit.diff = ( function() {
* @param {integer} string to be beautified. * @param {integer} string to be beautified.
* @return {string} HTML representation. * @return {string} HTML representation.
*/ */
DiffMatchPatch.prototype.diffPrettyHtml = function( diffs ) { DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) {
var op, data, x, var op,
data,
x,
html = []; html = [];
for ( x = 0; x < diffs.length; x++ ) { for (x = 0; x < diffs.length; x++) {
op = diffs[ x ][ 0 ]; // Operation (insert, delete, equal) op = diffs[x][0]; // Operation (insert, delete, equal)
data = diffs[ x ][ 1 ]; // Text of change. data = diffs[x][1]; // Text of change.
switch ( op ) { switch (op) {
case DIFF_INSERT: case DIFF_INSERT:
html[ x ] = "<ins>" + escapeText( data ) + "</ins>"; html[x] = "<ins>" + escapeText(data) + "</ins>";
break; break;
case DIFF_DELETE: case DIFF_DELETE:
html[ x ] = "<del>" + escapeText( data ) + "</del>"; html[x] = "<del>" + escapeText(data) + "</del>";
break; break;
case DIFF_EQUAL: case DIFF_EQUAL:
html[ x ] = "<span>" + escapeText( data ) + "</span>"; html[x] = "<span>" + escapeText(data) + "</span>";
break; break;
} }
} }
return html.join( "" ); return html.join("");
}; };
/** /**
@ -3507,29 +3525,28 @@ QUnit.diff = ( function() {
* @return {number} The number of characters common to the start of each * @return {number} The number of characters common to the start of each
* string. * string.
*/ */
DiffMatchPatch.prototype.diffCommonPrefix = function( text1, text2 ) { DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) {
var pointermid, pointermax, pointermin, pointerstart; var pointermid, pointermax, pointermin, pointerstart;
// Quick check for common null cases. // Quick check for common null cases.
if ( !text1 || !text2 || text1.charAt( 0 ) !== text2.charAt( 0 ) ) { if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) {
return 0; return 0;
} }
// Binary search. // Binary search.
// Performance analysis: https://neil.fraser.name/news/2007/10/09/ // Performance analysis: https://neil.fraser.name/news/2007/10/09/
pointermin = 0; pointermin = 0;
pointermax = Math.min( text1.length, text2.length ); pointermax = Math.min(text1.length, text2.length);
pointermid = pointermax; pointermid = pointermax;
pointerstart = 0; pointerstart = 0;
while ( pointermin < pointermid ) { while (pointermin < pointermid) {
if ( text1.substring( pointerstart, pointermid ) === if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) {
text2.substring( pointerstart, pointermid ) ) {
pointermin = pointermid; pointermin = pointermid;
pointerstart = pointermin; pointerstart = pointermin;
} else { } else {
pointermax = pointermid; pointermax = pointermid;
} }
pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin ); pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
} }
return pointermid; return pointermid;
}; };
@ -3540,31 +3557,28 @@ QUnit.diff = ( function() {
* @param {string} text2 Second string. * @param {string} text2 Second string.
* @return {number} The number of characters common to the end of each string. * @return {number} The number of characters common to the end of each string.
*/ */
DiffMatchPatch.prototype.diffCommonSuffix = function( text1, text2 ) { DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) {
var pointermid, pointermax, pointermin, pointerend; var pointermid, pointermax, pointermin, pointerend;
// Quick check for common null cases. // Quick check for common null cases.
if ( !text1 || if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) {
!text2 ||
text1.charAt( text1.length - 1 ) !== text2.charAt( text2.length - 1 ) ) {
return 0; return 0;
} }
// Binary search. // Binary search.
// Performance analysis: https://neil.fraser.name/news/2007/10/09/ // Performance analysis: https://neil.fraser.name/news/2007/10/09/
pointermin = 0; pointermin = 0;
pointermax = Math.min( text1.length, text2.length ); pointermax = Math.min(text1.length, text2.length);
pointermid = pointermax; pointermid = pointermax;
pointerend = 0; pointerend = 0;
while ( pointermin < pointermid ) { while (pointermin < pointermid) {
if ( text1.substring( text1.length - pointermid, text1.length - pointerend ) === if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) {
text2.substring( text2.length - pointermid, text2.length - pointerend ) ) {
pointermin = pointermid; pointermin = pointermid;
pointerend = pointermin; pointerend = pointermin;
} else { } else {
pointermax = pointermid; pointermax = pointermid;
} }
pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin ); pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
} }
return pointermid; return pointermid;
}; };
@ -3581,82 +3595,67 @@ QUnit.diff = ( function() {
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffCompute = function( text1, text2, checklines, deadline ) { DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) {
var diffs, longtext, shorttext, i, hm, var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, diffsB;
text1A, text2A, text1B, text2B,
midCommon, diffsA, diffsB;
if ( !text1 ) { if (!text1) {
// Just add some text (speedup). // Just add some text (speedup).
return [ return [[DIFF_INSERT, text2]];
[ DIFF_INSERT, text2 ]
];
} }
if ( !text2 ) { if (!text2) {
// Just delete some text (speedup). // Just delete some text (speedup).
return [ return [[DIFF_DELETE, text1]];
[ DIFF_DELETE, text1 ]
];
} }
longtext = text1.length > text2.length ? text1 : text2; longtext = text1.length > text2.length ? text1 : text2;
shorttext = text1.length > text2.length ? text2 : text1; shorttext = text1.length > text2.length ? text2 : text1;
i = longtext.indexOf( shorttext ); i = longtext.indexOf(shorttext);
if ( i !== -1 ) { if (i !== -1) {
// Shorter text is inside the longer text (speedup). // Shorter text is inside the longer text (speedup).
diffs = [ diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]];
[ DIFF_INSERT, longtext.substring( 0, i ) ],
[ DIFF_EQUAL, shorttext ],
[ DIFF_INSERT, longtext.substring( i + shorttext.length ) ]
];
// Swap insertions for deletions if diff is reversed. // Swap insertions for deletions if diff is reversed.
if ( text1.length > text2.length ) { if (text1.length > text2.length) {
diffs[ 0 ][ 0 ] = diffs[ 2 ][ 0 ] = DIFF_DELETE; diffs[0][0] = diffs[2][0] = DIFF_DELETE;
} }
return diffs; return diffs;
} }
if ( shorttext.length === 1 ) { if (shorttext.length === 1) {
// Single character string. // Single character string.
// After the previous speedup, the character can't be an equality. // After the previous speedup, the character can't be an equality.
return [ return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
[ DIFF_DELETE, text1 ],
[ DIFF_INSERT, text2 ]
];
} }
// Check to see if the problem can be split in two. // Check to see if the problem can be split in two.
hm = this.diffHalfMatch( text1, text2 ); hm = this.diffHalfMatch(text1, text2);
if ( hm ) { if (hm) {
// A half-match was found, sort out the return data. // A half-match was found, sort out the return data.
text1A = hm[ 0 ]; text1A = hm[0];
text1B = hm[ 1 ]; text1B = hm[1];
text2A = hm[ 2 ]; text2A = hm[2];
text2B = hm[ 3 ]; text2B = hm[3];
midCommon = hm[ 4 ]; midCommon = hm[4];
// Send both pairs off for separate processing. // Send both pairs off for separate processing.
diffsA = this.DiffMain( text1A, text2A, checklines, deadline ); diffsA = this.DiffMain(text1A, text2A, checklines, deadline);
diffsB = this.DiffMain( text1B, text2B, checklines, deadline ); diffsB = this.DiffMain(text1B, text2B, checklines, deadline);
// Merge the results. // Merge the results.
return diffsA.concat( [ return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB);
[ DIFF_EQUAL, midCommon ]
], diffsB );
} }
if ( checklines && text1.length > 100 && text2.length > 100 ) { if (checklines && text1.length > 100 && text2.length > 100) {
return this.diffLineMode( text1, text2, deadline ); return this.diffLineMode(text1, text2, deadline);
} }
return this.diffBisect( text1, text2, deadline ); return this.diffBisect(text1, text2, deadline);
}; };
/** /**
@ -3670,14 +3669,12 @@ QUnit.diff = ( function() {
* text2 and the common middle. Or null if there was no match. * text2 and the common middle. Or null if there was no match.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffHalfMatch = function( text1, text2 ) { DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) {
var longtext, shorttext, dmp, var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm;
text1A, text2B, text2A, text1B, midCommon,
hm1, hm2, hm;
longtext = text1.length > text2.length ? text1 : text2; longtext = text1.length > text2.length ? text1 : text2;
shorttext = text1.length > text2.length ? text2 : text1; shorttext = text1.length > text2.length ? text2 : text1;
if ( longtext.length < 4 || shorttext.length * 2 < longtext.length ) { if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
return null; // Pointless. return null; // Pointless.
} }
dmp = this; // 'this' becomes 'window' in a closure. dmp = this; // 'this' becomes 'window' in a closure.
@ -3694,71 +3691,62 @@ QUnit.diff = ( function() {
* of shorttext and the common middle. Or null if there was no match. * of shorttext and the common middle. Or null if there was no match.
* @private * @private
*/ */
function diffHalfMatchI( longtext, shorttext, i ) { function diffHalfMatchI(longtext, shorttext, i) {
var seed, j, bestCommon, prefixLength, suffixLength, var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
// Start with a 1/4 length substring at position i as a seed. // Start with a 1/4 length substring at position i as a seed.
seed = longtext.substring( i, i + Math.floor( longtext.length / 4 ) ); seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
j = -1; j = -1;
bestCommon = ""; bestCommon = "";
while ( ( j = shorttext.indexOf( seed, j + 1 ) ) !== -1 ) { while ((j = shorttext.indexOf(seed, j + 1)) !== -1) {
prefixLength = dmp.diffCommonPrefix( longtext.substring( i ), prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j));
shorttext.substring( j ) ); suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j));
suffixLength = dmp.diffCommonSuffix( longtext.substring( 0, i ), if (bestCommon.length < suffixLength + prefixLength) {
shorttext.substring( 0, j ) ); bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength);
if ( bestCommon.length < suffixLength + prefixLength ) { bestLongtextA = longtext.substring(0, i - suffixLength);
bestCommon = shorttext.substring( j - suffixLength, j ) + bestLongtextB = longtext.substring(i + prefixLength);
shorttext.substring( j, j + prefixLength ); bestShorttextA = shorttext.substring(0, j - suffixLength);
bestLongtextA = longtext.substring( 0, i - suffixLength ); bestShorttextB = shorttext.substring(j + prefixLength);
bestLongtextB = longtext.substring( i + prefixLength );
bestShorttextA = shorttext.substring( 0, j - suffixLength );
bestShorttextB = shorttext.substring( j + prefixLength );
} }
} }
if ( bestCommon.length * 2 >= longtext.length ) { if (bestCommon.length * 2 >= longtext.length) {
return [ bestLongtextA, bestLongtextB, return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon];
bestShorttextA, bestShorttextB, bestCommon
];
} else { } else {
return null; return null;
} }
} }
// First check if the second quarter is the seed for a half-match. // First check if the second quarter is the seed for a half-match.
hm1 = diffHalfMatchI( longtext, shorttext, hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4));
Math.ceil( longtext.length / 4 ) );
// Check again based on the third quarter. // Check again based on the third quarter.
hm2 = diffHalfMatchI( longtext, shorttext, hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2));
Math.ceil( longtext.length / 2 ) ); if (!hm1 && !hm2) {
if ( !hm1 && !hm2 ) {
return null; return null;
} else if ( !hm2 ) { } else if (!hm2) {
hm = hm1; hm = hm1;
} else if ( !hm1 ) { } else if (!hm1) {
hm = hm2; hm = hm2;
} else { } else {
// Both matched. Select the longest. // Both matched. Select the longest.
hm = hm1[ 4 ].length > hm2[ 4 ].length ? hm1 : hm2; hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
} }
// A half-match was found, sort out the return data. // A half-match was found, sort out the return data.
text1A, text1B, text2A, text2B; if (text1.length > text2.length) {
if ( text1.length > text2.length ) { text1A = hm[0];
text1A = hm[ 0 ]; text1B = hm[1];
text1B = hm[ 1 ]; text2A = hm[2];
text2A = hm[ 2 ]; text2B = hm[3];
text2B = hm[ 3 ];
} else { } else {
text2A = hm[ 0 ]; text2A = hm[0];
text2B = hm[ 1 ]; text2B = hm[1];
text1A = hm[ 2 ]; text1A = hm[2];
text1B = hm[ 3 ]; text1B = hm[3];
} }
midCommon = hm[ 4 ]; midCommon = hm[4];
return [ text1A, text1B, text2A, text2B, midCommon ]; return [text1A, text1B, text2A, text2B, midCommon];
}; };
/** /**
@ -3771,54 +3759,52 @@ QUnit.diff = ( function() {
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffLineMode = function( text1, text2, deadline ) { DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) {
var a, diffs, linearray, pointer, countInsert, var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j;
countDelete, textInsert, textDelete, j;
// Scan the text on a line-by-line basis first. // Scan the text on a line-by-line basis first.
a = this.diffLinesToChars( text1, text2 ); a = this.diffLinesToChars(text1, text2);
text1 = a.chars1; text1 = a.chars1;
text2 = a.chars2; text2 = a.chars2;
linearray = a.lineArray; linearray = a.lineArray;
diffs = this.DiffMain( text1, text2, false, deadline ); diffs = this.DiffMain(text1, text2, false, deadline);
// Convert the diff back to original text. // Convert the diff back to original text.
this.diffCharsToLines( diffs, linearray ); this.diffCharsToLines(diffs, linearray);
// Eliminate freak matches (e.g. blank lines) // Eliminate freak matches (e.g. blank lines)
this.diffCleanupSemantic( diffs ); this.diffCleanupSemantic(diffs);
// Rediff any replacement blocks, this time character-by-character. // Rediff any replacement blocks, this time character-by-character.
// Add a dummy entry at the end. // Add a dummy entry at the end.
diffs.push( [ DIFF_EQUAL, "" ] ); diffs.push([DIFF_EQUAL, ""]);
pointer = 0; pointer = 0;
countDelete = 0; countDelete = 0;
countInsert = 0; countInsert = 0;
textDelete = ""; textDelete = "";
textInsert = ""; textInsert = "";
while ( pointer < diffs.length ) { while (pointer < diffs.length) {
switch ( diffs[ pointer ][ 0 ] ) { switch (diffs[pointer][0]) {
case DIFF_INSERT: case DIFF_INSERT:
countInsert++; countInsert++;
textInsert += diffs[ pointer ][ 1 ]; textInsert += diffs[pointer][1];
break; break;
case DIFF_DELETE: case DIFF_DELETE:
countDelete++; countDelete++;
textDelete += diffs[ pointer ][ 1 ]; textDelete += diffs[pointer][1];
break; break;
case DIFF_EQUAL: case DIFF_EQUAL:
// Upon reaching an equality, check for prior redundancies. // Upon reaching an equality, check for prior redundancies.
if ( countDelete >= 1 && countInsert >= 1 ) { if (countDelete >= 1 && countInsert >= 1) {
// Delete the offending records and add the merged ones. // Delete the offending records and add the merged ones.
diffs.splice( pointer - countDelete - countInsert, diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert);
countDelete + countInsert );
pointer = pointer - countDelete - countInsert; pointer = pointer - countDelete - countInsert;
a = this.DiffMain( textDelete, textInsert, false, deadline ); a = this.DiffMain(textDelete, textInsert, false, deadline);
for ( j = a.length - 1; j >= 0; j-- ) { for (j = a.length - 1; j >= 0; j--) {
diffs.splice( pointer, 0, a[ j ] ); diffs.splice(pointer, 0, a[j]);
} }
pointer = pointer + a.length; pointer = pointer + a.length;
} }
@ -3845,33 +3831,31 @@ QUnit.diff = ( function() {
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffBisect = function( text1, text2, deadline ) { DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) {
var text1Length, text2Length, maxD, vOffset, vLength, var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
v1, v2, x, delta, front, k1start, k1end, k2start,
k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
// Cache the text lengths to prevent multiple calls. // Cache the text lengths to prevent multiple calls.
text1Length = text1.length; text1Length = text1.length;
text2Length = text2.length; text2Length = text2.length;
maxD = Math.ceil( ( text1Length + text2Length ) / 2 ); maxD = Math.ceil((text1Length + text2Length) / 2);
vOffset = maxD; vOffset = maxD;
vLength = 2 * maxD; vLength = 2 * maxD;
v1 = new Array( vLength ); v1 = new Array(vLength);
v2 = new Array( vLength ); v2 = new Array(vLength);
// Setting all elements to -1 is faster in Chrome & Firefox than mixing // Setting all elements to -1 is faster in Chrome & Firefox than mixing
// integers and undefined. // integers and undefined.
for ( x = 0; x < vLength; x++ ) { for (x = 0; x < vLength; x++) {
v1[ x ] = -1; v1[x] = -1;
v2[ x ] = -1; v2[x] = -1;
} }
v1[ vOffset + 1 ] = 0; v1[vOffset + 1] = 0;
v2[ vOffset + 1 ] = 0; v2[vOffset + 1] = 0;
delta = text1Length - text2Length; delta = text1Length - text2Length;
// If the total number of characters is odd, then the front path will collide // If the total number of characters is odd, then the front path will collide
// with the reverse path. // with the reverse path.
front = ( delta % 2 !== 0 ); front = delta % 2 !== 0;
// Offsets for start and end of k loop. // Offsets for start and end of k loop.
// Prevents mapping of space beyond the grid. // Prevents mapping of space beyond the grid.
@ -3879,87 +3863,84 @@ QUnit.diff = ( function() {
k1end = 0; k1end = 0;
k2start = 0; k2start = 0;
k2end = 0; k2end = 0;
for ( d = 0; d < maxD; d++ ) { for (d = 0; d < maxD; d++) {
// Bail out if deadline is reached. // Bail out if deadline is reached.
if ( ( new Date() ).getTime() > deadline ) { if (new Date().getTime() > deadline) {
break; break;
} }
// Walk the front path one step. // Walk the front path one step.
for ( k1 = -d + k1start; k1 <= d - k1end; k1 += 2 ) { for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
k1Offset = vOffset + k1; k1Offset = vOffset + k1;
if ( k1 === -d || ( k1 !== d && v1[ k1Offset - 1 ] < v1[ k1Offset + 1 ] ) ) { if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) {
x1 = v1[ k1Offset + 1 ]; x1 = v1[k1Offset + 1];
} else { } else {
x1 = v1[ k1Offset - 1 ] + 1; x1 = v1[k1Offset - 1] + 1;
} }
y1 = x1 - k1; y1 = x1 - k1;
while ( x1 < text1Length && y1 < text2Length && while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) {
text1.charAt( x1 ) === text2.charAt( y1 ) ) {
x1++; x1++;
y1++; y1++;
} }
v1[ k1Offset ] = x1; v1[k1Offset] = x1;
if ( x1 > text1Length ) { if (x1 > text1Length) {
// Ran off the right of the graph. // Ran off the right of the graph.
k1end += 2; k1end += 2;
} else if ( y1 > text2Length ) { } else if (y1 > text2Length) {
// Ran off the bottom of the graph. // Ran off the bottom of the graph.
k1start += 2; k1start += 2;
} else if ( front ) { } else if (front) {
k2Offset = vOffset + delta - k1; k2Offset = vOffset + delta - k1;
if ( k2Offset >= 0 && k2Offset < vLength && v2[ k2Offset ] !== -1 ) { if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) {
// Mirror x2 onto top-left coordinate system. // Mirror x2 onto top-left coordinate system.
x2 = text1Length - v2[ k2Offset ]; x2 = text1Length - v2[k2Offset];
if ( x1 >= x2 ) { if (x1 >= x2) {
// Overlap detected. // Overlap detected.
return this.diffBisectSplit( text1, text2, x1, y1, deadline ); return this.diffBisectSplit(text1, text2, x1, y1, deadline);
} }
} }
} }
} }
// Walk the reverse path one step. // Walk the reverse path one step.
for ( k2 = -d + k2start; k2 <= d - k2end; k2 += 2 ) { for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
k2Offset = vOffset + k2; k2Offset = vOffset + k2;
if ( k2 === -d || ( k2 !== d && v2[ k2Offset - 1 ] < v2[ k2Offset + 1 ] ) ) { if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) {
x2 = v2[ k2Offset + 1 ]; x2 = v2[k2Offset + 1];
} else { } else {
x2 = v2[ k2Offset - 1 ] + 1; x2 = v2[k2Offset - 1] + 1;
} }
y2 = x2 - k2; y2 = x2 - k2;
while ( x2 < text1Length && y2 < text2Length && while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) {
text1.charAt( text1Length - x2 - 1 ) ===
text2.charAt( text2Length - y2 - 1 ) ) {
x2++; x2++;
y2++; y2++;
} }
v2[ k2Offset ] = x2; v2[k2Offset] = x2;
if ( x2 > text1Length ) { if (x2 > text1Length) {
// Ran off the left of the graph. // Ran off the left of the graph.
k2end += 2; k2end += 2;
} else if ( y2 > text2Length ) { } else if (y2 > text2Length) {
// Ran off the top of the graph. // Ran off the top of the graph.
k2start += 2; k2start += 2;
} else if ( !front ) { } else if (!front) {
k1Offset = vOffset + delta - k2; k1Offset = vOffset + delta - k2;
if ( k1Offset >= 0 && k1Offset < vLength && v1[ k1Offset ] !== -1 ) { if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) {
x1 = v1[ k1Offset ]; x1 = v1[k1Offset];
y1 = vOffset + x1 - k1Offset; y1 = vOffset + x1 - k1Offset;
// Mirror x2 onto top-left coordinate system. // Mirror x2 onto top-left coordinate system.
x2 = text1Length - x2; x2 = text1Length - x2;
if ( x1 >= x2 ) { if (x1 >= x2) {
// Overlap detected. // Overlap detected.
return this.diffBisectSplit( text1, text2, x1, y1, deadline ); return this.diffBisectSplit(text1, text2, x1, y1, deadline);
} }
} }
} }
@ -3968,10 +3949,7 @@ QUnit.diff = ( function() {
// Diff took too long and hit the deadline or // Diff took too long and hit the deadline or
// number of diffs equals number of characters, no commonality at all. // number of diffs equals number of characters, no commonality at all.
return [ return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
[ DIFF_DELETE, text1 ],
[ DIFF_INSERT, text2 ]
];
}; };
/** /**
@ -3985,28 +3963,26 @@ QUnit.diff = ( function() {
* @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples. * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffBisectSplit = function( text1, text2, x, y, deadline ) { DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) {
var text1a, text1b, text2a, text2b, diffs, diffsb; var text1a, text1b, text2a, text2b, diffs, diffsb;
text1a = text1.substring( 0, x ); text1a = text1.substring(0, x);
text2a = text2.substring( 0, y ); text2a = text2.substring(0, y);
text1b = text1.substring( x ); text1b = text1.substring(x);
text2b = text2.substring( y ); text2b = text2.substring(y);
// Compute both diffs serially. // Compute both diffs serially.
diffs = this.DiffMain( text1a, text2a, false, deadline ); diffs = this.DiffMain(text1a, text2a, false, deadline);
diffsb = this.DiffMain( text1b, text2b, false, deadline ); diffsb = this.DiffMain(text1b, text2b, false, deadline);
return diffs.concat( diffsb ); return diffs.concat(diffsb);
}; };
/** /**
* Reduce the number of edits by eliminating semantically trivial equalities. * Reduce the number of edits by eliminating semantically trivial equalities.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/ */
DiffMatchPatch.prototype.diffCleanupSemantic = function( diffs ) { DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) {
var changes, equalities, equalitiesLength, lastequality, var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1,
lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
changes = false; changes = false;
equalities = []; // Stack of indices where equalities are found. equalities = []; // Stack of indices where equalities are found.
equalitiesLength = 0; // Keeping our own length var is faster in JS. equalitiesLength = 0; // Keeping our own length var is faster in JS.
@ -4023,44 +3999,39 @@ QUnit.diff = ( function() {
// Number of characters that changed after the equality. // Number of characters that changed after the equality.
lengthInsertions2 = 0; lengthInsertions2 = 0;
lengthDeletions2 = 0; lengthDeletions2 = 0;
while ( pointer < diffs.length ) { while (pointer < diffs.length) {
if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) { // Equality found. if (diffs[pointer][0] === DIFF_EQUAL) {
equalities[ equalitiesLength++ ] = pointer; // Equality found.
equalities[equalitiesLength++] = pointer;
lengthInsertions1 = lengthInsertions2; lengthInsertions1 = lengthInsertions2;
lengthDeletions1 = lengthDeletions2; lengthDeletions1 = lengthDeletions2;
lengthInsertions2 = 0; lengthInsertions2 = 0;
lengthDeletions2 = 0; lengthDeletions2 = 0;
lastequality = diffs[ pointer ][ 1 ]; lastequality = diffs[pointer][1];
} else { // An insertion or deletion.
if ( diffs[ pointer ][ 0 ] === DIFF_INSERT ) {
lengthInsertions2 += diffs[ pointer ][ 1 ].length;
} else { } else {
lengthDeletions2 += diffs[ pointer ][ 1 ].length; // An insertion or deletion.
if (diffs[pointer][0] === DIFF_INSERT) {
lengthInsertions2 += diffs[pointer][1].length;
} else {
lengthDeletions2 += diffs[pointer][1].length;
} }
// Eliminate an equality that is smaller or equal to the edits on both // Eliminate an equality that is smaller or equal to the edits on both
// sides of it. // sides of it.
if ( lastequality && ( lastequality.length <= if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) {
Math.max( lengthInsertions1, lengthDeletions1 ) ) &&
( lastequality.length <= Math.max( lengthInsertions2,
lengthDeletions2 ) ) ) {
// Duplicate record. // Duplicate record.
diffs.splice( diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
equalities[ equalitiesLength - 1 ],
0,
[ DIFF_DELETE, lastequality ]
);
// Change second copy to insert. // Change second copy to insert.
diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT; diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
// Throw away the equality we just deleted. // Throw away the equality we just deleted.
equalitiesLength--; equalitiesLength--;
// Throw away the previous equality (it needs to be reevaluated). // Throw away the previous equality (it needs to be reevaluated).
equalitiesLength--; equalitiesLength--;
pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1; pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
// Reset the counters. // Reset the counters.
lengthInsertions1 = 0; lengthInsertions1 = 0;
@ -4075,8 +4046,8 @@ QUnit.diff = ( function() {
} }
// Normalize the diff. // Normalize the diff.
if ( changes ) { if (changes) {
this.diffCleanupMerge( diffs ); this.diffCleanupMerge(diffs);
} }
// Find any overlaps between deletions and insertions. // Find any overlaps between deletions and insertions.
@ -4086,46 +4057,32 @@ QUnit.diff = ( function() {
// -> <ins>def</ins>xxx<del>abc</del> // -> <ins>def</ins>xxx<del>abc</del>
// Only extract an overlap if it is as big as the edit ahead or behind it. // Only extract an overlap if it is as big as the edit ahead or behind it.
pointer = 1; pointer = 1;
while ( pointer < diffs.length ) { while (pointer < diffs.length) {
if ( diffs[ pointer - 1 ][ 0 ] === DIFF_DELETE && if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) {
diffs[ pointer ][ 0 ] === DIFF_INSERT ) { deletion = diffs[pointer - 1][1];
deletion = diffs[ pointer - 1 ][ 1 ]; insertion = diffs[pointer][1];
insertion = diffs[ pointer ][ 1 ]; overlapLength1 = this.diffCommonOverlap(deletion, insertion);
overlapLength1 = this.diffCommonOverlap( deletion, insertion ); overlapLength2 = this.diffCommonOverlap(insertion, deletion);
overlapLength2 = this.diffCommonOverlap( insertion, deletion ); if (overlapLength1 >= overlapLength2) {
if ( overlapLength1 >= overlapLength2 ) { if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) {
if ( overlapLength1 >= deletion.length / 2 ||
overlapLength1 >= insertion.length / 2 ) {
// Overlap found. Insert an equality and trim the surrounding edits. // Overlap found. Insert an equality and trim the surrounding edits.
diffs.splice( diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]);
pointer, diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1);
0, diffs[pointer + 1][1] = insertion.substring(overlapLength1);
[ DIFF_EQUAL, insertion.substring( 0, overlapLength1 ) ]
);
diffs[ pointer - 1 ][ 1 ] =
deletion.substring( 0, deletion.length - overlapLength1 );
diffs[ pointer + 1 ][ 1 ] = insertion.substring( overlapLength1 );
pointer++; pointer++;
} }
} else { } else {
if ( overlapLength2 >= deletion.length / 2 || if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) {
overlapLength2 >= insertion.length / 2 ) {
// Reverse overlap found. // Reverse overlap found.
// Insert an equality and swap and trim the surrounding edits. // Insert an equality and swap and trim the surrounding edits.
diffs.splice( diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]);
pointer,
0,
[ DIFF_EQUAL, deletion.substring( 0, overlapLength2 ) ]
);
diffs[ pointer - 1 ][ 0 ] = DIFF_INSERT; diffs[pointer - 1][0] = DIFF_INSERT;
diffs[ pointer - 1 ][ 1 ] = diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2);
insertion.substring( 0, insertion.length - overlapLength2 ); diffs[pointer + 1][0] = DIFF_DELETE;
diffs[ pointer + 1 ][ 0 ] = DIFF_DELETE; diffs[pointer + 1][1] = deletion.substring(overlapLength2);
diffs[ pointer + 1 ][ 1 ] =
deletion.substring( overlapLength2 );
pointer++; pointer++;
} }
} }
@ -4143,29 +4100,28 @@ QUnit.diff = ( function() {
* string and the start of the second string. * string and the start of the second string.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffCommonOverlap = function( text1, text2 ) { DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) {
var text1Length, text2Length, textLength, var text1Length, text2Length, textLength, best, length, pattern, found;
best, length, pattern, found;
// Cache the text lengths to prevent multiple calls. // Cache the text lengths to prevent multiple calls.
text1Length = text1.length; text1Length = text1.length;
text2Length = text2.length; text2Length = text2.length;
// Eliminate the null case. // Eliminate the null case.
if ( text1Length === 0 || text2Length === 0 ) { if (text1Length === 0 || text2Length === 0) {
return 0; return 0;
} }
// Truncate the longer string. // Truncate the longer string.
if ( text1Length > text2Length ) { if (text1Length > text2Length) {
text1 = text1.substring( text1Length - text2Length ); text1 = text1.substring(text1Length - text2Length);
} else if ( text1Length < text2Length ) { } else if (text1Length < text2Length) {
text2 = text2.substring( 0, text1Length ); text2 = text2.substring(0, text1Length);
} }
textLength = Math.min( text1Length, text2Length ); textLength = Math.min(text1Length, text2Length);
// Quick check for the worst case. // Quick check for the worst case.
if ( text1 === text2 ) { if (text1 === text2) {
return textLength; return textLength;
} }
@ -4174,15 +4130,14 @@ QUnit.diff = ( function() {
// Performance analysis: https://neil.fraser.name/news/2010/11/04/ // Performance analysis: https://neil.fraser.name/news/2010/11/04/
best = 0; best = 0;
length = 1; length = 1;
while ( true ) { while (true) {
pattern = text1.substring( textLength - length ); pattern = text1.substring(textLength - length);
found = text2.indexOf( pattern ); found = text2.indexOf(pattern);
if ( found === -1 ) { if (found === -1) {
return best; return best;
} }
length += found; length += found;
if ( found === 0 || text1.substring( textLength - length ) === if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) {
text2.substring( 0, length ) ) {
best = length; best = length;
length++; length++;
} }
@ -4200,14 +4155,14 @@ QUnit.diff = ( function() {
* The zeroth element of the array of unique strings is intentionally blank. * The zeroth element of the array of unique strings is intentionally blank.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffLinesToChars = function( text1, text2 ) { DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) {
var lineArray, lineHash, chars1, chars2; var lineArray, lineHash, chars1, chars2;
lineArray = []; // E.g. lineArray[4] === 'Hello\n' lineArray = []; // E.g. lineArray[4] === 'Hello\n'
lineHash = {}; // E.g. lineHash['Hello\n'] === 4 lineHash = {}; // E.g. lineHash['Hello\n'] === 4
// '\x00' is a valid character, but various debuggers don't like it. // '\x00' is a valid character, but various debuggers don't like it.
// So we'll insert a junk entry to avoid generating a null character. // So we'll insert a junk entry to avoid generating a null character.
lineArray[ 0 ] = ""; lineArray[0] = "";
/** /**
* Split a text into an array of strings. Reduce the texts to a string of * Split a text into an array of strings. Reduce the texts to a string of
@ -4217,7 +4172,7 @@ QUnit.diff = ( function() {
* @return {string} Encoded string. * @return {string} Encoded string.
* @private * @private
*/ */
function diffLinesToCharsMunge( text ) { function diffLinesToCharsMunge(text) {
var chars, lineStart, lineEnd, lineArrayLength, line; var chars, lineStart, lineEnd, lineArrayLength, line;
chars = ""; chars = "";
@ -4229,28 +4184,27 @@ QUnit.diff = ( function() {
// Keeping our own length variable is faster than looking it up. // Keeping our own length variable is faster than looking it up.
lineArrayLength = lineArray.length; lineArrayLength = lineArray.length;
while ( lineEnd < text.length - 1 ) { while (lineEnd < text.length - 1) {
lineEnd = text.indexOf( "\n", lineStart ); lineEnd = text.indexOf("\n", lineStart);
if ( lineEnd === -1 ) { if (lineEnd === -1) {
lineEnd = text.length - 1; lineEnd = text.length - 1;
} }
line = text.substring( lineStart, lineEnd + 1 ); line = text.substring(lineStart, lineEnd + 1);
lineStart = lineEnd + 1; lineStart = lineEnd + 1;
if ( lineHash.hasOwnProperty ? lineHash.hasOwnProperty( line ) : if (lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined) {
( lineHash[ line ] !== undefined ) ) { chars += String.fromCharCode(lineHash[line]);
chars += String.fromCharCode( lineHash[ line ] );
} else { } else {
chars += String.fromCharCode( lineArrayLength ); chars += String.fromCharCode(lineArrayLength);
lineHash[ line ] = lineArrayLength; lineHash[line] = lineArrayLength;
lineArray[ lineArrayLength++ ] = line; lineArray[lineArrayLength++] = line;
} }
} }
return chars; return chars;
} }
chars1 = diffLinesToCharsMunge( text1 ); chars1 = diffLinesToCharsMunge(text1);
chars2 = diffLinesToCharsMunge( text2 ); chars2 = diffLinesToCharsMunge(text2);
return { return {
chars1: chars1, chars1: chars1,
chars2: chars2, chars2: chars2,
@ -4265,15 +4219,15 @@ QUnit.diff = ( function() {
* @param {!Array.<string>} lineArray Array of unique strings. * @param {!Array.<string>} lineArray Array of unique strings.
* @private * @private
*/ */
DiffMatchPatch.prototype.diffCharsToLines = function( diffs, lineArray ) { DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) {
var x, chars, text, y; var x, chars, text, y;
for ( x = 0; x < diffs.length; x++ ) { for (x = 0; x < diffs.length; x++) {
chars = diffs[ x ][ 1 ]; chars = diffs[x][1];
text = []; text = [];
for ( y = 0; y < chars.length; y++ ) { for (y = 0; y < chars.length; y++) {
text[ y ] = lineArray[ chars.charCodeAt( y ) ]; text[y] = lineArray[chars.charCodeAt(y)];
} }
diffs[ x ][ 1 ] = text.join( "" ); diffs[x][1] = text.join("");
} }
}; };
@ -4282,85 +4236,69 @@ QUnit.diff = ( function() {
* Any edit section can move as long as it doesn't cross an equality. * Any edit section can move as long as it doesn't cross an equality.
* @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples. * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
*/ */
DiffMatchPatch.prototype.diffCleanupMerge = function( diffs ) { DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) {
var pointer, countDelete, countInsert, textInsert, textDelete, var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, diffPointer, position;
commonlength, changes, diffPointer, position; diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end.
diffs.push( [ DIFF_EQUAL, "" ] ); // Add a dummy entry at the end.
pointer = 0; pointer = 0;
countDelete = 0; countDelete = 0;
countInsert = 0; countInsert = 0;
textDelete = ""; textDelete = "";
textInsert = ""; textInsert = "";
commonlength;
while ( pointer < diffs.length ) { while (pointer < diffs.length) {
switch ( diffs[ pointer ][ 0 ] ) { switch (diffs[pointer][0]) {
case DIFF_INSERT: case DIFF_INSERT:
countInsert++; countInsert++;
textInsert += diffs[ pointer ][ 1 ]; textInsert += diffs[pointer][1];
pointer++; pointer++;
break; break;
case DIFF_DELETE: case DIFF_DELETE:
countDelete++; countDelete++;
textDelete += diffs[ pointer ][ 1 ]; textDelete += diffs[pointer][1];
pointer++; pointer++;
break; break;
case DIFF_EQUAL: case DIFF_EQUAL:
// Upon reaching an equality, check for prior redundancies. // Upon reaching an equality, check for prior redundancies.
if ( countDelete + countInsert > 1 ) { if (countDelete + countInsert > 1) {
if ( countDelete !== 0 && countInsert !== 0 ) { if (countDelete !== 0 && countInsert !== 0) {
// Factor out any common prefixes. // Factor out any common prefixes.
commonlength = this.diffCommonPrefix( textInsert, textDelete ); commonlength = this.diffCommonPrefix(textInsert, textDelete);
if ( commonlength !== 0 ) { if (commonlength !== 0) {
if ( ( pointer - countDelete - countInsert ) > 0 && if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) {
diffs[ pointer - countDelete - countInsert - 1 ][ 0 ] === diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength);
DIFF_EQUAL ) {
diffs[ pointer - countDelete - countInsert - 1 ][ 1 ] +=
textInsert.substring( 0, commonlength );
} else { } else {
diffs.splice( 0, 0, [ DIFF_EQUAL, diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]);
textInsert.substring( 0, commonlength )
] );
pointer++; pointer++;
} }
textInsert = textInsert.substring( commonlength ); textInsert = textInsert.substring(commonlength);
textDelete = textDelete.substring( commonlength ); textDelete = textDelete.substring(commonlength);
} }
// Factor out any common suffixies. // Factor out any common suffixies.
commonlength = this.diffCommonSuffix( textInsert, textDelete ); commonlength = this.diffCommonSuffix(textInsert, textDelete);
if ( commonlength !== 0 ) { if (commonlength !== 0) {
diffs[ pointer ][ 1 ] = textInsert.substring( textInsert.length - diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1];
commonlength ) + diffs[ pointer ][ 1 ]; textInsert = textInsert.substring(0, textInsert.length - commonlength);
textInsert = textInsert.substring( 0, textInsert.length - textDelete = textDelete.substring(0, textDelete.length - commonlength);
commonlength );
textDelete = textDelete.substring( 0, textDelete.length -
commonlength );
} }
} }
// Delete the offending records and add the merged ones. // Delete the offending records and add the merged ones.
if ( countDelete === 0 ) { if (countDelete === 0) {
diffs.splice( pointer - countInsert, diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]);
countDelete + countInsert, [ DIFF_INSERT, textInsert ] ); } else if (countInsert === 0) {
} else if ( countInsert === 0 ) { diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]);
diffs.splice( pointer - countDelete,
countDelete + countInsert, [ DIFF_DELETE, textDelete ] );
} else { } else {
diffs.splice( diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]);
pointer - countDelete - countInsert,
countDelete + countInsert,
[ DIFF_DELETE, textDelete ], [ DIFF_INSERT, textInsert ]
);
} }
pointer = pointer - countDelete - countInsert + pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1;
( countDelete ? 1 : 0 ) + ( countInsert ? 1 : 0 ) + 1; } else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) {
} else if ( pointer !== 0 && diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL ) {
// Merge this equality with the previous one. // Merge this equality with the previous one.
diffs[ pointer - 1 ][ 1 ] += diffs[ pointer ][ 1 ]; diffs[pointer - 1][1] += diffs[pointer][1];
diffs.splice( pointer, 1 ); diffs.splice(pointer, 1);
} else { } else {
pointer++; pointer++;
} }
@ -4371,7 +4309,7 @@ QUnit.diff = ( function() {
break; break;
} }
} }
if ( diffs[ diffs.length - 1 ][ 1 ] === "" ) { if (diffs[diffs.length - 1][1] === "") {
diffs.pop(); // Remove the dummy entry at the end. diffs.pop(); // Remove the dummy entry at the end.
} }
@ -4382,35 +4320,26 @@ QUnit.diff = ( function() {
pointer = 1; pointer = 1;
// Intentionally ignore the first and last element (don't need checking). // Intentionally ignore the first and last element (don't need checking).
while ( pointer < diffs.length - 1 ) { while (pointer < diffs.length - 1) {
if ( diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL && if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) {
diffs[ pointer + 1 ][ 0 ] === DIFF_EQUAL ) {
diffPointer = diffs[ pointer ][ 1 ]; diffPointer = diffs[pointer][1];
position = diffPointer.substring( position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length);
diffPointer.length - diffs[ pointer - 1 ][ 1 ].length
);
// This is a single edit surrounded by equalities. // This is a single edit surrounded by equalities.
if ( position === diffs[ pointer - 1 ][ 1 ] ) { if (position === diffs[pointer - 1][1]) {
// Shift the edit over the previous equality. // Shift the edit over the previous equality.
diffs[ pointer ][ 1 ] = diffs[ pointer - 1 ][ 1 ] + diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length);
diffs[ pointer ][ 1 ].substring( 0, diffs[ pointer ][ 1 ].length - diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
diffs[ pointer - 1 ][ 1 ].length ); diffs.splice(pointer - 1, 1);
diffs[ pointer + 1 ][ 1 ] =
diffs[ pointer - 1 ][ 1 ] + diffs[ pointer + 1 ][ 1 ];
diffs.splice( pointer - 1, 1 );
changes = true; changes = true;
} else if ( diffPointer.substring( 0, diffs[ pointer + 1 ][ 1 ].length ) === } else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) {
diffs[ pointer + 1 ][ 1 ] ) {
// Shift the edit over the next equality. // Shift the edit over the next equality.
diffs[ pointer - 1 ][ 1 ] += diffs[ pointer + 1 ][ 1 ]; diffs[pointer - 1][1] += diffs[pointer + 1][1];
diffs[ pointer ][ 1 ] = diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1];
diffs[ pointer ][ 1 ].substring( diffs[ pointer + 1 ][ 1 ].length ) + diffs.splice(pointer + 1, 1);
diffs[ pointer + 1 ][ 1 ];
diffs.splice( pointer + 1, 1 );
changes = true; changes = true;
} }
} }
@ -4418,20 +4347,20 @@ QUnit.diff = ( function() {
} }
// If shifts were made, the diff needs reordering and another shift sweep. // If shifts were made, the diff needs reordering and another shift sweep.
if ( changes ) { if (changes) {
this.diffCleanupMerge( diffs ); this.diffCleanupMerge(diffs);
} }
}; };
return function( o, n ) { return function (o, n) {
var diff, output, text; var diff, output, text;
diff = new DiffMatchPatch(); diff = new DiffMatchPatch();
output = diff.DiffMain( o, n ); output = diff.DiffMain(o, n);
diff.diffCleanupEfficiency( output ); diff.diffCleanupEfficiency(output);
text = diff.diffPrettyHtml( output ); text = diff.diffPrettyHtml(output);
return text; return text;
}; };
}() ); }();
}() ); }((function() { return this; }())));

24
package.json
View File

@ -18,8 +18,8 @@
], ],
"scripts": { "scripts": {
"change-version": "node grunt/change-version.js", "change-version": "node grunt/change-version.js",
"clean-css": "cleancss --skip-advanced --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "clean-css": "cleancss --level 1 --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
"clean-css-docs": "cleancss --skip-advanced --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css", "clean-css-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
"eslint": "eslint --ignore-path .eslintignore js && eslint --config js/tests/.eslintrc.json --env node grunt Gruntfile.js && eslint --config js/tests/.eslintrc.json docs/assets/js/src docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js", "eslint": "eslint --ignore-path .eslintignore js && eslint --config js/tests/.eslintrc.json --env node grunt Gruntfile.js && eslint --config js/tests/.eslintrc.json docs/assets/js/src docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js",
"htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/", "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/",
"htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html", "htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html",
@ -50,35 +50,35 @@
"tether": "^1.4.0" "tether": "^1.4.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.6.1", "autoprefixer": "^6.7.2",
"babel-eslint": "^7.1.1", "babel-eslint": "^7.1.1",
"babel-plugin-transform-es2015-modules-strip": "^0.1.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
"babel-preset-es2015": "^6.18.0", "babel-preset-es2015": "^6.22.0",
"clean-css": "^3.4.23", "clean-css-cli": "^4.0.0",
"eslint": "^3.12.2", "eslint": "^3.15.0",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-babel": "^6.0.0", "grunt-babel": "^6.0.0",
"grunt-build-control": "^0.7.1", "grunt-build-control": "^0.7.1",
"grunt-contrib-clean": "^1.0.0", "grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compress": "^1.3.0", "grunt-contrib-compress": "^1.4.1",
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2", "grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-qunit": "^1.2.0", "grunt-contrib-qunit": "^1.2.0",
"grunt-contrib-watch": "^1.0.0", "grunt-contrib-watch": "^1.0.0",
"grunt-exec": "^1.0.1", "grunt-exec": "^1.0.1",
"grunt-jekyll": "^0.4.4", "grunt-jekyll": "^0.4.6",
"grunt-saucelabs": "^9.0.0", "grunt-saucelabs": "^9.0.0",
"grunt-stamp": "^0.3.0", "grunt-stamp": "^0.3.0",
"htmlhint": "^0.9.13", "htmlhint": "^0.9.13",
"htmllint-cli": "0.0.6", "htmllint-cli": "^0.0.6",
"is-travis": "^1.0.0", "is-travis": "^1.0.0",
"load-grunt-tasks": "^3.5.2", "load-grunt-tasks": "^3.5.2",
"node-sass": "^4.1.1", "node-sass": "^4.5.0",
"postcss-cli": "^2.6.0", "postcss-cli": "^2.6.0",
"postcss-flexbugs-fixes": "^2.1.0", "postcss-flexbugs-fixes": "^2.1.0",
"shelljs": "^0.7.5", "shelljs": "^0.7.6",
"shx": "^0.2.1", "shx": "^0.2.2",
"time-grunt": "^1.4.0", "time-grunt": "^1.4.0",
"uglify-js": "^2.7.5" "uglify-js": "^2.7.5"
}, },