From b2b1e1c437e6ad0fbff984f27861135a141899c7 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 22 Dec 2022 12:30:34 +0100 Subject: [PATCH 01/13] Fix `database_path` in Docker env Also, add `mailer_dsn` and limit xdebug to allow installation of PHP < 8 --- docker/php/Dockerfile | 2 +- docker/php/config/parameters.yml | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index c22237266..4f93398c6 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -53,7 +53,7 @@ RUN docker-php-ext-install -j "$(nproc)" \ RUN pecl install redis; \ pecl install imagick; \ - pecl install xdebug; \ + pecl install xdebug-3.1.6; \ docker-php-ext-enable \ redis \ imagick \ diff --git a/docker/php/config/parameters.yml b/docker/php/config/parameters.yml index 4ffab2015..f9b42d9e1 100644 --- a/docker/php/config/parameters.yml +++ b/docker/php/config/parameters.yml @@ -6,7 +6,7 @@ parameters: database_name: ${DATABASE_NAME:-symfony} database_user: ${DATABASE_USER:-root} database_password: ${DATABASE_PASSWORD:-~} - database_path: ${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"} + database_path: '${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"}' database_table_prefix: wallabag_ database_socket: null database_charset: ${DATABASE_CHARSET:-utf8} @@ -14,15 +14,9 @@ parameters: domain_name: ${DOMAIN_NAME:-https://www.example.com} server_name: ${SERVER_NAME:-"Your wallabag instance"} - mailer_transport: ${MAILER_TRANSPORT:-smtp} - mailer_user: ${MAILER_USER:-~} - mailer_password: ${MAILER_PASSWORD:-~} - mailer_host: ${MAILER_HOST:-127.0.0.1} - mailer_port: ${MAILER_PORT:-25} - mailer_encryption: ${MAILER_ENCRYPTION:-~} - mailer_auth_mode: ${MAILER_AUTH_MODE:-~} + mailer_dsn: ${MAILER_DSN:-"smtp://127.0.0.1"} - locale: ${LOCALE:-en} + locale: ${LOCALE:-en} # A secret key that's used to generate certain security-related tokens secret: ${SECRET:-~} From 915899aeef916d2f164bf1010d47d55a704c5055 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 03:00:44 +0000 Subject: [PATCH 02/13] Bump jquery from 3.6.2 to 3.6.3 Bumps [jquery](https://github.com/jquery/jquery) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.6.2...3.6.3) --- updated-dependencies: - dependency-name: jquery dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 03d681eb5..bf53659c5 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "hammerjs": "^2.0.8", "highlight.js": "^11.7.0", "icomoon-free-npm": "^0.0.0", - "jquery": "^3.6.2", + "jquery": "^3.6.3", "jquery.cookie": "^1.4.1", "jr-qrcode": "^1.0.7", "material-design-icons-iconfont": "^6.7.0", diff --git a/yarn.lock b/yarn.lock index 522233ea6..d84b515ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3582,10 +3582,10 @@ jquery@^2.1.4: resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" integrity sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q== -jquery@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.2.tgz#8302bbc9160646f507bdf59d136a478b312783c4" - integrity sha512-/e7ulNIEEYk1Z/l4X0vpxGt+B/dNsV8ghOPAWZaJs8pkGvsSC0tm33aMGylXcj/U7y4IcvwtMXPMyBFZn/gK9A== +jquery@^3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6" + integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg== jquery@~1.11.0: version "1.11.3" From 071e96c2adf7035d89cadac5bef8e29a840c4017 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Dec 2022 03:02:03 +0000 Subject: [PATCH 03/13] Bump symfony/phpunit-bridge from 6.2.0 to 6.2.3 Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 6.2.0 to 6.2.3. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/6.2/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v6.2.0...v6.2.3) --- updated-dependencies: - dependency-name: symfony/phpunit-bridge dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5cd83020c..a9c03195c 100644 --- a/composer.lock +++ b/composer.lock @@ -13061,16 +13061,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.2.0", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df" + "reference": "3766b8269d3bac5c214a04ebd6870e71e52bcb60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1bd3b17db6d2ec284efbdc916600e880d6d858df", - "reference": "1bd3b17db6d2ec284efbdc916600e880d6d858df", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3766b8269d3bac5c214a04ebd6870e71e52bcb60", + "reference": "3766b8269d3bac5c214a04ebd6870e71e52bcb60", "shasum": "" }, "require": { @@ -13124,7 +13124,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.0" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.2.3" }, "funding": [ { @@ -13140,7 +13140,7 @@ "type": "tidelift" } ], - "time": "2022-11-18T19:08:09+00:00" + "time": "2022-12-28T14:26:22+00:00" } ], "aliases": [], From a6cb4e7b53de34868a77291c067c42b7f5613a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 03:01:26 +0000 Subject: [PATCH 04/13] Bump m6web/redis-mock from 5.3.0 to 5.4.0 Bumps [m6web/redis-mock](https://github.com/BedrockStreaming/RedisMock) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/BedrockStreaming/RedisMock/releases) - [Commits](https://github.com/BedrockStreaming/RedisMock/compare/v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: m6web/redis-mock dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5cd83020c..26033aae1 100644 --- a/composer.lock +++ b/composer.lock @@ -12452,16 +12452,16 @@ }, { "name": "m6web/redis-mock", - "version": "v5.3.0", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/BedrockStreaming/RedisMock.git", - "reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e" + "reference": "04bf5e9eee78806b01a2dc0f00d1d01feded9241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/e126231c0130ff2e83d53dbc0c305a8eed20372e", - "reference": "e126231c0130ff2e83d53dbc0c305a8eed20372e", + "url": "https://api.github.com/repos/BedrockStreaming/RedisMock/zipball/04bf5e9eee78806b01a2dc0f00d1d01feded9241", + "reference": "04bf5e9eee78806b01a2dc0f00d1d01feded9241", "shasum": "" }, "require": { @@ -12495,9 +12495,9 @@ ], "support": { "issues": "https://github.com/BedrockStreaming/RedisMock/issues", - "source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.3.0" + "source": "https://github.com/BedrockStreaming/RedisMock/tree/v5.4.0" }, - "time": "2022-06-14T17:39:03+00:00" + "time": "2022-12-29T10:57:22+00:00" }, { "name": "nikic/php-parser", From 75a670feaa94d3579df894fdd66e32cd90a08029 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 03:01:09 +0000 Subject: [PATCH 05/13] Bump egulias/email-validator from 3.2.1 to 3.2.2 Bumps [egulias/email-validator](https://github.com/egulias/EmailValidator) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/egulias/EmailValidator/releases) - [Changelog](https://github.com/egulias/EmailValidator/blob/3.x/CHANGELOG.md) - [Commits](https://github.com/egulias/EmailValidator/compare/3.2.1...3.2.2) --- updated-dependencies: - dependency-name: egulias/email-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 26033aae1..8309f08cf 100644 --- a/composer.lock +++ b/composer.lock @@ -2019,16 +2019,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715" + "reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1ac0be80b32ea829009257934ecfd5ab20f24ba5", + "reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5", "shasum": "" }, "require": { @@ -2075,7 +2075,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.1" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.2" }, "funding": [ { @@ -2083,7 +2083,7 @@ "type": "github" } ], - "time": "2022-06-18T20:57:19+00:00" + "time": "2022-12-29T21:07:24+00:00" }, { "name": "endroid/qr-code", From c38157921b84ac71c784a7049fcb072bbc85b3cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:01:36 +0000 Subject: [PATCH 06/13] Bump twig/twig from 3.4.3 to 3.5.0 Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.4.3 to 3.5.0. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.4.3...v3.5.0) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 58cf74996..a5e41387a 100644 --- a/composer.lock +++ b/composer.lock @@ -11312,16 +11312,16 @@ }, { "name": "twig/twig", - "version": "v3.4.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58" + "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58", - "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72", + "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72", "shasum": "" }, "require": { @@ -11336,7 +11336,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -11372,7 +11372,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.4.3" + "source": "https://github.com/twigphp/Twig/tree/v3.5.0" }, "funding": [ { @@ -11384,7 +11384,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T08:42:51+00:00" + "time": "2022-12-27T12:28:18+00:00" }, { "name": "wallabag/php-mobi", From c8c833e528202fa7ab2d7ebd03ee57b0d96dd658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:01:27 +0000 Subject: [PATCH 07/13] Bump twig/extra-bundle from 3.4.0 to 3.5.0 Bumps [twig/extra-bundle](https://github.com/twigphp/twig-extra-bundle) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/twigphp/twig-extra-bundle/releases) - [Commits](https://github.com/twigphp/twig-extra-bundle/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: twig/extra-bundle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index a5e41387a..ad6febe56 100644 --- a/composer.lock +++ b/composer.lock @@ -7695,16 +7695,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.15.2", + "version": "1.15.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5941477f100993652218928039d530b75a13a9ca" + "reference": "61800f71a5526081d1b5633766aa88341f1ade76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5941477f100993652218928039d530b75a13a9ca", - "reference": "5941477f100993652218928039d530b75a13a9ca", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/61800f71a5526081d1b5633766aa88341f1ade76", + "reference": "61800f71a5526081d1b5633766aa88341f1ade76", "shasum": "" }, "require": { @@ -7734,9 +7734,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.3" }, - "time": "2022-12-16T06:42:48+00:00" + "time": "2022-12-20T20:56:55+00:00" }, { "name": "phpzip/phpzip", @@ -11161,16 +11161,16 @@ }, { "name": "twig/extra-bundle", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "2e58256b0e9fe52f30149347c0547e4633304765" + "reference": "edfcdbdc943b52101011d57ec546af393dc56537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/2e58256b0e9fe52f30149347c0547e4633304765", - "reference": "2e58256b0e9fe52f30149347c0547e4633304765", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/edfcdbdc943b52101011d57ec546af393dc56537", + "reference": "edfcdbdc943b52101011d57ec546af393dc56537", "shasum": "" }, "require": { @@ -11193,7 +11193,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -11224,7 +11224,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.4.0" + "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.5.0" }, "funding": [ { @@ -11236,7 +11236,7 @@ "type": "tidelift" } ], - "time": "2022-01-04T13:58:53+00:00" + "time": "2022-12-27T12:23:36+00:00" }, { "name": "twig/string-extra", From 263fd522c20fb63e982c456367b6e8441db70bf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:01:12 +0000 Subject: [PATCH 08/13] Bump twig/string-extra from 3.4.0 to 3.5.0 Bumps [twig/string-extra](https://github.com/twigphp/string-extra) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/twigphp/string-extra/releases) - [Commits](https://github.com/twigphp/string-extra/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: twig/string-extra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index ad6febe56..048759d2d 100644 --- a/composer.lock +++ b/composer.lock @@ -11240,16 +11240,16 @@ }, { "name": "twig/string-extra", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/string-extra.git", - "reference": "03608ae2e9c270a961e8cf1b75751e8635ad3e3c" + "reference": "73c458625c685b3cb3986ec2f5f83ebd1247bcb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/string-extra/zipball/03608ae2e9c270a961e8cf1b75751e8635ad3e3c", - "reference": "03608ae2e9c270a961e8cf1b75751e8635ad3e3c", + "url": "https://api.github.com/repos/twigphp/string-extra/zipball/73c458625c685b3cb3986ec2f5f83ebd1247bcb3", + "reference": "73c458625c685b3cb3986ec2f5f83ebd1247bcb3", "shasum": "" }, "require": { @@ -11264,7 +11264,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -11296,7 +11296,7 @@ "unicode" ], "support": { - "source": "https://github.com/twigphp/string-extra/tree/v3.4.0" + "source": "https://github.com/twigphp/string-extra/tree/v3.5.0" }, "funding": [ { @@ -11308,7 +11308,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T10:02:25+00:00" + "time": "2022-12-27T12:23:36+00:00" }, { "name": "twig/twig", From 38033b964b93e087160596684e93ff52f422b2be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 03:00:51 +0000 Subject: [PATCH 09/13] Bump stylelint from 14.16.0 to 14.16.1 Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.16.0 to 14.16.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/14.16.0...14.16.1) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4ac3ba253..532f628a2 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "sass": "^1.57.1", "sass-loader": "^13.2.0", "style-loader": "^3.3.1", - "stylelint": "^14.16.0", + "stylelint": "^14.16.1", "stylelint-config-standard": "^29.0.0", "stylelint-scss": "^4.3.0", "stylelint-webpack-plugin": "^3.3.0", diff --git a/yarn.lock b/yarn.lock index b2d620379..9c3fe25c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5310,10 +5310,10 @@ stylelint-webpack-plugin@^3.3.0: normalize-path "^3.0.0" schema-utils "^4.0.0" -stylelint@^14.16.0: - version "14.16.0" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.0.tgz#8e1a424f4b9852e59089f95de306734d70e5048b" - integrity sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg== +stylelint@^14.16.1: + version "14.16.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d" + integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A== dependencies: "@csstools/selector-specificity" "^2.0.2" balanced-match "^2.0.0" From f124356386860afeff853735c2cf64a179f37170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 03:01:09 +0000 Subject: [PATCH 10/13] Bump eslint from 8.30.0 to 8.31.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.30.0 to 8.31.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.30.0...v8.31.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 4ac3ba253..da8715d33 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "autoprefixer": "^10.4.13", "babel-loader": "^9.1.0", "css-loader": "^6.7.3", - "eslint": "^8.30.0", + "eslint": "^8.31.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-plugin-import": "^2.26.0", "eslint-webpack-plugin": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index b2d620379..19fe272b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -997,10 +997,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@eslint/eslintrc@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" - integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -2526,12 +2526,12 @@ eslint-webpack-plugin@^3.2.0: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.30.0: - version "8.30.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50" - integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ== +eslint@^8.31.0: + version "8.31.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524" + integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA== dependencies: - "@eslint/eslintrc" "^1.4.0" + "@eslint/eslintrc" "^1.4.1" "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" From 08a4fcecf4ecb80709173a1aaf5a5f0e4dcc9b79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 03:01:26 +0000 Subject: [PATCH 11/13] Bump phpstan/phpstan-doctrine from 1.3.27 to 1.3.28 Bumps [phpstan/phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine) from 1.3.27 to 1.3.28. - [Release notes](https://github.com/phpstan/phpstan-doctrine/releases) - [Commits](https://github.com/phpstan/phpstan-doctrine/compare/1.3.27...1.3.28) --- updated-dependencies: - dependency-name: phpstan/phpstan-doctrine dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 048759d2d..3027dbd9b 100644 --- a/composer.lock +++ b/composer.lock @@ -12781,16 +12781,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.27", + "version": "1.3.28", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "cf2bc2391bf179c901526f23c8bb33d16dc0fdb2" + "reference": "8302a6a214b8cbbda8249cce6ec627033af26c12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/cf2bc2391bf179c901526f23c8bb33d16dc0fdb2", - "reference": "cf2bc2391bf179c901526f23c8bb33d16dc0fdb2", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/8302a6a214b8cbbda8249cce6ec627033af26c12", + "reference": "8302a6a214b8cbbda8249cce6ec627033af26c12", "shasum": "" }, "require": { @@ -12844,9 +12844,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.27" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.28" }, - "time": "2022-12-16T09:07:46+00:00" + "time": "2022-12-30T21:24:11+00:00" }, { "name": "phpstan/phpstan-phpunit", From c08e43453099ed571ea641c2b46a364c12af38e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 03:01:38 +0000 Subject: [PATCH 12/13] Bump egulias/email-validator from 3.2.2 to 3.2.4 Bumps [egulias/email-validator](https://github.com/egulias/EmailValidator) from 3.2.2 to 3.2.4. - [Release notes](https://github.com/egulias/EmailValidator/releases) - [Changelog](https://github.com/egulias/EmailValidator/blob/3.x/CHANGELOG.md) - [Commits](https://github.com/egulias/EmailValidator/compare/3.2.2...3.2.4) --- updated-dependencies: - dependency-name: egulias/email-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 048759d2d..8f4a1de89 100644 --- a/composer.lock +++ b/composer.lock @@ -2019,20 +2019,20 @@ }, { "name": "egulias/email-validator", - "version": "3.2.2", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5" + "reference": "5f35e41eba05fdfbabd95d72f83795c835fb7ed2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1ac0be80b32ea829009257934ecfd5ab20f24ba5", - "reference": "1ac0be80b32ea829009257934ecfd5ab20f24ba5", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5f35e41eba05fdfbabd95d72f83795c835fb7ed2", + "reference": "5f35e41eba05fdfbabd95d72f83795c835fb7ed2", "shasum": "" }, "require": { - "doctrine/lexer": "^1.2", + "doctrine/lexer": "^1.2|^2", "php": ">=7.2", "symfony/polyfill-intl-idn": "^1.15" }, @@ -2075,7 +2075,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.2" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.4" }, "funding": [ { @@ -2083,7 +2083,7 @@ "type": "github" } ], - "time": "2022-12-29T21:07:24+00:00" + "time": "2022-12-30T14:09:25+00:00" }, { "name": "endroid/qr-code", From 76418dd2ccb4e82d00c2b6df915f627d93fb81a7 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 2 Jan 2023 09:52:22 +0100 Subject: [PATCH 13/13] Update assets --- web/wallassets/material.js | 2 +- web/wallassets/material.js.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/wallassets/material.js b/web/wallassets/material.js index 75a9c513b..a64e2c830 100644 --- a/web/wallassets/material.js +++ b/web/wallassets/material.js @@ -1,2 +1,2 @@ -(()=>{var __webpack_modules__={5641:(e,t,n)=>{"use strict";n(8186)(n(262));var r=n(9731),i=n(9999);t.gV=r.App,n(1849),n(5587),t.notification=n(3612),t.storage=n(4623),t.ui=n(5443);var o=n.g.wgxpath;null!=o&&"function"==typeof o.install&&o.install();var a=n.g.annotator},9731:(e,t,n)=>{"use strict";var r=n(280),i=n(2702).Promise,o=n(1849),a=n(5587),s=n(3612),l=n(1258),c=n(4623);function T(){this.modules=[],this.registry=new l.Registry,this._started=!1,this.registry.registerUtility(s.defaultNotifier,"notifier"),this.include(o.acl),this.include(a.simple),this.include(c.noop)}T.prototype.include=function(e,t){var n=e(t);return"function"==typeof n.configure&&n.configure(this.registry),this.modules.push(n),this},T.prototype.start=function(){if(!this._started){this._started=!0;var e=this,t=this.registry;return this.authz=t.getUtility("authorizationPolicy"),this.ident=t.getUtility("identityPolicy"),this.notify=t.getUtility("notifier"),this.annotations=new c.StorageAdapter(t.getUtility("storage"),(function(){return e.runHook.apply(e,arguments)})),this.runHook("start",[this])}},T.prototype.destroy=function(){return this.runHook("destroy")},T.prototype.runHook=function(e,t){for(var n=[],r=0,o=this.modules.length;r{"use strict";var n;t.acl=function(){var e=new n;return{configure:function(t){t.registerUtility(e,"authorizationPolicy")}}},(n=t.AclAuthzPolicy=function(){}).prototype.permits=function(e,t,n){var r=this.authorizedUserId(n),i=t.permissions;if(i){var o=i[e];if(null==o)return!0;for(var a=0,s=o.length;a{"use strict";var n;t.simple=function(){var e=new n;return{configure:function(t){t.registerUtility(e,"identityPolicy")},beforeAnnotationCreated:function(t){t.user=e.who()}}},n=function(){this.identity=null},t.SimpleIdentityPolicy=n,n.prototype.who=function(){return this.identity}},3612:(e,t,n)=>{"use strict";var r=n(9999),i=r.$,o="info",a={show:"annotator-notice-show",info:"annotator-notice-info",success:"annotator-notice-success",error:"annotator-notice-error"};function s(e,t){null==t&&(t=o);var s=i("
")[0],l=!1,c=function(){l||(l=!0,i(s).removeClass(a.show).removeClass(a[t]),setTimeout((function(){i(s).remove()}),500))};return i(s).addClass(a.show).addClass(a[t]).html(r.escapeHtml(e||"")).appendTo(n.g.document.body),i(s).on("click",c),setTimeout(c,5e3),{close:c}}t.banner=s,t.defaultNotifier=s,t.INFO=o,t.SUCCESS="success",t.ERROR="error"},1258:(e,t)=>{"use strict";function n(){this.utilities={}}function r(e){this.name="LookupError",this.message='No utility registered for interface "'+e+'".'}n.prototype.registerUtility=function(e,t){this.utilities[t]=e},n.prototype.getUtility=function(e){var t=this.queryUtility(e);if(null===t)throw new r(e);return t},n.prototype.queryUtility=function(e){var t=this.utilities[e];return null==t?null:t},r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,t.LookupError=r,t.Registry=n},4623:(e,t,n)=>{"use strict";var r,i,o=n(9999),a=o.$,s=o.gettext,l=o.Promise,c=(r=-1,function(){return r+=1});function T(e,t){this.store=e,this.runHook=t}t.debug=function(){function e(e,t){var n=JSON.parse(JSON.stringify(t));console.debug("annotator.storage.debug: "+e,n)}return{create:function(t){return t.id=c(),e("create",t),t},update:function(t){return e("update",t),t},delete:function(t){return e("destroy",t),t},query:function(t){return e("query",t),{results:[],meta:{total:0}}},configure:function(e){e.registerUtility(this,"storage")}}},t.noop=function(){return{create:function(e){return void 0!==e.id&&null!==e.id||(e.id=c()),e},update:function(e){return e},delete:function(e){return e},query:function(){return{results:[]}},configure:function(e){e.registerUtility(this,"storage")}}},t.http=function(e){var t=function(){};null==e&&(e={}),e.onError=e.onError||function(e,n){console.error(e,n),t(e,"error")};var n=new i(e);return{configure:function(e){e.registerUtility(n,"storage")},start:function(e){t=e.notify}}},(i=t.HttpStorage=function e(t){this.options=a.extend(!0,{},e.options,t),this.onError=this.options.onError}).prototype.create=function(e){return this._apiRequest("create",e)},i.prototype.update=function(e){return this._apiRequest("update",e)},i.prototype.delete=function(e){return this._apiRequest("destroy",e)},i.prototype.query=function(e){return this._apiRequest("search",e).then((function(e){var t=e.rows;return delete e.rows,{results:t,meta:e}}))},i.prototype.setHeader=function(e,t){this.options.headers[e]=t},i.prototype._apiRequest=function(e,t){var n=t&&t.id,r=this._urlFor(e,n),i=this._apiRequestOptions(e,t),o=a.ajax(r,i);return o._id=n,o._action=e,o},i.prototype._apiRequestOptions=function(e,t){var n=this._methodFor(e),r=this,i={type:n,dataType:"json",error:function(){r._onError.apply(r,arguments)},headers:this.options.headers};if(!this.options.emulateHTTP||"PUT"!==n&&"DELETE"!==n||(i.headers=a.extend(i.headers,{"X-HTTP-Method-Override":n}),i.type="POST"),"search"===e)return i=a.extend(i,{data:t});var o=t&&JSON.stringify(t);return this.options.emulateJSON?(i.data={json:o},this.options.emulateHTTP&&(i.data._method=n),i):i=a.extend(i,{data:o,contentType:"application/json; charset=utf-8"})},i.prototype._urlFor=function(e,t){null==t&&(t="");var n="";return void 0!==this.options.prefix&&null!==this.options.prefix&&(n=this.options.prefix),n=(n+=this.options.urls[e]).replace(/idAnnotation/,t)},i.prototype._methodFor=function(e){return{create:"POST",update:"PUT",destroy:"DELETE",search:"GET"}[e]},i.prototype._onError=function(e){var t;"function"==typeof this.onError&&(t=400===e.status?s("The annotation store did not understand the request! (Error 400)"):401===e.status?s("You must be logged in to perform this operation! (Error 401)"):403===e.status?s("You don't have permission to perform this operation! (Error 403)"):404===e.status?s("Could not connect to the annotation store! (Error 404)"):500===e.status?s("Internal error in annotation store! (Error 500)"):s("Unknown error while speaking to annotation store!"),this.onError(t,e))},i.options={emulateHTTP:!1,emulateJSON:!1,headers:{},onError:function(e){console.error("API request failed: "+e)},prefix:"/store",urls:{create:"/annotations",update:"/annotations/idAnnotation",destroy:"/annotations/idAnnotation",search:"/search"}},T.prototype.create=function(e){return null==e&&(e={}),this._cycle(e,"create","beforeAnnotationCreated","annotationCreated")},T.prototype.update=function(e){if(void 0===e.id||null===e.id)throw new TypeError("annotation must have an id for update()");return this._cycle(e,"update","beforeAnnotationUpdated","annotationUpdated")},T.prototype.delete=function(e){if(void 0===e.id||null===e.id)throw new TypeError("annotation must have an id for delete()");return this._cycle(e,"delete","beforeAnnotationDeleted","annotationDeleted")},T.prototype.query=function(e){return l.resolve(this.store.query(e))},T.prototype.load=function(e){var t=this;return this.query(e).then((function(e){t.runHook("annotationsLoaded",[e.results])}))},T.prototype._cycle=function(e,t,n,r){var i=this;return this.runHook(n,[e]).then((function(){var n=a.extend(!0,{},e);delete n._local;var r=i.store[t](n);return l.resolve(r)})).then((function(t){for(var n in e)e.hasOwnProperty(n)&&"_local"!==n&&delete e[n];return a.extend(e,t),i.runHook(r,[e]),e}))},t.StorageAdapter=T},5443:(e,t,n)=>{t.main=n(3735).main,n(5107),n(8486),n(3826),n(7930),n(863),n(6996),n(7224),n(4233),n(3553)},5107:(e,t,n)=>{"use strict";var r=n(3553).$,i=n(9999),o=i.$,a=i.gettext,s="annotator-adder",l=r.extend({constructor:function(e){r.call(this,e),this.ignoreMouseup=!1,this.annotation=null,this.onCreate=this.options.onCreate;var t=this;this.element.on("click."+s,"button",(function(e){t._onClick(e)})).on("mousedown."+s,"button",(function(e){t._onMousedown(e)})),this.document=this.element[0].ownerDocument,o(this.document.body).on("mouseup."+s,(function(e){t._onMouseup(e)}))},destroy:function(){this.element.off("."+s),o(this.document.body).off("."+s),r.prototype.destroy.call(this)},load:function(e,t){this.annotation=e,this.show(t)},show:function(e){null!=e&&this.element.css({top:e.top,left:e.left}),r.prototype.show.call(this)},_onMousedown:function(e){e.which>1||(e.preventDefault(),this.ignoreMouseup=!0)},_onMouseup:function(e){e.which>1||this.ignoreMouseup&&e.stopImmediatePropagation()},_onClick:function(e){e.which>1||(e.preventDefault(),this.hide(),this.ignoreMouseup=!1,null!==this.annotation&&"function"==typeof this.onCreate&&this.onCreate(this.annotation,e))}});l.template=['
',' ","
"].join("\n"),l.options={onCreate:null},t.Adder=l},8486:(e,t,n)=>{"use strict";var r,i=n(3553).$,o=n(9999),a=o.$,s=o.gettext,l=o.Promise,c="annotator-editor",T=(r=-1,function(){return r+=1});function u(e){null!=e&&"function"==typeof e.preventDefault&&e.preventDefault()}var d=t.dragTracker=function(e,t){var n=null,r=!1;function i(e){if(!r&&null!==n){var i={y:e.pageY-n.top,x:e.pageX-n.left},o=!0;"function"==typeof t&&(o=t(i)),!1!==o&&(n={top:e.pageY,left:e.pageX}),r=!0,setTimeout((function(){r=!1}),1e3/60)}}function o(){n=null,a(e.ownerDocument).off("mouseup",o).off("mousemove",i)}function s(t){t.target===e&&(n={top:t.pageY,left:t.pageX},a(e.ownerDocument).on("mouseup",o).on("mousemove",i),t.preventDefault())}return a(e).on("mousedown",s),{destroy:function(){a(e).off("mousedown",s)}}},Q=t.resizer=function(e,t,n){var r=a(e);return null==n&&(n={}),d(t,(function(e){var t=r.height(),i=r.width(),o=function(e){var t=1,r=-1;return"function"==typeof n.invertedX&&n.invertedX()&&(t=-1),"function"==typeof n.invertedY&&n.invertedY()&&(r=1),{x:e.x*t,y:e.y*r}}(e);return Math.abs(o.x)>0&&r.width(i+o.x),Math.abs(o.y)>0&&r.height(t+o.y),r.height()!==t||r.width()!==i}))},p=t.mover=function(e,t){return d(t,(function(t){a(e).css({top:parseInt(a(e).css("top"),10)+t.y,left:parseInt(a(e).css("left"),10)+t.x})}))},h=t.Editor=i.extend({constructor:function(e){i.call(this,e),this.fields=[],this.annotation={},this.options.defaultFields&&this.addField({type:"textarea",label:s("Comments")+"…",load:function(e,t){a(e).find("textarea").val(t.text||"")},submit:function(e,t){t.text=a(e).find("textarea").val()}});var t=this;this.element.on("submit."+c,"form",(function(e){t._onFormSubmit(e)})).on("click."+c,".annotator-save",(function(e){t._onSaveClick(e)})).on("click."+c,".annotator-cancel",(function(e){t._onCancelClick(e)})).on("mouseover."+c,".annotator-cancel",(function(e){t._onCancelMouseover(e)})).on("keydown."+c,"textarea",(function(e){t._onTextareaKeydown(e)}))},destroy:function(){this.element.off("."+c),i.prototype.destroy.call(this)},show:function(e){null!=e&&this.element.css({top:e.top,left:e.left}),this.element.find(".annotator-save").addClass(this.classes.focus),i.prototype.show.call(this),this.element.find(":input:first").focus(),this._setupDraggables()},load:function(e,t){this.annotation=e;for(var n=0,r=this.fields.length;n');return t.element=r[0],"textarea"===t.type?n=a("",f.noCloneChecked=!!pe.cloneNode(!0).lastChild.defaultValue,pe.innerHTML="",f.option=!!pe.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ye(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&M(e,t)?v.merge([e],n):n}function be(e,t){for(var n=0,r=e.length;n",""]);var Ee=/<|&#?\w+;/;function Se(e,t,n,r,i){for(var o,a,s,l,c,T,u=t.createDocumentFragment(),d=[],Q=0,p=e.length;Q-1)i&&i.push(o);else if(c=se(o),a=ye(u.appendChild(o),"script"),c&&be(a),n)for(T=0;o=a[T++];)_e.test(o.type||"")&&n.push(o);return u}var ve=/^([^.]*)(?:\.(.+)|)/;function Le(){return!0}function Oe(){return!1}function Ce(e,t){return e===function(){try{return g.activeElement}catch(e){}}()==("focus"===t)}function Ne(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ne(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Oe;else if(!i)return e;return 1===o&&(a=i,i=function(e){return v().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=v.guid++)),e.each((function(){v.event.add(this,t,i,r,n)}))}function Ae(e,t,n){n?(X.set(e,t,!1),v.event.add(e,t,{namespace:!1,handler:function(e){var r,i,o=X.get(this,t);if(1&e.isTrigger&&this[t]){if(o.length)(v.event.special[t]||{}).delegateType&&e.stopPropagation();else if(o=s.call(arguments),X.set(this,t,o),r=n(this,t),this[t](),o!==(i=X.get(this,t))||r?X.set(this,t,!1):i={},o!==i)return e.stopImmediatePropagation(),e.preventDefault(),i&&i.value}else o.length&&(X.set(this,t,{value:v.event.trigger(v.extend(o[0],v.Event.prototype),o.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===X.get(e,t)&&v.event.add(e,t,Le)}v.event={global:{},add:function(e,t,n,r,i){var o,a,s,l,c,T,u,d,Q,p,h,f=X.get(e);if($(e))for(n.handler&&(n=(o=n).handler,i=o.selector),i&&v.find.matchesSelector(ae,i),n.guid||(n.guid=v.guid++),(l=f.events)||(l=f.events=Object.create(null)),(a=f.handle)||(a=f.handle=function(t){return void 0!==v&&v.event.triggered!==t.type?v.event.dispatch.apply(e,arguments):void 0}),c=(t=(t||"").match(k)||[""]).length;c--;)Q=h=(s=ve.exec(t[c])||[])[1],p=(s[2]||"").split(".").sort(),Q&&(u=v.event.special[Q]||{},Q=(i?u.delegateType:u.bindType)||Q,u=v.event.special[Q]||{},T=v.extend({type:Q,origType:h,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&v.expr.match.needsContext.test(i),namespace:p.join(".")},o),(d=l[Q])||((d=l[Q]=[]).delegateCount=0,u.setup&&!1!==u.setup.call(e,r,p,a)||e.addEventListener&&e.addEventListener(Q,a)),u.add&&(u.add.call(e,T),T.handler.guid||(T.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,T):d.push(T),v.event.global[Q]=!0)},remove:function(e,t,n,r,i){var o,a,s,l,c,T,u,d,Q,p,h,f=X.hasData(e)&&X.get(e);if(f&&(l=f.events)){for(c=(t=(t||"").match(k)||[""]).length;c--;)if(Q=h=(s=ve.exec(t[c])||[])[1],p=(s[2]||"").split(".").sort(),Q){for(u=v.event.special[Q]||{},d=l[Q=(r?u.delegateType:u.bindType)||Q]||[],s=s[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=d.length;o--;)T=d[o],!i&&h!==T.origType||n&&n.guid!==T.guid||s&&!s.test(T.namespace)||r&&r!==T.selector&&("**"!==r||!T.selector)||(d.splice(o,1),T.selector&&d.delegateCount--,u.remove&&u.remove.call(e,T));a&&!d.length&&(u.teardown&&!1!==u.teardown.call(e,p,f.handle)||v.removeEvent(e,Q,f.handle),delete l[Q])}else for(Q in l)v.event.remove(e,Q+t[c],n,r,!0);v.isEmptyObject(l)&&X.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),l=v.event.fix(e),c=(X.get(this,"events")||Object.create(null))[l.type]||[],T=v.event.special[l.type]||{};for(s[0]=l,t=1;t=1))for(;c!==this;c=c.parentNode||this)if(1===c.nodeType&&("click"!==e.type||!0!==c.disabled)){for(o=[],a={},n=0;n-1:v.find(i,this,null,[c]).length),a[i]&&o.push(r);o.length&&s.push({elem:c,handlers:o})}return c=this,l\s*$/g;function He(e,t){return M(e,"table")&&M(11!==t.nodeType?t:t.firstChild,"tr")&&v(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function we(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function De(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(X.hasData(e)&&(s=X.get(e).events))for(i in X.remove(t,"handle events"),s)for(n=0,r=s[i].length;n1&&"string"==typeof p&&!f.checkClone&&Re.test(p))return e.each((function(i){var o=e.eq(i);h&&(t[0]=p.call(this,i,o.html())),ke(o,t,n,r)}));if(d&&(o=(i=Se(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=v.map(ye(i,"script"),Ie)).length;u0&&be(a,!l&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=v.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[X.expando]){if(t.events)for(r in t.events)i[r]?v.event.remove(n,r):v.removeEvent(n,r,t.handle);n[X.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),v.fn.extend({detach:function(e){return Ve(this,e,!0)},remove:function(e){return Ve(this,e)},text:function(e){return q(this,(function(e){return void 0===e?v.text(this):this.empty().each((function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)}))}),null,e,arguments.length)},append:function(){return ke(this,arguments,(function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||He(this,e).appendChild(e)}))},prepend:function(){return ke(this,arguments,(function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=He(this,e);t.insertBefore(e,t.firstChild)}}))},before:function(){return ke(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this)}))},after:function(){return ke(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)}))},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(v.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map((function(){return v.clone(this,e,t)}))},html:function(e){return q(this,(function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Me.test(e)&&!ge[(me.exec(e)||["",""])[1].toLowerCase()]){e=v.htmlPrefilter(e);try{for(;n=0&&(l+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-l-s-.5))||0),l}function rt(e,t,n){var r=Ue(e),i=(!f.boxSizingReliable()||n)&&"border-box"===v.css(e,"boxSizing",!1,r),o=i,a=Ye(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Fe.test(a)){if(!n)return a;a="auto"}return(!f.boxSizingReliable()&&i||!f.reliableTrDimensions()&&M(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===v.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===v.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+nt(e,t,n||(i?"border":"content"),o,r,a)+"px"}function it(e,t,n,r,i){return new it.prototype.init(e,t,n,r,i)}v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ye(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=Z(t),l=Be.test(t),c=e.style;if(l||(t=Ke(s)),a=v.cssHooks[t]||v.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:c[t];"string"===(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=Te(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||l||(n+=i&&i[3]||(v.cssNumber[s]?"":"px")),f.clearCloneStyle||""!==n||0!==t.indexOf("background")||(c[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(l?c.setProperty(t,n):c[t]=n))}},css:function(e,t,n,r){var i,o,a,s=Z(t);return Be.test(t)||(t=Ke(s)),(a=v.cssHooks[t]||v.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ye(e,t,r)),"normal"===i&&t in et&&(i=et[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),v.each(["height","width"],(function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return!Xe.test(v.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?rt(e,t,r):Ge(e,Je,(function(){return rt(e,t,r)}))},set:function(e,n,r){var i,o=Ue(e),a=!f.scrollboxSize()&&"absolute"===o.position,s=(a||r)&&"border-box"===v.css(e,"boxSizing",!1,o),l=r?nt(e,t,r,s,o):0;return s&&a&&(l-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-nt(e,t,"border",!1,o)-.5)),l&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=v.css(e,t)),tt(0,n,l)}}})),v.cssHooks.marginLeft=ze(f.reliableMarginLeft,(function(e,t){if(t)return(parseFloat(Ye(e,"marginLeft"))||e.getBoundingClientRect().left-Ge(e,{marginLeft:0},(function(){return e.getBoundingClientRect().left})))+"px"})),v.each({margin:"",padding:"",border:"Width"},(function(e,t){v.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(v.cssHooks[e+t].set=tt)})),v.fn.extend({css:function(e,t){return q(this,(function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ue(e),i=t.length;a1)}}),v.Tween=it,it.prototype={constructor:it,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||v.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(v.cssNumber[n]?"":"px")},cur:function(){var e=it.propHooks[this.prop];return e&&e.get?e.get(this):it.propHooks._default.get(this)},run:function(e){var t,n=it.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):it.propHooks._default.set(this),this}},it.prototype.init.prototype=it.prototype,it.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=v.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):1!==e.elem.nodeType||!v.cssHooks[e.prop]&&null==e.elem.style[Ke(e.prop)]?e.elem[e.prop]=e.now:v.style(e.elem,e.prop,e.now+e.unit)}}},it.propHooks.scrollTop=it.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},v.fx=it.prototype.init,v.fx.step={};var ot,at,st=/^(?:toggle|show|hide)$/,lt=/queueHooks$/;function ct(){at&&(!1===g.hidden&&r.requestAnimationFrame?r.requestAnimationFrame(ct):r.setTimeout(ct,v.fx.interval),v.fx.tick())}function Tt(){return r.setTimeout((function(){ot=void 0})),ot=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function dt(e,t,n){for(var r,i=(Qt.tweeners[t]||[]).concat(Qt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each((function(){v.removeAttr(this,e)}))}}),v.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?v.prop(e,t,n):(1===o&&v.isXMLDoc(e)||(i=v.attrHooks[t.toLowerCase()]||(v.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void v.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=v.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!f.radioValue&&"radio"===t&&M(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(k);if(i&&1===e.nodeType)for(;n=i[r++];)e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?v.removeAttr(e,n):e.setAttribute(n,n),n}},v.each(v.expr.match.bool.source.match(/\w+/g),(function(e,t){var n=ht[t]||v.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}}));var ft=/^(?:input|select|textarea|button)$/i,mt=/^(?:a|area)$/i;function _t(e){return(e.match(k)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function yt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(k)||[]}v.fn.extend({prop:function(e,t){return q(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each((function(){delete this[v.propFix[e]||e]}))}}),v.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&v.isXMLDoc(e)||(t=v.propFix[t]||t,i=v.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=v.find.attr(e,"tabindex");return t?parseInt(t,10):ft.test(e.nodeName)||mt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),f.optSelected||(v.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),v.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],(function(){v.propFix[this.toLowerCase()]=this})),v.fn.extend({addClass:function(e){var t,n,r,i,o,a;return m(e)?this.each((function(t){v(this).addClass(e.call(this,t,gt(this)))})):(t=yt(e)).length?this.each((function(){if(r=gt(this),n=1===this.nodeType&&" "+_t(r)+" "){for(o=0;o-1;)n=n.replace(" "+i+" "," ");a=_t(n),r!==a&&this.setAttribute("class",a)}})):this:this.attr("class","")},toggleClass:function(e,t){var n,r,i,o,a=typeof e,s="string"===a||Array.isArray(e);return m(e)?this.each((function(n){v(this).toggleClass(e.call(this,n,gt(this),t),t)})):"boolean"==typeof t&&s?t?this.addClass(e):this.removeClass(e):(n=yt(e),this.each((function(){if(s)for(o=v(this),i=0;i-1)return!0;return!1}});var bt=/\r/g;v.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=m(e),this.each((function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,v(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=v.map(i,(function(e){return null==e?"":e+""}))),(t=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))}))):i?(t=v.valHooks[i.type]||v.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n:void 0}}),v.extend({valHooks:{option:{get:function(e){var t=v.find.attr(e,"value");return null!=t?t:_t(v.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],l=a?o+1:i.length;for(r=o<0?l:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),v.each(["radio","checkbox"],(function(){v.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=v.inArray(v(e).val(),t)>-1}},f.checkOn||(v.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})})),f.focusin="onfocusin"in r;var Et=/^(?:focusinfocus|focusoutblur)$/,St=function(e){e.stopPropagation()};v.extend(v.event,{trigger:function(e,t,n,i){var o,a,s,l,c,T,u,d,p=[n||g],h=Q.call(e,"type")?e.type:e,f=Q.call(e,"namespace")?e.namespace.split("."):[];if(a=d=s=n=n||g,3!==n.nodeType&&8!==n.nodeType&&!Et.test(h+v.event.triggered)&&(h.indexOf(".")>-1&&(f=h.split("."),h=f.shift(),f.sort()),c=h.indexOf(":")<0&&"on"+h,(e=e[v.expando]?e:new v.Event(h,"object"==typeof e&&e)).isTrigger=i?2:3,e.namespace=f.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+f.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:v.makeArray(t,[e]),u=v.event.special[h]||{},i||!u.trigger||!1!==u.trigger.apply(n,t))){if(!i&&!u.noBubble&&!_(n)){for(l=u.delegateType||h,Et.test(l+h)||(a=a.parentNode);a;a=a.parentNode)p.push(a),s=a;s===(n.ownerDocument||g)&&p.push(s.defaultView||s.parentWindow||r)}for(o=0;(a=p[o++])&&!e.isPropagationStopped();)d=a,e.type=o>1?l:u.bindType||h,(T=(X.get(a,"events")||Object.create(null))[e.type]&&X.get(a,"handle"))&&T.apply(a,t),(T=c&&a[c])&&T.apply&&$(a)&&(e.result=T.apply(a,t),!1===e.result&&e.preventDefault());return e.type=h,i||e.isDefaultPrevented()||u._default&&!1!==u._default.apply(p.pop(),t)||!$(n)||c&&m(n[h])&&!_(n)&&((s=n[c])&&(n[c]=null),v.event.triggered=h,e.isPropagationStopped()&&d.addEventListener(h,St),n[h](),e.isPropagationStopped()&&d.removeEventListener(h,St),v.event.triggered=void 0,s&&(n[c]=s)),e.result}},simulate:function(e,t,n){var r=v.extend(new v.Event,n,{type:e,isSimulated:!0});v.event.trigger(r,null,t)}}),v.fn.extend({trigger:function(e,t){return this.each((function(){v.event.trigger(e,t,this)}))},triggerHandler:function(e,t){var n=this[0];if(n)return v.event.trigger(e,t,n,!0)}}),f.focusin||v.each({focus:"focusin",blur:"focusout"},(function(e,t){var n=function(e){v.event.simulate(t,e.target,v.event.fix(e))};v.event.special[t]={setup:function(){var r=this.ownerDocument||this.document||this,i=X.access(r,t);i||r.addEventListener(e,n,!0),X.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this.document||this,i=X.access(r,t)-1;i?X.access(r,t,i):(r.removeEventListener(e,n,!0),X.remove(r,t))}}}));var vt=r.location,Lt={guid:Date.now()},Ot=/\?/;v.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new r.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||v.error("Invalid XML: "+(n?v.map(n.childNodes,(function(e){return e.textContent})).join("\n"):e)),t};var Ct=/\[\]$/,Nt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Mt=/^(?:input|select|textarea|keygen)/i;function Rt(e,t,n,r){var i;if(Array.isArray(t))v.each(t,(function(t,i){n||Ct.test(e)?r(e,i):Rt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)}));else if(n||"object"!==E(t))r(e,t);else for(i in t)Rt(e+"["+i+"]",t[i],n,r)}v.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,(function(){i(this.name,this.value)}));else for(n in e)Rt(n,e[n],t,i);return r.join("&")},v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map((function(){var e=v.prop(this,"elements");return e?v.makeArray(e):this})).filter((function(){var e=this.type;return this.name&&!v(this).is(":disabled")&&Mt.test(this.nodeName)&&!At.test(e)&&(this.checked||!fe.test(e))})).map((function(e,t){var n=v(this).val();return null==n?null:Array.isArray(n)?v.map(n,(function(e){return{name:t.name,value:e.replace(Nt,"\r\n")}})):{name:t.name,value:n.replace(Nt,"\r\n")}})).get()}});var xt=/%20/g,Ht=/#.*$/,It=/([?&])_=[^&]*/,wt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Dt=/^(?:GET|HEAD)$/,Pt=/^\/\//,kt={},Vt={},Ft="*/".concat("*"),Bt=g.createElement("a");function Ut(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(k)||[];if(m(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function Gt(e,t,n,r){var i={},o=e===Vt;function a(s){var l;return i[s]=!0,v.each(e[s]||[],(function(e,s){var c=s(t,n,r);return"string"!=typeof c||o||i[c]?o?!(l=c):void 0:(t.dataTypes.unshift(c),a(c),!1)})),l}return a(t.dataTypes[0])||!i["*"]&&a("*")}function jt(e,t){var n,r,i=v.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&v.extend(!0,e,r),e}Bt.href=vt.href,v.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:vt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(vt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Ft,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":v.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?jt(jt(e,v.ajaxSettings),t):jt(v.ajaxSettings,e)},ajaxPrefilter:Ut(kt),ajaxTransport:Ut(Vt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var n,i,o,a,s,l,c,T,u,d,Q=v.ajaxSetup({},t),p=Q.context||Q,h=Q.context&&(p.nodeType||p.jquery)?v(p):v.event,f=v.Deferred(),m=v.Callbacks("once memory"),_=Q.statusCode||{},y={},b={},E="canceled",S={readyState:0,getResponseHeader:function(e){var t;if(c){if(!a)for(a={};t=wt.exec(o);)a[t[1].toLowerCase()+" "]=(a[t[1].toLowerCase()+" "]||[]).concat(t[2]);t=a[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return c?o:null},setRequestHeader:function(e,t){return null==c&&(e=b[e.toLowerCase()]=b[e.toLowerCase()]||e,y[e]=t),this},overrideMimeType:function(e){return null==c&&(Q.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)S.always(e[S.status]);else for(t in e)_[t]=[_[t],e[t]];return this},abort:function(e){var t=e||E;return n&&n.abort(t),L(0,t),this}};if(f.promise(S),Q.url=((e||Q.url||vt.href)+"").replace(Pt,vt.protocol+"//"),Q.type=t.method||t.type||Q.method||Q.type,Q.dataTypes=(Q.dataType||"*").toLowerCase().match(k)||[""],null==Q.crossDomain){l=g.createElement("a");try{l.href=Q.url,l.href=l.href,Q.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){Q.crossDomain=!0}}if(Q.data&&Q.processData&&"string"!=typeof Q.data&&(Q.data=v.param(Q.data,Q.traditional)),Gt(kt,Q,t,S),c)return S;for(u in(T=v.event&&Q.global)&&0==v.active++&&v.event.trigger("ajaxStart"),Q.type=Q.type.toUpperCase(),Q.hasContent=!Dt.test(Q.type),i=Q.url.replace(Ht,""),Q.hasContent?Q.data&&Q.processData&&0===(Q.contentType||"").indexOf("application/x-www-form-urlencoded")&&(Q.data=Q.data.replace(xt,"+")):(d=Q.url.slice(i.length),Q.data&&(Q.processData||"string"==typeof Q.data)&&(i+=(Ot.test(i)?"&":"?")+Q.data,delete Q.data),!1===Q.cache&&(i=i.replace(It,"$1"),d=(Ot.test(i)?"&":"?")+"_="+Lt.guid+++d),Q.url=i+d),Q.ifModified&&(v.lastModified[i]&&S.setRequestHeader("If-Modified-Since",v.lastModified[i]),v.etag[i]&&S.setRequestHeader("If-None-Match",v.etag[i])),(Q.data&&Q.hasContent&&!1!==Q.contentType||t.contentType)&&S.setRequestHeader("Content-Type",Q.contentType),S.setRequestHeader("Accept",Q.dataTypes[0]&&Q.accepts[Q.dataTypes[0]]?Q.accepts[Q.dataTypes[0]]+("*"!==Q.dataTypes[0]?", "+Ft+"; q=0.01":""):Q.accepts["*"]),Q.headers)S.setRequestHeader(u,Q.headers[u]);if(Q.beforeSend&&(!1===Q.beforeSend.call(p,S,Q)||c))return S.abort();if(E="abort",m.add(Q.complete),S.done(Q.success),S.fail(Q.error),n=Gt(Vt,Q,t,S)){if(S.readyState=1,T&&h.trigger("ajaxSend",[S,Q]),c)return S;Q.async&&Q.timeout>0&&(s=r.setTimeout((function(){S.abort("timeout")}),Q.timeout));try{c=!1,n.send(y,L)}catch(e){if(c)throw e;L(-1,e)}}else L(-1,"No Transport");function L(e,t,a,l){var u,d,g,y,b,E=t;c||(c=!0,s&&r.clearTimeout(s),n=void 0,o=l||"",S.readyState=e>0?4:0,u=e>=200&&e<300||304===e,a&&(y=function(e,t,n){for(var r,i,o,a,s=e.contents,l=e.dataTypes;"*"===l[0];)l.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){l.unshift(i);break}if(l[0]in n)o=l[0];else{for(i in n){if(!l[0]||e.converters[i+" "+l[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==l[0]&&l.unshift(o),n[o]}(Q,S,a)),!u&&v.inArray("script",Q.dataTypes)>-1&&v.inArray("json",Q.dataTypes)<0&&(Q.converters["text script"]=function(){}),y=function(e,t,n,r){var i,o,a,s,l,c={},T=e.dataTypes.slice();if(T[1])for(a in e.converters)c[a.toLowerCase()]=e.converters[a];for(o=T.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=T.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(!(a=c[l+" "+o]||c["* "+o]))for(i in c)if((s=i.split(" "))[1]===o&&(a=c[l+" "+s[0]]||c["* "+s[0]])){!0===a?a=c[i]:!0!==c[i]&&(o=s[0],T.unshift(s[1]));break}if(!0!==a)if(a&&e.throws)t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}(Q,y,S,u),u?(Q.ifModified&&((b=S.getResponseHeader("Last-Modified"))&&(v.lastModified[i]=b),(b=S.getResponseHeader("etag"))&&(v.etag[i]=b)),204===e||"HEAD"===Q.type?E="nocontent":304===e?E="notmodified":(E=y.state,d=y.data,u=!(g=y.error))):(g=E,!e&&E||(E="error",e<0&&(e=0))),S.status=e,S.statusText=(t||E)+"",u?f.resolveWith(p,[d,E,S]):f.rejectWith(p,[S,E,g]),S.statusCode(_),_=void 0,T&&h.trigger(u?"ajaxSuccess":"ajaxError",[S,Q,u?d:g]),m.fireWith(p,[S,E]),T&&(h.trigger("ajaxComplete",[S,Q]),--v.active||v.event.trigger("ajaxStop")))}return S},getJSON:function(e,t,n){return v.get(e,t,n,"json")},getScript:function(e,t){return v.get(e,void 0,t,"script")}}),v.each(["get","post"],(function(e,t){v[t]=function(e,n,r,i){return m(n)&&(i=i||r,r=n,n=void 0),v.ajax(v.extend({url:e,type:t,dataType:i,data:n,success:r},v.isPlainObject(e)&&e))}})),v.ajaxPrefilter((function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")})),v._evalUrl=function(e,t,n){return v.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){v.globalEval(e,t,n)}})},v.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=v(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map((function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e})).append(this)),this},wrapInner:function(e){return m(e)?this.each((function(t){v(this).wrapInner(e.call(this,t))})):this.each((function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)}))},wrap:function(e){var t=m(e);return this.each((function(n){v(this).wrapAll(t?e.call(this,n):e)}))},unwrap:function(e){return this.parent(e).not("body").each((function(){v(this).replaceWith(this.childNodes)})),this}}),v.expr.pseudos.hidden=function(e){return!v.expr.pseudos.visible(e)},v.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},v.ajaxSettings.xhr=function(){try{return new r.XMLHttpRequest}catch(e){}};var qt={0:200,1223:204},Yt=v.ajaxSettings.xhr();f.cors=!!Yt&&"withCredentials"in Yt,f.ajax=Yt=!!Yt,v.ajaxTransport((function(e){var t,n;if(f.cors||Yt&&!e.crossDomain)return{send:function(i,o){var a,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(a in e.xhrFields)s[a]=e.xhrFields[a];for(a in e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest"),i)s.setRequestHeader(a,i[a]);t=function(e){return function(){t&&(t=n=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(qt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=t(),n=s.onerror=s.ontimeout=t("error"),void 0!==s.onabort?s.onabort=n:s.onreadystatechange=function(){4===s.readyState&&r.setTimeout((function(){t&&n()}))},t=t("abort");try{s.send(e.hasContent&&e.data||null)}catch(e){if(t)throw e}},abort:function(){t&&t()}}})),v.ajaxPrefilter((function(e){e.crossDomain&&(e.contents.script=!1)})),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",(function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")})),v.ajaxTransport("script",(function(e){var t,n;if(e.crossDomain||e.scriptAttrs)return{send:function(r,i){t=v("