diff --git a/app/Http/Controllers/AddMemberController.php b/app/Http/Controllers/AddMemberController.php
index 300dca647eafd5fb1d1ffc1ee45b1d5de7633f4b..ed3e564b11f2d3477ca660a459e1e855cf4cb55e 100644
--- a/app/Http/Controllers/AddMemberController.php
+++ b/app/Http/Controllers/AddMemberController.php
@@ -50,7 +50,7 @@ class AddMemberController extends Controller
if ($request->hasFile('list_members')) {
try {
$extension = $request->file('list_members')->getClientOriginalExtension();
- if ($extension === 'csv') {
+ if ($extension === 'xlsx' || $extension === 'csv') {
$path = $request->file('list_members')->getRealPath();
$data = Excel::load($path, function($reader) {})->get();
if (!empty($data)) {
diff --git a/composer.lock b/composer.lock
index 2bcd1398c234af708ffb9ea62aade9ba70c8943e..1906b96608fa55f49faa12ab3520975622b1423c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,9 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "hash": "26fe959c1d32eef303f33bebbd49df01",
"content-hash": "021fda31372ba92222b0fc90695bcfc9",
"packages": [
{
@@ -38,7 +37,7 @@
"MIT"
],
"description": "implementation of xdg base directory specification for php",
- "time": "2014-10-24 07:27:01"
+ "time": "2014-10-24T07:27:01+00:00"
},
{
"name": "doctrine/inflector",
@@ -105,7 +104,7 @@
"singularize",
"string"
],
- "time": "2018-01-09 20:05:19"
+ "time": "2018-01-09T20:05:19+00:00"
},
{
"name": "doctrine/lexer",
@@ -159,20 +158,20 @@
"lexer",
"parser"
],
- "time": "2014-09-09 13:34:57"
+ "time": "2014-09-09T13:34:57+00:00"
},
{
"name": "dragonmantank/cron-expression",
- "version": "v2.1.0",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "3f00985deec8df53d4cc1e5c33619bda1ee309a5"
+ "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/3f00985deec8df53d4cc1e5c33619bda1ee309a5",
- "reference": "3f00985deec8df53d4cc1e5c33619bda1ee309a5",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
+ "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
"shasum": ""
},
"require": {
@@ -208,20 +207,20 @@
"cron",
"schedule"
],
- "time": "2018-04-06 15:51:55"
+ "time": "2018-06-06T03:12:17+00:00"
},
{
"name": "egulias/email-validator",
- "version": "2.1.4",
+ "version": "2.1.7",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "8790f594151ca6a2010c6218e09d96df67173ad3"
+ "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3",
- "reference": "8790f594151ca6a2010c6218e09d96df67173ad3",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e",
+ "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e",
"shasum": ""
},
"require": {
@@ -265,7 +264,7 @@
"validation",
"validator"
],
- "time": "2018-04-10 10:11:19"
+ "time": "2018-12-04T22:38:24+00:00"
},
{
"name": "erusev/parsedown",
@@ -311,20 +310,20 @@
"markdown",
"parser"
],
- "time": "2018-03-08 01:11:30"
+ "time": "2018-03-08T01:11:30+00:00"
},
{
"name": "fideloper/proxy",
- "version": "4.0.0",
+ "version": "4.1.0",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
- "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
+ "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
- "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+ "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
+ "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
"shasum": ""
},
"require": {
@@ -365,7 +364,7 @@
"proxy",
"trusted proxy"
],
- "time": "2018-02-07 20:20:57"
+ "time": "2019-01-10T14:06:47+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -430,7 +429,7 @@
"rest",
"web service"
],
- "time": "2018-04-22 15:46:56"
+ "time": "2018-04-22T15:46:56+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -481,36 +480,37 @@
"keywords": [
"promise"
],
- "time": "2016-12-20 10:07:11"
+ "time": "2016-12-20T10:07:11+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "1.4.2",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+ "reference": "9f83dded91781a01c63574e387eaa769be769115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
- "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+ "reference": "9f83dded91781a01c63574e387eaa769be769115",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
- "psr/http-message": "~1.0"
+ "psr/http-message": "~1.0",
+ "ralouphie/getallheaders": "^2.0.5"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -540,42 +540,43 @@
"keywords": [
"http",
"message",
+ "psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
- "time": "2017-03-20 17:10:46"
+ "time": "2018-12-04T20:46:45+00:00"
},
{
"name": "jakub-onderka/php-console-color",
- "version": "0.1",
+ "version": "v0.2",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
+ "jakub-onderka/php-parallel-lint": "1.0",
"jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
+ "phpunit/phpunit": "~4.3",
"squizlabs/php_codesniffer": "1.*"
},
"type": "library",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -585,41 +586,41 @@
"authors": [
{
"name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
+ "email": "jakub.onderka@gmail.com"
}
],
- "time": "2014-04-08 15:00:19"
+ "time": "2018-09-29T17:23:10+00:00"
},
{
"name": "jakub-onderka/php-console-highlighter",
- "version": "v0.3.2",
+ "version": "v0.4",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
"shasum": ""
},
"require": {
- "jakub-onderka/php-console-color": "~0.1",
- "php": ">=5.3.0"
+ "ext-tokenizer": "*",
+ "jakub-onderka/php-console-color": "~0.2",
+ "php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~0.5",
+ "jakub-onderka/php-parallel-lint": "~1.0",
"jakub-onderka/php-var-dump-check": "~0.1",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
"type": "library",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleHighlighter": "src/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -633,7 +634,8 @@
"homepage": "http://www.acci.cz/"
}
],
- "time": "2015-04-20 18:58:01"
+ "description": "Highlight PHP code in terminal",
+ "time": "2018-09-29T18:48:56+00:00"
},
{
"name": "jeremeamia/SuperClosure",
@@ -691,20 +693,20 @@
"serialize",
"tokenizer"
],
- "time": "2018-03-21 22:21:57"
+ "time": "2018-03-21T22:21:57+00:00"
},
{
"name": "laravel/framework",
- "version": "v5.6.17",
+ "version": "v5.6.39",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d"
+ "reference": "37bb306f516669ab4f888c16003f694313ab299e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
- "reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e",
+ "reference": "37bb306f516669ab4f888c16003f694313ab299e",
"shasum": ""
},
"require": {
@@ -830,20 +832,20 @@
"framework",
"laravel"
],
- "time": "2018-04-17 12:51:04"
+ "time": "2018-10-04T14:50:41+00:00"
},
{
"name": "laravel/socialite",
- "version": "v3.0.9",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
- "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb"
+ "reference": "7194c0cd9fb2ce449669252b8ec316b85b7de481"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/socialite/zipball/fc1c8d415699e502f3e61cbc61e3250d5bd942eb",
- "reference": "fc1c8d415699e502f3e61cbc61e3250d5bd942eb",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/7194c0cd9fb2ce449669252b8ec316b85b7de481",
+ "reference": "7194c0cd9fb2ce449669252b8ec316b85b7de481",
"shasum": ""
},
"require": {
@@ -852,7 +854,7 @@
"illuminate/http": "~5.4",
"illuminate/support": "~5.4",
"league/oauth1-client": "~1.0",
- "php": ">=5.4.0"
+ "php": ">=5.6.4"
},
"require-dev": {
"mockery/mockery": "~0.9",
@@ -888,24 +890,25 @@
}
],
"description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
+ "homepage": "https://laravel.com",
"keywords": [
"laravel",
"oauth"
],
- "time": "2017-11-06 16:02:48"
+ "time": "2018-10-18T03:39:04+00:00"
},
{
"name": "laravel/tinker",
- "version": "v1.0.6",
+ "version": "v1.0.8",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b"
+ "reference": "cafbf598a90acde68985660e79b2b03c5609a405"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b",
- "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405",
+ "reference": "cafbf598a90acde68985660e79b2b03c5609a405",
"shasum": ""
},
"require": {
@@ -955,20 +958,20 @@
"laravel",
"psysh"
],
- "time": "2018-04-16 12:10:37"
+ "time": "2018-10-12T19:39:35+00:00"
},
{
"name": "laravelcollective/html",
- "version": "v5.6.6",
+ "version": "v5.6.10",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "b3a10245c791a211e5f8ec37117f4549cd22aabe"
+ "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/b3a10245c791a211e5f8ec37117f4549cd22aabe",
- "reference": "b3a10245c791a211e5f8ec37117f4549cd22aabe",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
+ "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
"shasum": ""
},
"require": {
@@ -982,7 +985,7 @@
"require-dev": {
"illuminate/database": "5.6.*",
"mockery/mockery": "~1.0",
- "phpunit/phpunit": "~5.4"
+ "phpunit/phpunit": "~7.1"
},
"type": "library",
"extra": {
@@ -1023,32 +1026,32 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "https://laravelcollective.com",
- "time": "2018-04-09 14:09:32"
+ "time": "2018-06-18T15:04:16+00:00"
},
{
"name": "league/flysystem",
- "version": "1.0.44",
+ "version": "1.0.49",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "168dbe519737221dc87d17385cde33073881fd02"
+ "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/168dbe519737221dc87d17385cde33073881fd02",
- "reference": "168dbe519737221dc87d17385cde33073881fd02",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd",
+ "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd",
"shasum": ""
},
"require": {
+ "ext-fileinfo": "*",
"php": ">=5.5.9"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
},
"require-dev": {
- "ext-fileinfo": "*",
"phpspec/phpspec": "^3.4",
- "phpunit/phpunit": "^5.7"
+ "phpunit/phpunit": "^5.7.10"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -1107,7 +1110,7 @@
"sftp",
"storage"
],
- "time": "2018-04-06 09:58:14"
+ "time": "2018-11-23T23:41:29+00:00"
},
{
"name": "league/oauth1-client",
@@ -1170,27 +1173,27 @@
"tumblr",
"twitter"
],
- "time": "2016-08-17 00:36:58"
+ "time": "2016-08-17T00:36:58+00:00"
},
{
"name": "maatwebsite/excel",
- "version": "2.1.27",
+ "version": "2.1.30",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
- "reference": "ea758fe5a9d33e0d88b40f099d1df652a0c99d38"
+ "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/ea758fe5a9d33e0d88b40f099d1df652a0c99d38",
- "reference": "ea758fe5a9d33e0d88b40f099d1df652a0c99d38",
+ "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/f5540c4ba3ac50cebd98b09ca42e61f926ef299f",
+ "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f",
"shasum": ""
},
"require": {
- "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+ "illuminate/cache": "^5.0",
+ "illuminate/config": "^5.0",
+ "illuminate/filesystem": "^5.0",
+ "illuminate/support": "^5.0",
"jeremeamia/superclosure": "^2.3",
"nesbot/carbon": "~1.0",
"php": ">=5.5",
@@ -1204,10 +1207,10 @@
"phpunit/phpunit": "~4.0"
},
"suggest": {
- "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
- "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
+ "illuminate/http": "^5.0",
+ "illuminate/queue": "^5.0",
+ "illuminate/routing": "^5.0",
+ "illuminate/view": "^5.0"
},
"type": "library",
"extra": {
@@ -1238,7 +1241,7 @@
"email": "patrick@maatwebsite.nl"
}
],
- "description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel",
+ "description": "Supercharged Excel exports in Laravel",
"keywords": [
"PHPExcel",
"batch",
@@ -1248,20 +1251,20 @@
"import",
"laravel"
],
- "time": "2018-03-09 13:14:19"
+ "time": "2018-09-04T19:00:09+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.23.0",
+ "version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
- "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+ "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
@@ -1326,7 +1329,7 @@
"logging",
"psr-3"
],
- "time": "2017-06-19 01:22:40"
+ "time": "2018-11-05T09:00:11+00:00"
},
{
"name": "nesbot/carbon",
@@ -1379,20 +1382,20 @@
"datetime",
"time"
],
- "time": "2018-03-19 15:50:49"
+ "time": "2018-03-19T15:50:49+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.0.1",
+ "version": "v4.2.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
+ "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
- "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
+ "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a",
"shasum": ""
},
"require": {
@@ -1408,7 +1411,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -1430,37 +1433,33 @@
"parser",
"php"
],
- "time": "2018-03-25 17:35:16"
+ "time": "2019-01-12T16:31:37+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.12",
+ "version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
- "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -1475,29 +1474,34 @@
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
+ "polyfill",
"pseudorandom",
"random"
],
- "time": "2018-04-04 21:24:14"
+ "time": "2018-07-02T15:55:56+00:00"
},
{
"name": "phpoffice/phpexcel",
- "version": "1.8.1",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PHPExcel.git",
- "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
+ "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
- "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+ "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870",
+ "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870",
"shasum": ""
},
"require": {
+ "ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "php": ">=5.2.0"
+ "php": "^5.2|^7.0"
+ },
+ "require-dev": {
+ "squizlabs/php_codesniffer": "2.*"
},
"type": "library",
"autoload": {
@@ -1507,7 +1511,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "LGPL"
+ "LGPL-2.1"
],
"authors": [
{
@@ -1515,18 +1519,19 @@
"homepage": "http://blog.maartenballiauw.be"
},
{
- "name": "Mark Baker"
+ "name": "Erik Tilt"
},
{
"name": "Franck Lefevre",
- "homepage": "http://blog.rootslabs.net"
+ "homepage": "http://rootslabs.net"
},
{
- "name": "Erik Tilt"
+ "name": "Mark Baker",
+ "homepage": "http://markbakeruk.net"
}
],
"description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
- "homepage": "http://phpexcel.codeplex.com",
+ "homepage": "https://github.com/PHPOffice/PHPExcel",
"keywords": [
"OpenXML",
"excel",
@@ -1536,7 +1541,7 @@
"xlsx"
],
"abandoned": "phpoffice/phpspreadsheet",
- "time": "2015-05-01 07:00:55"
+ "time": "2018-11-22T23:07:24+00:00"
},
{
"name": "psr/container",
@@ -1585,7 +1590,7 @@
"container-interop",
"psr"
],
- "time": "2017-02-14 16:28:37"
+ "time": "2017-02-14T16:28:37+00:00"
},
{
"name": "psr/http-message",
@@ -1635,20 +1640,20 @@
"request",
"response"
],
- "time": "2016-08-06 14:39:51"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1682,7 +1687,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10 12:19:37"
+ "time": "2018-11-20T15:27:04+00:00"
},
{
"name": "psr/simple-cache",
@@ -1730,34 +1735,36 @@
"psr-16",
"simple-cache"
],
- "time": "2017-10-23 01:57:42"
+ "time": "2017-10-23T01:57:42+00:00"
},
{
"name": "psy/psysh",
- "version": "v0.9.3",
+ "version": "v0.9.9",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
+ "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
- "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
+ "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
+ "ext-json": "*",
+ "ext-tokenizer": "*",
+ "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
"nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0"
},
"require-dev": {
+ "bamarni/composer-bin-plugin": "^1.2",
"hoa/console": "~2.15|~3.16",
- "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
- "symfony/finder": "~2.1|~3.0|~4.0"
+ "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
},
"suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -1802,25 +1809,66 @@
"interactive",
"shell"
],
- "time": "2018-04-18 12:32:50"
+ "time": "2018-10-13T15:16:03+00:00"
+ },
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "2.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~3.7.0",
+ "satooshi/php-coveralls": ">=1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "time": "2016-02-11T07:05:27+00:00"
},
{
"name": "ramsey/uuid",
- "version": "3.7.3",
+ "version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
- "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+ "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "^1.0|^2.0",
- "php": "^5.4 || ^7.0"
+ "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+ "php": "^5.4 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"replace": {
"rhumsaa/uuid": "self.version"
@@ -1828,16 +1876,17 @@
"require-dev": {
"codeception/aspect-mock": "^1.0 | ~2.0.0",
"doctrine/annotations": "~1.2.0",
- "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+ "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
"ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.9",
"moontoast/math": "^1.1",
"php-mock/php-mock-phpunit": "^0.3|^1.1",
- "phpunit/phpunit": "^4.7|^5.0",
+ "phpunit/phpunit": "^4.7|^5.0|^6.5",
"squizlabs/php_codesniffer": "^2.3"
},
"suggest": {
+ "ext-ctype": "Provides support for PHP Ctype functions",
"ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
"ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
"ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -1882,20 +1931,20 @@
"identifier",
"uuid"
],
- "time": "2018-01-20 00:28:24"
+ "time": "2018-07-19T23:38:55+00:00"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v6.0.2",
+ "version": "v6.1.3",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"
+ "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
- "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4",
+ "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4",
"shasum": ""
},
"require": {
@@ -1906,10 +1955,14 @@
"mockery/mockery": "~0.9.1",
"symfony/phpunit-bridge": "~3.3@dev"
},
+ "suggest": {
+ "ext-intl": "Needed to support internationalized email addresses",
+ "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.1-dev"
}
},
"autoload": {
@@ -1931,30 +1984,31 @@
}
],
"description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "http://swiftmailer.symfony.com",
+ "homepage": "https://swiftmailer.symfony.com",
"keywords": [
"email",
"mail",
"mailer"
],
- "time": "2017-09-30 22:39:41"
+ "time": "2018-09-11T07:12:52+00:00"
},
{
"name": "symfony/console",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64"
+ "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
- "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
+ "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
+ "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
"shasum": ""
},
"require": {
"php": "^7.1.3",
+ "symfony/contracts": "^1.0",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
@@ -1970,7 +2024,7 @@
"symfony/process": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "For using the console logger",
+ "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/lock": "",
"symfony/process": ""
@@ -1978,7 +2032,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2005,20 +2059,88 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03 05:24:00"
+ "time": "2019-01-04T15:13:53+00:00"
+ },
+ {
+ "name": "symfony/contracts",
+ "version": "v1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/contracts.git",
+ "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+ "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3"
+ },
+ "require-dev": {
+ "psr/cache": "^1.0",
+ "psr/container": "^1.0"
+ },
+ "suggest": {
+ "psr/cache": "When using the Cache contracts",
+ "psr/container": "When using the Service contracts",
+ "symfony/cache-contracts-implementation": "",
+ "symfony/service-contracts-implementation": "",
+ "symfony/translation-contracts-implementation": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Contracts\\": ""
+ },
+ "exclude-from-classmap": [
+ "**/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "A set of abstractions extracted out of the Symfony components",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "abstractions",
+ "contracts",
+ "decoupling",
+ "interfaces",
+ "interoperability",
+ "standards"
+ ],
+ "time": "2018-12-05T08:06:11+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2"
+ "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/03f965583147957f1ecbad7ea1c9d6fd5e525ec2",
- "reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4",
+ "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4",
"shasum": ""
},
"require": {
@@ -2027,7 +2149,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2058,20 +2180,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2018-03-19 22:35:49"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/debug",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "5961d02d48828671f5d8a7805e06579d692f6ede"
+ "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede",
- "reference": "5961d02d48828671f5d8a7805e06579d692f6ede",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+ "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
"shasum": ""
},
"require": {
@@ -2087,7 +2209,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2114,24 +2236,25 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03 05:24:00"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "63353a71073faf08f62caab4e6889b06a787f07b"
+ "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/63353a71073faf08f62caab4e6889b06a787f07b",
- "reference": "63353a71073faf08f62caab4e6889b06a787f07b",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+ "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.1.3",
+ "symfony/contracts": "^1.0"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
@@ -2150,7 +2273,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2177,20 +2300,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-04-06 07:35:43"
+ "time": "2019-01-05T16:37:49+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49"
+ "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
- "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
+ "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
"shasum": ""
},
"require": {
@@ -2199,7 +2322,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2226,20 +2349,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-04-04 05:10:37"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c"
+ "reference": "a633d422a09242064ba24e44a6e1494c5126de86"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0864a82e5891ab61d31eecbaa48bed5a09b8e6c",
- "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
+ "reference": "a633d422a09242064ba24e44a6e1494c5126de86",
"shasum": ""
},
"require": {
@@ -2247,12 +2370,13 @@
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
+ "predis/predis": "~1.0",
"symfony/expression-language": "~3.4|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2279,33 +2403,36 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03 05:24:00"
+ "time": "2019-01-05T16:37:49+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "6dd620d96d64456075536ffe3c6c4658dd689021"
+ "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6dd620d96d64456075536ffe3c6c4658dd689021",
- "reference": "6dd620d96d64456075536ffe3c6c4658dd689021",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
+ "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
+ "symfony/contracts": "^1.0.2",
"symfony/debug": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/http-foundation": "~3.4.4|~4.0.4"
+ "symfony/event-dispatcher": "~4.1",
+ "symfony/http-foundation": "^4.1.1",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/config": "<3.4",
- "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
- "symfony/var-dumper": "<3.4",
+ "symfony/dependency-injection": "<4.2",
+ "symfony/translation": "<4.2",
+ "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2"
},
"provide": {
@@ -2317,7 +2444,7 @@
"symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~3.4|~4.0",
- "symfony/dependency-injection": "^3.4.5|^4.0.5",
+ "symfony/dependency-injection": "^4.2",
"symfony/dom-crawler": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
@@ -2325,8 +2452,8 @@
"symfony/routing": "~3.4|~4.0",
"symfony/stopwatch": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0",
- "symfony/translation": "~3.4|~4.0",
- "symfony/var-dumper": "~3.4|~4.0"
+ "symfony/translation": "~4.2",
+ "symfony/var-dumper": "^4.1.1"
},
"suggest": {
"symfony/browser-kit": "",
@@ -2338,7 +2465,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2365,20 +2492,78 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2018-04-06 16:25:03"
+ "time": "2019-01-06T16:19:23+00:00"
+ },
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.9-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ },
+ {
+ "name": "Gert de Pagter",
+ "email": "backendtea@gmail.com"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
+ ],
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
- "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -2390,7 +2575,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2424,20 +2609,20 @@
"portable",
"shim"
],
- "time": "2018-01-30 19:27:44"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8"
+ "reference": "ff208829fe1aa48ab9af356992bb7199fed551af"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8",
- "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af",
+ "reference": "ff208829fe1aa48ab9af356992bb7199fed551af",
"shasum": ""
},
"require": {
@@ -2447,7 +2632,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2480,20 +2665,20 @@
"portable",
"shim"
],
- "time": "2018-01-30 19:27:44"
+ "time": "2018-09-21T06:26:08+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"shasum": ""
},
"require": {
@@ -2502,7 +2687,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2535,20 +2720,20 @@
"portable",
"shim"
],
- "time": "2018-01-31 17:43:24"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.7.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "e17c808ec4228026d4f5a8832afa19be85979563"
+ "reference": "3b58903eae668d348a7126f999b0da0f2f93611c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563",
- "reference": "e17c808ec4228026d4f5a8832afa19be85979563",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c",
+ "reference": "3b58903eae668d348a7126f999b0da0f2f93611c",
"shasum": ""
},
"require": {
@@ -2557,7 +2742,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -2587,20 +2772,20 @@
"polyfill",
"shim"
],
- "time": "2018-01-31 18:08:44"
+ "time": "2018-09-30T16:36:12+00:00"
},
{
"name": "symfony/process",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25"
+ "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
- "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
+ "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
+ "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
"shasum": ""
},
"require": {
@@ -2609,7 +2794,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2636,35 +2821,34 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03 05:24:00"
+ "time": "2019-01-03T14:48:52+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71"
+ "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71",
- "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
+ "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"conflict": {
- "symfony/config": "<3.4",
+ "symfony/config": "<4.2",
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
},
"require-dev": {
"doctrine/annotations": "~1.0",
- "doctrine/common": "~2.2",
"psr/log": "~1.0",
- "symfony/config": "~3.4|~4.0",
+ "symfony/config": "~4.2",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/http-foundation": "~3.4|~4.0",
@@ -2681,7 +2865,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2714,24 +2898,25 @@
"uri",
"url"
],
- "time": "2018-04-04 13:50:32"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/translation",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938"
+ "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938",
- "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
+ "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
"shasum": ""
},
"require": {
"php": "^7.1.3",
+ "symfony/contracts": "^1.0.2",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
@@ -2739,23 +2924,27 @@
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
},
+ "provide": {
+ "symfony/translation-contracts-implementation": "1.0"
+ },
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
+ "symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
"symfony/intl": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
- "psr/log": "To use logging capability in translator",
+ "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2782,20 +2971,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2018-02-22 10:50:29"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0"
+ "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e1b4d008100f4d203cc38b0d793ad6252d8d8af0",
- "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
+ "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
"shasum": ""
},
"require": {
@@ -2804,20 +2993,27 @@
"symfony/polyfill-php72": "~1.5"
},
"conflict": {
- "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+ "symfony/console": "<3.4"
},
"require-dev": {
"ext-iconv": "*",
+ "symfony/console": "~3.4|~4.0",
+ "symfony/process": "~3.4|~4.0",
"twig/twig": "~1.34|~2.4"
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
- "ext-intl": "To show region name in time zone dump"
+ "ext-intl": "To show region name in time zone dump",
+ "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
+ "bin": [
+ "Resources/bin/var-dump-server"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -2851,7 +3047,7 @@
"debug",
"dump"
],
- "time": "2018-04-04 05:10:37"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -2898,7 +3094,7 @@
],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
- "time": "2017-11-27 11:13:29"
+ "time": "2017-11-27T11:13:29+00:00"
},
{
"name": "unisharp/laravel-ckeditor",
@@ -2952,32 +3148,33 @@
"text",
"wysiwyg"
],
- "time": "2017-11-01 04:33:40"
+ "time": "2017-11-01T04:33:40+00:00"
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.4.0",
+ "version": "v2.6.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+ "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+ "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.9",
+ "symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2987,7 +3184,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause-Attribution"
+ "BSD-3-Clause"
],
"authors": [
{
@@ -3002,7 +3199,7 @@
"env",
"environment"
],
- "time": "2016-09-01 10:05:43"
+ "time": "2019-01-29T11:11:52+00:00"
}
],
"packages-dev": [
@@ -3058,20 +3255,20 @@
"constructor",
"instantiate"
],
- "time": "2017-07-22 11:58:36"
+ "time": "2017-07-22T11:58:36+00:00"
},
{
"name": "filp/whoops",
- "version": "2.1.14",
+ "version": "2.3.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6"
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
- "reference": "c6081b8838686aa04f1e83ba7e91f78b7b2a23e6",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"shasum": ""
},
"require": {
@@ -3079,9 +3276,9 @@
"psr/log": "^1.0.1"
},
"require-dev": {
- "mockery/mockery": "0.9.*",
+ "mockery/mockery": "^0.9 || ^1.0",
"phpunit/phpunit": "^4.8.35 || ^5.7",
- "symfony/var-dumper": "^2.6 || ^3.0"
+ "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0"
},
"suggest": {
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -3090,7 +3287,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -3119,20 +3316,20 @@
"throwable",
"whoops"
],
- "time": "2017-11-23 18:22:44"
+ "time": "2018-10-23T09:00:00+00:00"
},
{
"name": "fzaninotto/faker",
- "version": "v1.7.1",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+ "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
- "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+ "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
"shasum": ""
},
"require": {
@@ -3140,7 +3337,7 @@
},
"require-dev": {
"ext-intl": "*",
- "phpunit/phpunit": "^4.0 || ^5.0",
+ "phpunit/phpunit": "^4.8.35 || ^5.7",
"squizlabs/php_codesniffer": "^1.5"
},
"type": "library",
@@ -3169,7 +3366,7 @@
"faker",
"fixtures"
],
- "time": "2017-08-15 16:48:10"
+ "time": "2018-07-12T10:23:15+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -3217,25 +3414,27 @@
"keywords": [
"test"
],
- "time": "2016-01-20 08:20:44"
+ "time": "2016-01-20T08:20:44+00:00"
},
{
"name": "laravel/browser-kit-testing",
- "version": "v4.0.1",
+ "version": "v4.1.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/browser-kit-testing.git",
- "reference": "d70283fd29ee9ec09d07a9c94cc5518b569cfeaf"
+ "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/d70283fd29ee9ec09d07a9c94cc5518b569cfeaf",
- "reference": "d70283fd29ee9ec09d07a9c94cc5518b569cfeaf",
+ "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/550319e457aadc11c183bd6a1c46d225cf94fbaf",
+ "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf",
"shasum": ""
},
"require": {
+ "illuminate/support": "^5.6",
+ "mockery/mockery": "^1.0",
"php": ">=7.1.3",
- "phpunit/phpunit": "~7.0",
+ "phpunit/phpunit": "^7.0",
"symfony/css-selector": "~4.0",
"symfony/dom-crawler": "~4.0"
},
@@ -3265,20 +3464,20 @@
"laravel",
"testing"
],
- "time": "2018-03-13 18:07:36"
+ "time": "2018-10-31T17:30:20+00:00"
},
{
"name": "mockery/mockery",
- "version": "1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38"
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38",
- "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
"shasum": ""
},
"require": {
@@ -3287,7 +3486,7 @@
"php": ">=5.6.0"
},
"require-dev": {
- "phpunit/phpunit": "~5.7|~6.1"
+ "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
},
"type": "library",
"extra": {
@@ -3316,8 +3515,8 @@
"homepage": "http://davedevelopment.co.uk"
}
],
- "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
- "homepage": "http://github.com/mockery/mockery",
+ "description": "Mockery is a simple yet flexible PHP mock object framework",
+ "homepage": "https://github.com/mockery/mockery",
"keywords": [
"BDD",
"TDD",
@@ -3330,29 +3529,32 @@
"test double",
"testing"
],
- "time": "2017-10-06 16:20:43"
+ "time": "2018-10-02T21:52:37+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.7.0",
+ "version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+ "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+ "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.1"
+ },
+ "replace": {
+ "myclabs/deep-copy": "self.version"
},
"require-dev": {
"doctrine/collections": "^1.0",
"doctrine/common": "^2.6",
- "phpunit/phpunit": "^4.1"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"autoload": {
@@ -3375,7 +3577,7 @@
"object",
"object graph"
],
- "time": "2017-10-19 19:58:43"
+ "time": "2018-06-11T23:09:50+00:00"
},
{
"name": "nunomaduro/collision",
@@ -3436,26 +3638,26 @@
"php",
"symfony"
],
- "time": "2018-02-07 10:42:20"
+ "time": "2018-02-07T10:42:20+00:00"
},
{
"name": "phar-io/manifest",
- "version": "1.0.1",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+ "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+ "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "^1.0.1",
+ "phar-io/version": "^2.0",
"php": "^5.6 || ^7.0"
},
"type": "library",
@@ -3491,20 +3693,20 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2017-03-05 18:14:27"
+ "time": "2018-07-08T19:23:20+00:00"
},
{
"name": "phar-io/version",
- "version": "1.0.1",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+ "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+ "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
"shasum": ""
},
"require": {
@@ -3538,7 +3740,7 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2017-03-05 17:38:23"
+ "time": "2018-07-08T19:19:57+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3592,7 +3794,7 @@
"reflection",
"static analysis"
],
- "time": "2017-09-11 18:02:19"
+ "time": "2017-09-11T18:02:19+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -3643,7 +3845,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2017-11-30 07:14:17"
+ "time": "2017-11-30T07:14:17+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@@ -3690,20 +3892,20 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2017-07-14 14:27:02"
+ "time": "2017-07-14T14:27:02+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "1.7.6",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
@@ -3715,12 +3917,12 @@
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -3753,31 +3955,31 @@
"spy",
"stub"
],
- "time": "2018-04-18 13:57:24"
+ "time": "2018-08-05T17:53:17+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "6.0.3",
+ "version": "6.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "774a82c0c5da4c1c7701790c262035d235ab7856"
+ "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856",
- "reference": "774a82c0c5da4c1c7701790c262035d235ab7856",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+ "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-xmlwriter": "*",
"php": "^7.1",
- "phpunit/php-file-iterator": "^1.4.2",
+ "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-token-stream": "^3.0",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^3.1",
+ "sebastian/environment": "^3.1 || ^4.0",
"sebastian/version": "^2.0.1",
"theseer/tokenizer": "^1.1"
},
@@ -3790,7 +3992,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.1-dev"
}
},
"autoload": {
@@ -3816,29 +4018,32 @@
"testing",
"xunit"
],
- "time": "2018-04-06 15:39:20"
+ "time": "2018-10-31T16:06:48+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.5",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+ "reference": "050bedf145a257b1ff02746c31894800e5122946"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+ "reference": "050bedf145a257b1ff02746c31894800e5122946",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^7.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -3853,7 +4058,7 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
+ "email": "sebastian@phpunit.de",
"role": "lead"
}
],
@@ -3863,7 +4068,7 @@
"filesystem",
"iterator"
],
- "time": "2017-11-27 13:52:08"
+ "time": "2018-09-13T20:33:42+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -3904,7 +4109,7 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
@@ -3953,20 +4158,20 @@
"keywords": [
"timer"
],
- "time": "2018-02-01 13:07:23"
+ "time": "2018-02-01T13:07:23+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
+ "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
- "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
+ "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
"shasum": ""
},
"require": {
@@ -4002,51 +4207,55 @@
"keywords": [
"tokenizer"
],
- "time": "2018-02-01 13:16:43"
+ "time": "2018-10-30T05:52:18+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "7.1.4",
+ "version": "7.5.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb"
+ "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",
- "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7c89093bd00f7d5ddf0ab81dee04f801416b4944",
+ "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944",
"shasum": ""
},
"require": {
+ "doctrine/instantiator": "^1.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
- "myclabs/deep-copy": "^1.6.1",
- "phar-io/manifest": "^1.0.1",
- "phar-io/version": "^1.0",
+ "myclabs/deep-copy": "^1.7",
+ "phar-io/manifest": "^1.0.2",
+ "phar-io/version": "^2.0",
"php": "^7.1",
"phpspec/prophecy": "^1.7",
- "phpunit/php-code-coverage": "^6.0.1",
- "phpunit/php-file-iterator": "^1.4.3",
+ "phpunit/php-code-coverage": "^6.0.7",
+ "phpunit/php-file-iterator": "^2.0.1",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
- "phpunit/phpunit-mock-objects": "^6.1.1",
- "sebastian/comparator": "^2.1 || ^3.0",
+ "sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
- "sebastian/environment": "^3.1",
+ "sebastian/environment": "^4.0",
"sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0",
"sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^1.0",
+ "sebastian/resource-operations": "^2.0",
"sebastian/version": "^2.0.1"
},
+ "conflict": {
+ "phpunit/phpunit-mock-objects": "*"
+ },
"require-dev": {
"ext-pdo": "*"
},
"suggest": {
+ "ext-soap": "*",
"ext-xdebug": "*",
"phpunit/php-invoker": "^2.0"
},
@@ -4056,7 +4265,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.1-dev"
+ "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -4082,63 +4291,7 @@
"testing",
"xunit"
],
- "time": "2018-04-18 13:41:53"
- },
- {
- "name": "phpunit/phpunit-mock-objects",
- "version": "6.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157",
- "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.0.5",
- "php": "^7.1",
- "phpunit/php-text-template": "^1.2.1",
- "sebastian/exporter": "^3.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.0"
- },
- "suggest": {
- "ext-soap": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "6.1-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ],
- "time": "2018-04-11 04:50:36"
+ "time": "2019-01-15T08:19:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -4183,20 +4336,20 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04 06:30:41"
+ "time": "2017-03-04T06:30:41+00:00"
},
{
"name": "sebastian/comparator",
- "version": "3.0.0",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
- "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
"shasum": ""
},
"require": {
@@ -4247,20 +4400,20 @@
"compare",
"equality"
],
- "time": "2018-04-18 13:33:00"
+ "time": "2018-07-12T15:12:46+00:00"
},
{
"name": "sebastian/diff",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8"
+ "reference": "366541b989927187c4ca70490a35615d3fef2dce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8",
- "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
+ "reference": "366541b989927187c4ca70490a35615d3fef2dce",
"shasum": ""
},
"require": {
@@ -4303,32 +4456,32 @@
"unidiff",
"unified diff"
],
- "time": "2018-02-01 13:45:15"
+ "time": "2018-06-10T07:54:39+00:00"
},
{
"name": "sebastian/environment",
- "version": "3.1.0",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+ "reference": "4a43e9af57b4afa663077b9bc85255dbc6e8a2bd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4a43e9af57b4afa663077b9bc85255dbc6e8a2bd",
+ "reference": "4a43e9af57b4afa663077b9bc85255dbc6e8a2bd",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.1"
+ "phpunit/phpunit": "^7.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4353,7 +4506,7 @@
"environment",
"hhvm"
],
- "time": "2017-07-01 08:51:00"
+ "time": "2019-01-28T15:26:03+00:00"
},
{
"name": "sebastian/exporter",
@@ -4420,7 +4573,7 @@
"export",
"exporter"
],
- "time": "2017-04-03 13:19:02"
+ "time": "2017-04-03T13:19:02+00:00"
},
{
"name": "sebastian/global-state",
@@ -4471,7 +4624,7 @@
"keywords": [
"global state"
],
- "time": "2017-04-27 15:39:26"
+ "time": "2017-04-27T15:39:26+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -4518,7 +4671,7 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03 12:35:26"
+ "time": "2017-08-03T12:35:26+00:00"
},
{
"name": "sebastian/object-reflector",
@@ -4563,7 +4716,7 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29 09:07:27"
+ "time": "2017-03-29T09:07:27+00:00"
},
{
"name": "sebastian/recursion-context",
@@ -4616,29 +4769,29 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03 06:23:57"
+ "time": "2017-03-03T06:23:57+00:00"
},
{
"name": "sebastian/resource-operations",
- "version": "1.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+ "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+ "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
"shasum": ""
},
"require": {
- "php": ">=5.6.0"
+ "php": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4658,7 +4811,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28 20:34:47"
+ "time": "2018-10-04T04:07:39+00:00"
},
{
"name": "sebastian/version",
@@ -4701,24 +4854,25 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03 07:35:21"
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v4.0.8",
+ "version": "v4.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "d6c04c7532535b5e0b63db45b543cd60818e0fbc"
+ "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d6c04c7532535b5e0b63db45b543cd60818e0fbc",
- "reference": "d6c04c7532535b5e0b63db45b543cd60818e0fbc",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
+ "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
"shasum": ""
},
"require": {
"php": "^7.1.3",
+ "symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@@ -4730,7 +4884,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "4.2-dev"
}
},
"autoload": {
@@ -4757,20 +4911,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2018-03-19 22:35:49"
+ "time": "2019-01-03T09:07:35+00:00"
},
{
"name": "symfony/thanks",
- "version": "v1.0.7",
+ "version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/thanks.git",
- "reference": "bade4992c46ed722162694b4af8d72f84402819a"
+ "reference": "9474a631b52737c623b6aeba22f00bbc003251da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/thanks/zipball/bade4992c46ed722162694b4af8d72f84402819a",
- "reference": "bade4992c46ed722162694b4af8d72f84402819a",
+ "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da",
+ "reference": "9474a631b52737c623b6aeba22f00bbc003251da",
"shasum": ""
},
"require": {
@@ -4800,7 +4954,7 @@
}
],
"description": "Give thanks (in the form of a GitHub â) to your fellow PHP package maintainers (not limited to Symfony components)!",
- "time": "2018-03-14 21:51:39"
+ "time": "2018-08-24T14:08:13+00:00"
},
{
"name": "theseer/tokenizer",
@@ -4840,24 +4994,25 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2017-04-07 12:08:54"
+ "time": "2017-04-07T12:08:54+00:00"
},
{
"name": "webmozart/assert",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.3.3 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -4890,7 +5045,7 @@
"check",
"validate"
],
- "time": "2018-01-29 19:49:41"
+ "time": "2018-12-25T11:19:39+00:00"
}
],
"aliases": [],
diff --git a/public/css/app.css b/public/css/app.css
index 4a29ea7798f85efd328d5ea8cbcf42e4c2629b5c..03e674885f330c15e76dbb19e4ff46fe07ad911a 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,5 +1,5 @@
@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Bootstrap v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
@@ -47,18 +47,11 @@ html {
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
- -ms-overflow-style: scrollbar;
- -webkit-tap-highlight-color: transparent;
-}
-
-@-ms-viewport {
- width: device-width;
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
article,
aside,
-dialog,
figcaption,
figure,
footer,
@@ -114,6 +107,7 @@ abbr[data-original-title] {
text-decoration: underline dotted;
cursor: help;
border-bottom: 0;
+ text-decoration-skip-ink: none;
}
address {
@@ -149,10 +143,6 @@ blockquote {
margin: 0 0 1rem;
}
-dfn {
- font-style: italic;
-}
-
b,
strong {
font-weight: bolder;
@@ -182,7 +172,6 @@ a {
color: #007bff;
text-decoration: none;
background-color: transparent;
- -webkit-text-decoration-skip: objects;
}
a:hover {
@@ -209,7 +198,7 @@ pre,
code,
kbd,
samp {
- font-family: monospace, monospace;
+ font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 1em;
}
@@ -217,7 +206,6 @@ pre {
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
- -ms-overflow-style: scrollbar;
}
figure {
@@ -229,8 +217,9 @@ img {
border-style: none;
}
-svg:not(:root) {
+svg {
overflow: hidden;
+ vertical-align: middle;
}
table {
@@ -251,7 +240,7 @@ th {
label {
display: inline-block;
- margin-bottom: .5rem;
+ margin-bottom: 0.5rem;
}
button {
@@ -285,7 +274,7 @@ select {
}
button,
-html [type="button"],
+[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
@@ -351,7 +340,6 @@ progress {
-webkit-appearance: none;
}
-[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
@@ -510,7 +498,7 @@ mark,
}
.blockquote-footer::before {
- content: "\2014 \A0";
+ content: "\2014\A0";
}
.img-fluid {
@@ -541,13 +529,6 @@ mark,
color: #6c757d;
}
-code,
-kbd,
-pre,
-samp {
- font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-}
-
code {
font-size: 87.5%;
color: #e83e8c;
@@ -722,7 +703,6 @@ pre code {
.col-xl-auto {
position: relative;
width: 100%;
- min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
@@ -741,7 +721,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
- max-width: none;
+ max-width: 100%;
}
.col-1 {
@@ -977,7 +957,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
- max-width: none;
+ max-width: 100%;
}
.col-sm-1 {
@@ -1218,7 +1198,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
- max-width: none;
+ max-width: 100%;
}
.col-md-1 {
@@ -1459,7 +1439,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
- max-width: none;
+ max-width: 100%;
}
.col-lg-1 {
@@ -1700,7 +1680,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
- max-width: none;
+ max-width: 100%;
}
.col-xl-1 {
@@ -1928,7 +1908,6 @@ pre code {
.table {
width: 100%;
- max-width: 100%;
margin-bottom: 1rem;
background-color: transparent;
}
@@ -1972,6 +1951,13 @@ pre code {
border-bottom-width: 2px;
}
+.table-borderless th,
+.table-borderless td,
+.table-borderless thead th,
+.table-borderless tbody + tbody {
+ border: 0;
+}
+
.table-striped tbody tr:nth-of-type(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
@@ -1986,6 +1972,13 @@ pre code {
background-color: #b8daff;
}
+.table-primary th,
+.table-primary td,
+.table-primary thead th,
+.table-primary tbody + tbody {
+ border-color: #7abaff;
+}
+
.table-hover .table-primary:hover {
background-color: #9fcdff;
}
@@ -2001,6 +1994,13 @@ pre code {
background-color: #d6d8db;
}
+.table-secondary th,
+.table-secondary td,
+.table-secondary thead th,
+.table-secondary tbody + tbody {
+ border-color: #b3b7bb;
+}
+
.table-hover .table-secondary:hover {
background-color: #c8cbcf;
}
@@ -2016,6 +2016,13 @@ pre code {
background-color: #c3e6cb;
}
+.table-success th,
+.table-success td,
+.table-success thead th,
+.table-success tbody + tbody {
+ border-color: #8fd19e;
+}
+
.table-hover .table-success:hover {
background-color: #b1dfbb;
}
@@ -2031,6 +2038,13 @@ pre code {
background-color: #bee5eb;
}
+.table-info th,
+.table-info td,
+.table-info thead th,
+.table-info tbody + tbody {
+ border-color: #86cfda;
+}
+
.table-hover .table-info:hover {
background-color: #abdde5;
}
@@ -2046,6 +2060,13 @@ pre code {
background-color: #ffeeba;
}
+.table-warning th,
+.table-warning td,
+.table-warning thead th,
+.table-warning tbody + tbody {
+ border-color: #ffdf7e;
+}
+
.table-hover .table-warning:hover {
background-color: #ffe8a1;
}
@@ -2061,6 +2082,13 @@ pre code {
background-color: #f5c6cb;
}
+.table-danger th,
+.table-danger td,
+.table-danger thead th,
+.table-danger tbody + tbody {
+ border-color: #ed969e;
+}
+
.table-hover .table-danger:hover {
background-color: #f1b0b7;
}
@@ -2076,6 +2104,13 @@ pre code {
background-color: #fdfdfe;
}
+.table-light th,
+.table-light td,
+.table-light thead th,
+.table-light tbody + tbody {
+ border-color: #fbfcfc;
+}
+
.table-hover .table-light:hover {
background-color: #ececf6;
}
@@ -2091,6 +2126,13 @@ pre code {
background-color: #c6c8ca;
}
+.table-dark th,
+.table-dark td,
+.table-dark thead th,
+.table-dark tbody + tbody {
+ border-color: #95999c;
+}
+
.table-hover .table-dark:hover {
background-color: #b9bbbe;
}
@@ -2116,7 +2158,7 @@ pre code {
}
.table .thead-dark th {
- color: #f5f8fa;
+ color: #fff;
background-color: #212529;
border-color: #32383e;
}
@@ -2128,7 +2170,7 @@ pre code {
}
.table-dark {
- color: #f5f8fa;
+ color: #fff;
background-color: #212529;
}
@@ -2221,8 +2263,10 @@ pre code {
.form-control {
display: block;
width: 100%;
+ height: calc(2.19rem + 2px);
padding: 0.375rem 0.75rem;
font-size: 0.9rem;
+ font-weight: 400;
line-height: 1.6;
color: #495057;
background-color: #fff;
@@ -2235,6 +2279,13 @@ pre code {
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
}
+@media screen and (prefers-reduced-motion: reduce) {
+ .form-control {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
.form-control::-ms-expand {
background-color: transparent;
border: 0;
@@ -2254,11 +2305,6 @@ pre code {
opacity: 1;
}
-.form-control:-ms-input-placeholder {
- color: #6c757d;
- opacity: 1;
-}
-
.form-control::-ms-input-placeholder {
color: #6c757d;
opacity: 1;
@@ -2275,10 +2321,6 @@ pre code {
opacity: 1;
}
-select.form-control:not([size]):not([multiple]) {
- height: calc(2.19rem + 2px);
-}
-
select.form-control:focus::-ms-value {
color: #495057;
background-color: #fff;
@@ -2319,67 +2361,41 @@ select.form-control:focus::-ms-value {
padding-bottom: 0.375rem;
margin-bottom: 0;
line-height: 1.6;
+ color: #212529;
background-color: transparent;
border: solid transparent;
border-width: 1px 0;
}
.form-control-plaintext.form-control-sm,
-.input-group-sm > .form-control-plaintext.form-control,
-.input-group-sm > .input-group-prepend > .form-control-plaintext.input-group-text,
-.input-group-sm > .input-group-append > .form-control-plaintext.input-group-text,
-.input-group-sm > .input-group-prepend > .form-control-plaintext.btn,
-.input-group-sm > .input-group-append > .form-control-plaintext.btn,
-.form-control-plaintext.form-control-lg,
-.input-group-lg > .form-control-plaintext.form-control,
-.input-group-lg > .input-group-prepend > .form-control-plaintext.input-group-text,
-.input-group-lg > .input-group-append > .form-control-plaintext.input-group-text,
-.input-group-lg > .input-group-prepend > .form-control-plaintext.btn,
-.input-group-lg > .input-group-append > .form-control-plaintext.btn {
+.form-control-plaintext.form-control-lg {
padding-right: 0;
padding-left: 0;
}
-.form-control-sm,
-.input-group-sm > .form-control,
-.input-group-sm > .input-group-prepend > .input-group-text,
-.input-group-sm > .input-group-append > .input-group-text,
-.input-group-sm > .input-group-prepend > .btn,
-.input-group-sm > .input-group-append > .btn {
+.form-control-sm {
+ height: calc(1.68125rem + 2px);
padding: 0.25rem 0.5rem;
font-size: 0.7875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
-select.form-control-sm:not([size]):not([multiple]),
-.input-group-sm > select.form-control:not([size]):not([multiple]),
-.input-group-sm > .input-group-prepend > select.input-group-text:not([size]):not([multiple]),
-.input-group-sm > .input-group-append > select.input-group-text:not([size]):not([multiple]),
-.input-group-sm > .input-group-prepend > select.btn:not([size]):not([multiple]),
-.input-group-sm > .input-group-append > select.btn:not([size]):not([multiple]) {
- height: calc(1.68125rem + 2px);
-}
-
-.form-control-lg,
-.input-group-lg > .form-control,
-.input-group-lg > .input-group-prepend > .input-group-text,
-.input-group-lg > .input-group-append > .input-group-text,
-.input-group-lg > .input-group-prepend > .btn,
-.input-group-lg > .input-group-append > .btn {
+.form-control-lg {
+ height: calc(2.6875rem + 2px);
padding: 0.5rem 1rem;
font-size: 1.125rem;
line-height: 1.5;
border-radius: 0.3rem;
}
-select.form-control-lg:not([size]):not([multiple]),
-.input-group-lg > select.form-control:not([size]):not([multiple]),
-.input-group-lg > .input-group-prepend > select.input-group-text:not([size]):not([multiple]),
-.input-group-lg > .input-group-append > select.input-group-text:not([size]):not([multiple]),
-.input-group-lg > .input-group-prepend > select.btn:not([size]):not([multiple]),
-.input-group-lg > .input-group-append > select.btn:not([size]):not([multiple]) {
- height: calc(2.6875rem + 2px);
+select.form-control[size],
+select.form-control[multiple] {
+ height: auto;
+}
+
+textarea.form-control {
+ height: auto;
}
.form-group {
@@ -2459,28 +2475,27 @@ select.form-control-lg:not([size]):not([multiple]),
z-index: 5;
display: none;
max-width: 100%;
- padding: .5rem;
+ padding: 0.25rem 0.5rem;
margin-top: .1rem;
- font-size: .875rem;
- line-height: 1;
+ font-size: 0.7875rem;
+ line-height: 1.6;
color: #fff;
- background-color: rgba(40, 167, 69, 0.8);
- border-radius: .2rem;
+ background-color: rgba(40, 167, 69, 0.9);
+ border-radius: 0.25rem;
}
.was-validated .form-control:valid,
-.form-control.is-valid,
-.was-validated
-.custom-select:valid,
-.custom-select.is-valid {
+.form-control.is-valid {
border-color: #28a745;
+ padding-right: 2.19rem;
+ background-repeat: no-repeat;
+ background-position: center right calc(2.19rem / 4);
+ background-size: calc(2.19rem / 2) calc(2.19rem / 2);
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
}
.was-validated .form-control:valid:focus,
-.form-control.is-valid:focus,
-.was-validated
-.custom-select:valid:focus,
-.custom-select.is-valid:focus {
+.form-control.is-valid:focus {
border-color: #28a745;
-webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
@@ -2489,16 +2504,44 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .form-control:valid ~ .valid-feedback,
.was-validated .form-control:valid ~ .valid-tooltip,
.form-control.is-valid ~ .valid-feedback,
-.form-control.is-valid ~ .valid-tooltip,
-.was-validated
-.custom-select:valid ~ .valid-feedback,
-.was-validated
-.custom-select:valid ~ .valid-tooltip,
+.form-control.is-valid ~ .valid-tooltip {
+ display: block;
+}
+
+.was-validated textarea.form-control:valid,
+textarea.form-control.is-valid {
+ padding-right: 2.19rem;
+ background-position: top calc(2.19rem / 4) right calc(2.19rem / 4);
+}
+
+.was-validated .custom-select:valid,
+.custom-select.is-valid {
+ border-color: #28a745;
+ padding-right: 3.3925rem;
+ background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") no-repeat center right 1.75rem/1.095rem 1.095rem;
+}
+
+.was-validated .custom-select:valid:focus,
+.custom-select.is-valid:focus {
+ border-color: #28a745;
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
+}
+
+.was-validated .custom-select:valid ~ .valid-feedback,
+.was-validated .custom-select:valid ~ .valid-tooltip,
.custom-select.is-valid ~ .valid-feedback,
.custom-select.is-valid ~ .valid-tooltip {
display: block;
}
+.was-validated .form-control-file:valid ~ .valid-feedback,
+.was-validated .form-control-file:valid ~ .valid-tooltip,
+.form-control-file.is-valid ~ .valid-feedback,
+.form-control-file.is-valid ~ .valid-tooltip {
+ display: block;
+}
+
.was-validated .form-check-input:valid ~ .form-check-label,
.form-check-input.is-valid ~ .form-check-label {
color: #28a745;
@@ -2518,7 +2561,7 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-control-input:valid ~ .custom-control-label::before,
.custom-control-input.is-valid ~ .custom-control-label::before {
- background-color: #71dd8a;
+ border-color: #28a745;
}
.was-validated .custom-control-input:valid ~ .valid-feedback,
@@ -2530,23 +2573,24 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before,
.custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ border-color: #34ce57;
background-color: #34ce57;
}
.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before,
.custom-control-input.is-valid:focus ~ .custom-control-label::before {
- -webkit-box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
- box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
}
-.was-validated .custom-file-input:valid ~ .custom-file-label,
-.custom-file-input.is-valid ~ .custom-file-label {
+.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before,
+.custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {
border-color: #28a745;
}
-.was-validated .custom-file-input:valid ~ .custom-file-label::before,
-.custom-file-input.is-valid ~ .custom-file-label::before {
- border-color: inherit;
+.was-validated .custom-file-input:valid ~ .custom-file-label,
+.custom-file-input.is-valid ~ .custom-file-label {
+ border-color: #28a745;
}
.was-validated .custom-file-input:valid ~ .valid-feedback,
@@ -2558,6 +2602,7 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-file-input:valid:focus ~ .custom-file-label,
.custom-file-input.is-valid:focus ~ .custom-file-label {
+ border-color: #28a745;
-webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
}
@@ -2576,28 +2621,27 @@ select.form-control-lg:not([size]):not([multiple]),
z-index: 5;
display: none;
max-width: 100%;
- padding: .5rem;
+ padding: 0.25rem 0.5rem;
margin-top: .1rem;
- font-size: .875rem;
- line-height: 1;
+ font-size: 0.7875rem;
+ line-height: 1.6;
color: #fff;
- background-color: rgba(220, 53, 69, 0.8);
- border-radius: .2rem;
+ background-color: rgba(220, 53, 69, 0.9);
+ border-radius: 0.25rem;
}
.was-validated .form-control:invalid,
-.form-control.is-invalid,
-.was-validated
-.custom-select:invalid,
-.custom-select.is-invalid {
+.form-control.is-invalid {
border-color: #dc3545;
+ padding-right: 2.19rem;
+ background-repeat: no-repeat;
+ background-position: center right calc(2.19rem / 4);
+ background-size: calc(2.19rem / 2) calc(2.19rem / 2);
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23dc3545' viewBox='-2 -2 7 7'%3e%3cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3e%3ccircle r='.5'/%3e%3ccircle cx='3' r='.5'/%3e%3ccircle cy='3' r='.5'/%3e%3ccircle cx='3' cy='3' r='.5'/%3e%3c/svg%3E");
}
.was-validated .form-control:invalid:focus,
-.form-control.is-invalid:focus,
-.was-validated
-.custom-select:invalid:focus,
-.custom-select.is-invalid:focus {
+.form-control.is-invalid:focus {
border-color: #dc3545;
-webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
@@ -2606,16 +2650,44 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .form-control:invalid ~ .invalid-feedback,
.was-validated .form-control:invalid ~ .invalid-tooltip,
.form-control.is-invalid ~ .invalid-feedback,
-.form-control.is-invalid ~ .invalid-tooltip,
-.was-validated
-.custom-select:invalid ~ .invalid-feedback,
-.was-validated
-.custom-select:invalid ~ .invalid-tooltip,
+.form-control.is-invalid ~ .invalid-tooltip {
+ display: block;
+}
+
+.was-validated textarea.form-control:invalid,
+textarea.form-control.is-invalid {
+ padding-right: 2.19rem;
+ background-position: top calc(2.19rem / 4) right calc(2.19rem / 4);
+}
+
+.was-validated .custom-select:invalid,
+.custom-select.is-invalid {
+ border-color: #dc3545;
+ padding-right: 3.3925rem;
+ background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23dc3545' viewBox='-2 -2 7 7'%3e%3cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3e%3ccircle r='.5'/%3e%3ccircle cx='3' r='.5'/%3e%3ccircle cy='3' r='.5'/%3e%3ccircle cx='3' cy='3' r='.5'/%3e%3c/svg%3E") no-repeat center right 1.75rem/1.095rem 1.095rem;
+}
+
+.was-validated .custom-select:invalid:focus,
+.custom-select.is-invalid:focus {
+ border-color: #dc3545;
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+}
+
+.was-validated .custom-select:invalid ~ .invalid-feedback,
+.was-validated .custom-select:invalid ~ .invalid-tooltip,
.custom-select.is-invalid ~ .invalid-feedback,
.custom-select.is-invalid ~ .invalid-tooltip {
display: block;
}
+.was-validated .form-control-file:invalid ~ .invalid-feedback,
+.was-validated .form-control-file:invalid ~ .invalid-tooltip,
+.form-control-file.is-invalid ~ .invalid-feedback,
+.form-control-file.is-invalid ~ .invalid-tooltip {
+ display: block;
+}
+
.was-validated .form-check-input:invalid ~ .form-check-label,
.form-check-input.is-invalid ~ .form-check-label {
color: #dc3545;
@@ -2635,7 +2707,7 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-control-input:invalid ~ .custom-control-label::before,
.custom-control-input.is-invalid ~ .custom-control-label::before {
- background-color: #efa2a9;
+ border-color: #dc3545;
}
.was-validated .custom-control-input:invalid ~ .invalid-feedback,
@@ -2647,23 +2719,24 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before,
.custom-control-input.is-invalid:checked ~ .custom-control-label::before {
+ border-color: #e4606d;
background-color: #e4606d;
}
.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before,
.custom-control-input.is-invalid:focus ~ .custom-control-label::before {
- -webkit-box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
- box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
-.was-validated .custom-file-input:invalid ~ .custom-file-label,
-.custom-file-input.is-invalid ~ .custom-file-label {
+.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before,
+.custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {
border-color: #dc3545;
}
-.was-validated .custom-file-input:invalid ~ .custom-file-label::before,
-.custom-file-input.is-invalid ~ .custom-file-label::before {
- border-color: inherit;
+.was-validated .custom-file-input:invalid ~ .custom-file-label,
+.custom-file-input.is-invalid ~ .custom-file-label {
+ border-color: #dc3545;
}
.was-validated .custom-file-input:invalid ~ .invalid-feedback,
@@ -2675,6 +2748,7 @@ select.form-control-lg:not([size]):not([multiple]),
.was-validated .custom-file-input:invalid:focus ~ .custom-file-label,
.custom-file-input.is-invalid:focus ~ .custom-file-label {
+ border-color: #dc3545;
-webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
@@ -2737,7 +2811,8 @@ select.form-control-lg:not([size]):not([multiple]),
display: inline-block;
}
- .form-inline .input-group {
+ .form-inline .input-group,
+ .form-inline .custom-select {
width: auto;
}
@@ -2779,13 +2854,14 @@ select.form-control-lg:not([size]):not([multiple]),
.btn {
display: inline-block;
font-weight: 400;
+ color: #212529;
text-align: center;
- white-space: nowrap;
vertical-align: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ background-color: transparent;
border: 1px solid transparent;
padding: 0.375rem 0.75rem;
font-size: 0.9rem;
@@ -2797,8 +2873,15 @@ select.form-control-lg:not([size]):not([multiple]),
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
}
-.btn:hover,
-.btn:focus {
+@media screen and (prefers-reduced-motion: reduce) {
+ .btn {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
+.btn:hover {
+ color: #212529;
text-decoration: none;
}
@@ -2818,11 +2901,6 @@ select.form-control-lg:not([size]):not([multiple]),
cursor: pointer;
}
-.btn:not(:disabled):not(.disabled):active,
-.btn:not(:disabled):not(.disabled).active {
- background-image: none;
-}
-
a.btn.disabled,
fieldset:disabled a.btn {
pointer-events: none;
@@ -2842,8 +2920,8 @@ fieldset:disabled a.btn {
.btn-primary:focus,
.btn-primary.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
}
.btn-primary.disabled,
@@ -2864,8 +2942,8 @@ fieldset:disabled a.btn {
.btn-primary:not(:disabled):not(.disabled):active:focus,
.btn-primary:not(:disabled):not(.disabled).active:focus,
.show > .btn-primary.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
}
.btn-secondary {
@@ -2882,8 +2960,8 @@ fieldset:disabled a.btn {
.btn-secondary:focus,
.btn-secondary.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
}
.btn-secondary.disabled,
@@ -2904,8 +2982,8 @@ fieldset:disabled a.btn {
.btn-secondary:not(:disabled):not(.disabled):active:focus,
.btn-secondary:not(:disabled):not(.disabled).active:focus,
.show > .btn-secondary.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
}
.btn-success {
@@ -2922,8 +3000,8 @@ fieldset:disabled a.btn {
.btn-success:focus,
.btn-success.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
}
.btn-success.disabled,
@@ -2944,8 +3022,8 @@ fieldset:disabled a.btn {
.btn-success:not(:disabled):not(.disabled):active:focus,
.btn-success:not(:disabled):not(.disabled).active:focus,
.show > .btn-success.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
}
.btn-info {
@@ -2962,8 +3040,8 @@ fieldset:disabled a.btn {
.btn-info:focus,
.btn-info.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
}
.btn-info.disabled,
@@ -2984,8 +3062,8 @@ fieldset:disabled a.btn {
.btn-info:not(:disabled):not(.disabled):active:focus,
.btn-info:not(:disabled):not(.disabled).active:focus,
.show > .btn-info.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
}
.btn-warning {
@@ -3002,8 +3080,8 @@ fieldset:disabled a.btn {
.btn-warning:focus,
.btn-warning.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
}
.btn-warning.disabled,
@@ -3024,8 +3102,8 @@ fieldset:disabled a.btn {
.btn-warning:not(:disabled):not(.disabled):active:focus,
.btn-warning:not(:disabled):not(.disabled).active:focus,
.show > .btn-warning.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
}
.btn-danger {
@@ -3042,8 +3120,8 @@ fieldset:disabled a.btn {
.btn-danger:focus,
.btn-danger.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
}
.btn-danger.disabled,
@@ -3064,8 +3142,8 @@ fieldset:disabled a.btn {
.btn-danger:not(:disabled):not(.disabled):active:focus,
.btn-danger:not(:disabled):not(.disabled).active:focus,
.show > .btn-danger.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
}
.btn-light {
@@ -3082,8 +3160,8 @@ fieldset:disabled a.btn {
.btn-light:focus,
.btn-light.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
}
.btn-light.disabled,
@@ -3104,8 +3182,8 @@ fieldset:disabled a.btn {
.btn-light:not(:disabled):not(.disabled):active:focus,
.btn-light:not(:disabled):not(.disabled).active:focus,
.show > .btn-light.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
}
.btn-dark {
@@ -3122,8 +3200,8 @@ fieldset:disabled a.btn {
.btn-dark:focus,
.btn-dark.focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
}
.btn-dark.disabled,
@@ -3144,14 +3222,12 @@ fieldset:disabled a.btn {
.btn-dark:not(:disabled):not(.disabled):active:focus,
.btn-dark:not(:disabled):not(.disabled).active:focus,
.show > .btn-dark.dropdown-toggle:focus {
- -webkit-box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
}
.btn-outline-primary {
color: #007bff;
- background-color: transparent;
- background-image: none;
border-color: #007bff;
}
@@ -3190,8 +3266,6 @@ fieldset:disabled a.btn {
.btn-outline-secondary {
color: #6c757d;
- background-color: transparent;
- background-image: none;
border-color: #6c757d;
}
@@ -3230,8 +3304,6 @@ fieldset:disabled a.btn {
.btn-outline-success {
color: #28a745;
- background-color: transparent;
- background-image: none;
border-color: #28a745;
}
@@ -3270,8 +3342,6 @@ fieldset:disabled a.btn {
.btn-outline-info {
color: #17a2b8;
- background-color: transparent;
- background-image: none;
border-color: #17a2b8;
}
@@ -3310,8 +3380,6 @@ fieldset:disabled a.btn {
.btn-outline-warning {
color: #ffc107;
- background-color: transparent;
- background-image: none;
border-color: #ffc107;
}
@@ -3350,8 +3418,6 @@ fieldset:disabled a.btn {
.btn-outline-danger {
color: #dc3545;
- background-color: transparent;
- background-image: none;
border-color: #dc3545;
}
@@ -3390,8 +3456,6 @@ fieldset:disabled a.btn {
.btn-outline-light {
color: #f8f9fa;
- background-color: transparent;
- background-image: none;
border-color: #f8f9fa;
}
@@ -3430,8 +3494,6 @@ fieldset:disabled a.btn {
.btn-outline-dark {
color: #343a40;
- background-color: transparent;
- background-image: none;
border-color: #343a40;
}
@@ -3471,20 +3533,16 @@ fieldset:disabled a.btn {
.btn-link {
font-weight: 400;
color: #007bff;
- background-color: transparent;
}
.btn-link:hover {
color: #0056b3;
text-decoration: underline;
- background-color: transparent;
- border-color: transparent;
}
.btn-link:focus,
.btn-link.focus {
text-decoration: underline;
- border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -3492,6 +3550,7 @@ fieldset:disabled a.btn {
.btn-link:disabled,
.btn-link.disabled {
color: #6c757d;
+ pointer-events: none;
}
.btn-lg,
@@ -3526,29 +3585,23 @@ input[type="button"].btn-block {
}
.fade {
- opacity: 0;
-webkit-transition: opacity 0.15s linear;
transition: opacity 0.15s linear;
}
-.fade.show {
- opacity: 1;
-}
-
-.collapse {
- display: none;
-}
-
-.collapse.show {
- display: block;
+@media screen and (prefers-reduced-motion: reduce) {
+ .fade {
+ -webkit-transition: none;
+ transition: none;
+ }
}
-tr.collapse.show {
- display: table-row;
+.fade:not(.show) {
+ opacity: 0;
}
-tbody.collapse.show {
- display: table-row-group;
+.collapse:not(.show) {
+ display: none;
}
.collapsing {
@@ -3559,15 +3612,22 @@ tbody.collapse.show {
transition: height 0.35s ease;
}
+@media screen and (prefers-reduced-motion: reduce) {
+ .collapsing {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
.dropup,
-.dropdown {
+.dropright,
+.dropdown,
+.dropleft {
position: relative;
}
.dropdown-toggle::after {
display: inline-block;
- width: 0;
- height: 0;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
@@ -3601,41 +3661,109 @@ tbody.collapse.show {
border-radius: 0.25rem;
}
-.dropup .dropdown-menu {
- margin-top: 0;
- margin-bottom: 0.125rem;
-}
-
-.dropup .dropdown-toggle::after {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 0.255em;
- vertical-align: 0.255em;
- content: "";
- border-top: 0;
- border-right: 0.3em solid transparent;
- border-bottom: 0.3em solid;
- border-left: 0.3em solid transparent;
+.dropdown-menu-right {
+ right: 0;
+ left: auto;
}
-.dropup .dropdown-toggle:empty::after {
- margin-left: 0;
+@media (min-width: 576px) {
+ .dropdown-menu-sm-right {
+ right: 0;
+ left: auto;
+ }
}
-.dropright .dropdown-menu {
- margin-top: 0;
- margin-left: 0.125rem;
+@media (min-width: 768px) {
+ .dropdown-menu-md-right {
+ right: 0;
+ left: auto;
+ }
}
-.dropright .dropdown-toggle::after {
+@media (min-width: 992px) {
+ .dropdown-menu-lg-right {
+ right: 0;
+ left: auto;
+ }
+}
+
+@media (min-width: 1200px) {
+ .dropdown-menu-xl-right {
+ right: 0;
+ left: auto;
+ }
+}
+
+.dropdown-menu-left {
+ right: auto;
+ left: 0;
+}
+
+@media (min-width: 576px) {
+ .dropdown-menu-sm-left {
+ right: auto;
+ left: 0;
+ }
+}
+
+@media (min-width: 768px) {
+ .dropdown-menu-md-left {
+ right: auto;
+ left: 0;
+ }
+}
+
+@media (min-width: 992px) {
+ .dropdown-menu-lg-left {
+ right: auto;
+ left: 0;
+ }
+}
+
+@media (min-width: 1200px) {
+ .dropdown-menu-xl-left {
+ right: auto;
+ left: 0;
+ }
+}
+
+.dropup .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ margin-top: 0;
+ margin-bottom: 0.125rem;
+}
+
+.dropup .dropdown-toggle::after {
+ display: inline-block;
+ margin-left: 0.255em;
+ vertical-align: 0.255em;
+ content: "";
+ border-top: 0;
+ border-right: 0.3em solid transparent;
+ border-bottom: 0.3em solid;
+ border-left: 0.3em solid transparent;
+}
+
+.dropup .dropdown-toggle:empty::after {
+ margin-left: 0;
+}
+
+.dropright .dropdown-menu {
+ top: 0;
+ right: auto;
+ left: 100%;
+ margin-top: 0;
+ margin-left: 0.125rem;
+}
+
+.dropright .dropdown-toggle::after {
display: inline-block;
- width: 0;
- height: 0;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
border-top: 0.3em solid transparent;
+ border-right: 0;
border-bottom: 0.3em solid transparent;
border-left: 0.3em solid;
}
@@ -3649,14 +3777,15 @@ tbody.collapse.show {
}
.dropleft .dropdown-menu {
+ top: 0;
+ right: 100%;
+ left: auto;
margin-top: 0;
margin-right: 0.125rem;
}
.dropleft .dropdown-toggle::after {
display: inline-block;
- width: 0;
- height: 0;
margin-left: 0.255em;
vertical-align: 0.255em;
content: "";
@@ -3668,8 +3797,6 @@ tbody.collapse.show {
.dropleft .dropdown-toggle::before {
display: inline-block;
- width: 0;
- height: 0;
margin-right: 0.255em;
vertical-align: 0.255em;
content: "";
@@ -3686,6 +3813,14 @@ tbody.collapse.show {
vertical-align: 0;
}
+.dropdown-menu[x-placement^="top"],
+.dropdown-menu[x-placement^="right"],
+.dropdown-menu[x-placement^="bottom"],
+.dropdown-menu[x-placement^="left"] {
+ right: auto;
+ bottom: auto;
+}
+
.dropdown-divider {
height: 0;
margin: 0.5rem 0;
@@ -3706,6 +3841,16 @@ tbody.collapse.show {
border: 0;
}
+.dropdown-item:first-child {
+ border-top-left-radius: calc(0.25rem - 1px);
+ border-top-right-radius: calc(0.25rem - 1px);
+}
+
+.dropdown-item:last-child {
+ border-bottom-right-radius: calc(0.25rem - 1px);
+ border-bottom-left-radius: calc(0.25rem - 1px);
+}
+
.dropdown-item:hover,
.dropdown-item:focus {
color: #16181b;
@@ -3723,6 +3868,7 @@ tbody.collapse.show {
.dropdown-item.disabled,
.dropdown-item:disabled {
color: #6c757d;
+ pointer-events: none;
background-color: transparent;
}
@@ -3739,6 +3885,12 @@ tbody.collapse.show {
white-space: nowrap;
}
+.dropdown-item-text {
+ display: block;
+ padding: 0.25rem 1.5rem;
+ color: #212529;
+}
+
.btn-group,
.btn-group-vertical {
position: relative;
@@ -3751,9 +3903,9 @@ tbody.collapse.show {
.btn-group > .btn,
.btn-group-vertical > .btn {
position: relative;
- -webkit-box-flex: 0;
- -ms-flex: 0 1 auto;
- flex: 0 1 auto;
+ -webkit-box-flex: 1;
+ -ms-flex: 1 1 auto;
+ flex: 1 1 auto;
}
.btn-group > .btn:hover,
@@ -3770,17 +3922,6 @@ tbody.collapse.show {
z-index: 1;
}
-.btn-group .btn + .btn,
-.btn-group .btn + .btn-group,
-.btn-group .btn-group + .btn,
-.btn-group .btn-group + .btn-group,
-.btn-group-vertical .btn + .btn,
-.btn-group-vertical .btn + .btn-group,
-.btn-group-vertical .btn-group + .btn,
-.btn-group-vertical .btn-group + .btn-group {
- margin-left: -1px;
-}
-
.btn-toolbar {
display: -webkit-box;
display: -ms-flexbox;
@@ -3796,8 +3937,9 @@ tbody.collapse.show {
width: auto;
}
-.btn-group > .btn:first-child {
- margin-left: 0;
+.btn-group > .btn:not(:first-child),
+.btn-group > .btn-group:not(:first-child) {
+ margin-left: -1px;
}
.btn-group > .btn:not(:last-child):not(.dropdown-toggle),
@@ -3817,10 +3959,16 @@ tbody.collapse.show {
padding-left: 0.5625rem;
}
-.dropdown-toggle-split::after {
+.dropdown-toggle-split::after,
+.dropup .dropdown-toggle-split::after,
+.dropright .dropdown-toggle-split::after {
margin-left: 0;
}
+.dropleft .dropdown-toggle-split::before {
+ margin-right: 0;
+}
+
.btn-sm + .dropdown-toggle-split,
.btn-group-sm > .btn + .dropdown-toggle-split {
padding-right: 0.375rem;
@@ -3846,17 +3994,14 @@ tbody.collapse.show {
justify-content: center;
}
-.btn-group-vertical .btn,
-.btn-group-vertical .btn-group {
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group {
width: 100%;
}
-.btn-group-vertical > .btn + .btn,
-.btn-group-vertical > .btn + .btn-group,
-.btn-group-vertical > .btn-group + .btn,
-.btn-group-vertical > .btn-group + .btn-group {
+.btn-group-vertical > .btn:not(:first-child),
+.btn-group-vertical > .btn-group:not(:first-child) {
margin-top: -1px;
- margin-left: 0;
}
.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),
@@ -3899,6 +4044,7 @@ tbody.collapse.show {
}
.input-group > .form-control,
+.input-group > .form-control-plaintext,
.input-group > .custom-select,
.input-group > .custom-file {
position: relative;
@@ -3909,15 +4055,12 @@ tbody.collapse.show {
margin-bottom: 0;
}
-.input-group > .form-control:focus,
-.input-group > .custom-select:focus,
-.input-group > .custom-file:focus {
- z-index: 3;
-}
-
.input-group > .form-control + .form-control,
.input-group > .form-control + .custom-select,
.input-group > .form-control + .custom-file,
+.input-group > .form-control-plaintext + .form-control,
+.input-group > .form-control-plaintext + .custom-select,
+.input-group > .form-control-plaintext + .custom-file,
.input-group > .custom-select + .form-control,
.input-group > .custom-select + .custom-select,
.input-group > .custom-select + .custom-file,
@@ -3927,6 +4070,16 @@ tbody.collapse.show {
margin-left: -1px;
}
+.input-group > .form-control:focus,
+.input-group > .custom-select:focus,
+.input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {
+ z-index: 3;
+}
+
+.input-group > .custom-file .custom-file-input:focus {
+ z-index: 4;
+}
+
.input-group > .form-control:not(:last-child),
.input-group > .custom-select:not(:last-child) {
border-top-right-radius: 0;
@@ -3949,13 +4102,12 @@ tbody.collapse.show {
}
.input-group > .custom-file:not(:last-child) .custom-file-label,
-.input-group > .custom-file:not(:last-child) .custom-file-label::before {
+.input-group > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
-.input-group > .custom-file:not(:first-child) .custom-file-label,
-.input-group > .custom-file:not(:first-child) .custom-file-label::before {
+.input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
@@ -3973,6 +4125,11 @@ tbody.collapse.show {
z-index: 2;
}
+.input-group-prepend .btn:focus,
+.input-group-append .btn:focus {
+ z-index: 3;
+}
+
.input-group-prepend .btn + .btn,
.input-group-prepend .btn + .input-group-text,
.input-group-prepend .input-group-text + .input-group-text,
@@ -4017,6 +4174,45 @@ tbody.collapse.show {
margin-top: 0;
}
+.input-group-lg > .form-control:not(textarea),
+.input-group-lg > .custom-select {
+ height: calc(2.6875rem + 2px);
+}
+
+.input-group-lg > .form-control,
+.input-group-lg > .custom-select,
+.input-group-lg > .input-group-prepend > .input-group-text,
+.input-group-lg > .input-group-append > .input-group-text,
+.input-group-lg > .input-group-prepend > .btn,
+.input-group-lg > .input-group-append > .btn {
+ padding: 0.5rem 1rem;
+ font-size: 1.125rem;
+ line-height: 1.5;
+ border-radius: 0.3rem;
+}
+
+.input-group-sm > .form-control:not(textarea),
+.input-group-sm > .custom-select {
+ height: calc(1.68125rem + 2px);
+}
+
+.input-group-sm > .form-control,
+.input-group-sm > .custom-select,
+.input-group-sm > .input-group-prepend > .input-group-text,
+.input-group-sm > .input-group-append > .input-group-text,
+.input-group-sm > .input-group-prepend > .btn,
+.input-group-sm > .input-group-append > .btn {
+ padding: 0.25rem 0.5rem;
+ font-size: 0.7875rem;
+ line-height: 1.5;
+ border-radius: 0.2rem;
+}
+
+.input-group-lg > .custom-select,
+.input-group-sm > .custom-select {
+ padding-right: 1.75rem;
+}
+
.input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text,
.input-group > .input-group-append:not(:last-child) > .btn,
@@ -4040,7 +4236,7 @@ tbody.collapse.show {
.custom-control {
position: relative;
display: block;
- min-height: 1.6rem;
+ min-height: 1.44rem;
padding-left: 1.5rem;
}
@@ -4059,17 +4255,23 @@ tbody.collapse.show {
.custom-control-input:checked ~ .custom-control-label::before {
color: #fff;
+ border-color: #007bff;
background-color: #007bff;
}
.custom-control-input:focus ~ .custom-control-label::before {
- -webkit-box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
- box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
+ border-color: #80bdff;
}
-.custom-control-input:active ~ .custom-control-label::before {
+.custom-control-input:not(:disabled):active ~ .custom-control-label::before {
color: #fff;
background-color: #b3d7ff;
+ border-color: #b3d7ff;
}
.custom-control-input:disabled ~ .custom-control-label {
@@ -4081,29 +4283,28 @@ tbody.collapse.show {
}
.custom-control-label {
+ position: relative;
margin-bottom: 0;
+ vertical-align: top;
}
.custom-control-label::before {
position: absolute;
- top: 0.3rem;
- left: 0;
+ top: 0.22rem;
+ left: -1.5rem;
display: block;
width: 1rem;
height: 1rem;
pointer-events: none;
content: "";
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- background-color: #dee2e6;
+ background-color: #fff;
+ border: #adb5bd solid 1px;
}
.custom-control-label::after {
position: absolute;
- top: 0.3rem;
- left: 0;
+ top: 0.22rem;
+ left: -1.5rem;
display: block;
width: 1rem;
height: 1rem;
@@ -4117,20 +4318,17 @@ tbody.collapse.show {
border-radius: 0.25rem;
}
-.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
- background-color: #007bff;
-}
-
.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3e%3c/svg%3e");
}
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
+ border-color: #007bff;
background-color: #007bff;
}
.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e");
}
.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {
@@ -4145,28 +4343,66 @@ tbody.collapse.show {
border-radius: 50%;
}
-.custom-radio .custom-control-input:checked ~ .custom-control-label::before {
- background-color: #007bff;
-}
-
.custom-radio .custom-control-input:checked ~ .custom-control-label::after {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e");
}
.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {
background-color: rgba(0, 123, 255, 0.5);
}
+.custom-switch {
+ padding-left: 2.25rem;
+}
+
+.custom-switch .custom-control-label::before {
+ left: -2.25rem;
+ width: 1.75rem;
+ pointer-events: all;
+ border-radius: 0.5rem;
+}
+
+.custom-switch .custom-control-label::after {
+ top: calc(0.22rem + 2px);
+ left: calc(-2.25rem + 2px);
+ width: calc(1rem - 4px);
+ height: calc(1rem - 4px);
+ background-color: #adb5bd;
+ border-radius: 0.5rem;
+ -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+ transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .custom-switch .custom-control-label::after {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
+.custom-switch .custom-control-input:checked ~ .custom-control-label::after {
+ background-color: #fff;
+ -webkit-transform: translateX(0.75rem);
+ transform: translateX(0.75rem);
+}
+
+.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {
+ background-color: rgba(0, 123, 255, 0.5);
+}
+
.custom-select {
display: inline-block;
width: 100%;
height: calc(2.19rem + 2px);
padding: 0.375rem 1.75rem 0.375rem 0.75rem;
+ font-weight: 400;
line-height: 1.6;
color: #495057;
vertical-align: middle;
- background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center;
- background-size: 8px 10px;
+ background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
+ background-color: #fff;
border: 1px solid #ced4da;
border-radius: 0.25rem;
-webkit-appearance: none;
@@ -4177,8 +4413,8 @@ tbody.collapse.show {
.custom-select:focus {
border-color: #80bdff;
outline: 0;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(128, 189, 255, 0.5);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(128, 189, 255, 0.5);
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(128, 189, 255, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(128, 189, 255, 0.5);
}
.custom-select:focus::-ms-value {
@@ -4204,16 +4440,18 @@ tbody.collapse.show {
.custom-select-sm {
height: calc(1.68125rem + 2px);
- padding-top: 0.375rem;
- padding-bottom: 0.375rem;
- font-size: 75%;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
+ padding-left: 0.5rem;
+ font-size: 0.7875rem;
}
.custom-select-lg {
height: calc(2.6875rem + 2px);
- padding-top: 0.375rem;
- padding-bottom: 0.375rem;
- font-size: 125%;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+ padding-left: 1rem;
+ font-size: 1.125rem;
}
.custom-file {
@@ -4233,20 +4471,24 @@ tbody.collapse.show {
opacity: 0;
}
-.custom-file-input:focus ~ .custom-file-control {
+.custom-file-input:focus ~ .custom-file-label {
border-color: #80bdff;
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
-.custom-file-input:focus ~ .custom-file-control::before {
- border-color: #80bdff;
+.custom-file-input:disabled ~ .custom-file-label {
+ background-color: #e9ecef;
}
.custom-file-input:lang(en) ~ .custom-file-label::after {
content: "Browse";
}
+.custom-file-input ~ .custom-file-label[data-browse]::after {
+ content: attr(data-browse);
+}
+
.custom-file-label {
position: absolute;
top: 0;
@@ -4255,6 +4497,7 @@ tbody.collapse.show {
z-index: 1;
height: calc(2.19rem + 2px);
padding: 0.375rem 0.75rem;
+ font-weight: 400;
line-height: 1.6;
color: #495057;
background-color: #fff;
@@ -4269,16 +4512,204 @@ tbody.collapse.show {
bottom: 0;
z-index: 3;
display: block;
- height: calc(calc(2.19rem + 2px) - 1px * 2);
+ height: 2.19rem;
padding: 0.375rem 0.75rem;
line-height: 1.6;
color: #495057;
content: "Browse";
background-color: #e9ecef;
- border-left: 1px solid #ced4da;
+ border-left: inherit;
border-radius: 0 0.25rem 0.25rem 0;
}
+.custom-range {
+ width: 100%;
+ height: calc(1rem + 0.4rem);
+ padding: 0;
+ background-color: transparent;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+}
+
+.custom-range:focus {
+ outline: none;
+}
+
+.custom-range:focus::-webkit-slider-thumb {
+ -webkit-box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+ box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-range:focus::-moz-range-thumb {
+ box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-range:focus::-ms-thumb {
+ box-shadow: 0 0 0 1px #f5f8fa, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+}
+
+.custom-range::-moz-focus-outer {
+ border: 0;
+}
+
+.custom-range::-webkit-slider-thumb {
+ width: 1rem;
+ height: 1rem;
+ margin-top: -0.25rem;
+ background-color: #007bff;
+ border: 0;
+ border-radius: 1rem;
+ -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ -webkit-appearance: none;
+ appearance: none;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .custom-range::-webkit-slider-thumb {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
+.custom-range::-webkit-slider-thumb:active {
+ background-color: #b3d7ff;
+}
+
+.custom-range::-webkit-slider-runnable-track {
+ width: 100%;
+ height: 0.5rem;
+ color: transparent;
+ cursor: pointer;
+ background-color: #dee2e6;
+ border-color: transparent;
+ border-radius: 1rem;
+}
+
+.custom-range::-moz-range-thumb {
+ width: 1rem;
+ height: 1rem;
+ background-color: #007bff;
+ border: 0;
+ border-radius: 1rem;
+ -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ -moz-appearance: none;
+ appearance: none;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .custom-range::-moz-range-thumb {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
+.custom-range::-moz-range-thumb:active {
+ background-color: #b3d7ff;
+}
+
+.custom-range::-moz-range-track {
+ width: 100%;
+ height: 0.5rem;
+ color: transparent;
+ cursor: pointer;
+ background-color: #dee2e6;
+ border-color: transparent;
+ border-radius: 1rem;
+}
+
+.custom-range::-ms-thumb {
+ width: 1rem;
+ height: 1rem;
+ margin-top: 0;
+ margin-right: 0.2rem;
+ margin-left: 0.2rem;
+ background-color: #007bff;
+ border: 0;
+ border-radius: 1rem;
+ -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ appearance: none;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .custom-range::-ms-thumb {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
+.custom-range::-ms-thumb:active {
+ background-color: #b3d7ff;
+}
+
+.custom-range::-ms-track {
+ width: 100%;
+ height: 0.5rem;
+ color: transparent;
+ cursor: pointer;
+ background-color: transparent;
+ border-color: transparent;
+ border-width: 0.5rem;
+}
+
+.custom-range::-ms-fill-lower {
+ background-color: #dee2e6;
+ border-radius: 1rem;
+}
+
+.custom-range::-ms-fill-upper {
+ margin-right: 15px;
+ background-color: #dee2e6;
+ border-radius: 1rem;
+}
+
+.custom-range:disabled::-webkit-slider-thumb {
+ background-color: #adb5bd;
+}
+
+.custom-range:disabled::-webkit-slider-runnable-track {
+ cursor: default;
+}
+
+.custom-range:disabled::-moz-range-thumb {
+ background-color: #adb5bd;
+}
+
+.custom-range:disabled::-moz-range-track {
+ cursor: default;
+}
+
+.custom-range:disabled::-ms-thumb {
+ background-color: #adb5bd;
+}
+
+.custom-control-label::before,
+.custom-file-label,
+.custom-select {
+ -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+ transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .custom-control-label::before,
+ .custom-file-label,
+ .custom-select {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
.nav {
display: -webkit-box;
display: -ms-flexbox;
@@ -4302,6 +4733,8 @@ tbody.collapse.show {
.nav-link.disabled {
color: #6c757d;
+ pointer-events: none;
+ cursor: default;
}
.nav-tabs {
@@ -4466,7 +4899,7 @@ tbody.collapse.show {
padding: 0.25rem 0.75rem;
font-size: 1.125rem;
line-height: 1;
- background-color: #e8e8e8;
+ background-color: transparent;
border: 1px solid transparent;
border-radius: 0.25rem;
}
@@ -4520,11 +4953,6 @@ tbody.collapse.show {
position: absolute;
}
- .navbar-expand-sm .navbar-nav .dropdown-menu-right {
- right: 0;
- left: auto;
- }
-
.navbar-expand-sm .navbar-nav .nav-link {
padding-right: 0.5rem;
padding-left: 0.5rem;
@@ -4547,11 +4975,6 @@ tbody.collapse.show {
.navbar-expand-sm .navbar-toggler {
display: none;
}
-
- .navbar-expand-sm .dropup .dropdown-menu {
- top: auto;
- bottom: 100%;
- }
}
@media (max-width: 767.98px) {
@@ -4584,11 +5007,6 @@ tbody.collapse.show {
position: absolute;
}
- .navbar-expand-md .navbar-nav .dropdown-menu-right {
- right: 0;
- left: auto;
- }
-
.navbar-expand-md .navbar-nav .nav-link {
padding-right: 0.5rem;
padding-left: 0.5rem;
@@ -4611,11 +5029,6 @@ tbody.collapse.show {
.navbar-expand-md .navbar-toggler {
display: none;
}
-
- .navbar-expand-md .dropup .dropdown-menu {
- top: auto;
- bottom: 100%;
- }
}
@media (max-width: 991.98px) {
@@ -4648,11 +5061,6 @@ tbody.collapse.show {
position: absolute;
}
- .navbar-expand-lg .navbar-nav .dropdown-menu-right {
- right: 0;
- left: auto;
- }
-
.navbar-expand-lg .navbar-nav .nav-link {
padding-right: 0.5rem;
padding-left: 0.5rem;
@@ -4675,11 +5083,6 @@ tbody.collapse.show {
.navbar-expand-lg .navbar-toggler {
display: none;
}
-
- .navbar-expand-lg .dropup .dropdown-menu {
- top: auto;
- bottom: 100%;
- }
}
@media (max-width: 1199.98px) {
@@ -4712,11 +5115,6 @@ tbody.collapse.show {
position: absolute;
}
- .navbar-expand-xl .navbar-nav .dropdown-menu-right {
- right: 0;
- left: auto;
- }
-
.navbar-expand-xl .navbar-nav .nav-link {
padding-right: 0.5rem;
padding-left: 0.5rem;
@@ -4739,11 +5137,6 @@ tbody.collapse.show {
.navbar-expand-xl .navbar-toggler {
display: none;
}
-
- .navbar-expand-xl .dropup .dropdown-menu {
- top: auto;
- bottom: 100%;
- }
}
.navbar-expand {
@@ -4773,11 +5166,6 @@ tbody.collapse.show {
position: absolute;
}
-.navbar-expand .navbar-nav .dropdown-menu-right {
- right: 0;
- left: auto;
-}
-
.navbar-expand .navbar-nav .nav-link {
padding-right: 0.5rem;
padding-left: 0.5rem;
@@ -4801,11 +5189,6 @@ tbody.collapse.show {
display: none;
}
-.navbar-expand .dropup .dropdown-menu {
- top: auto;
- bottom: 100%;
-}
-
.navbar-light .navbar-brand {
color: rgba(0, 0, 0, 0.9);
}
@@ -4841,7 +5224,7 @@ tbody.collapse.show {
}
.navbar-light .navbar-toggler-icon {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
.navbar-light .navbar-text {
@@ -4892,7 +5275,7 @@ tbody.collapse.show {
}
.navbar-dark .navbar-toggler-icon {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
.navbar-dark .navbar-text {
@@ -4971,6 +5354,7 @@ tbody.collapse.show {
.card-header {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
+ color: inherit;
background-color: rgba(0, 0, 0, 0.03);
border-bottom: 1px solid rgba(0, 0, 0, 0.125);
}
@@ -5174,6 +5558,8 @@ tbody.collapse.show {
column-count: 3;
-webkit-column-gap: 1.25rem;
column-gap: 1.25rem;
+ orphans: 1;
+ widows: 1;
}
.card-columns .card {
@@ -5182,6 +5568,34 @@ tbody.collapse.show {
}
}
+.accordion .card {
+ overflow: hidden;
+}
+
+.accordion .card:not(:first-of-type) .card-header:first-child {
+ border-radius: 0;
+}
+
+.accordion .card:not(:first-of-type):not(:last-of-type) {
+ border-bottom: 0;
+ border-radius: 0;
+}
+
+.accordion .card:first-of-type {
+ border-bottom: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+}
+
+.accordion .card:last-of-type {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
+
+.accordion .card .card-header {
+ margin-bottom: -1px;
+}
+
.breadcrumb {
display: -webkit-box;
display: -ms-flexbox;
@@ -5195,10 +5609,13 @@ tbody.collapse.show {
border-radius: 0.25rem;
}
+.breadcrumb-item + .breadcrumb-item {
+ padding-left: 0.5rem;
+}
+
.breadcrumb-item + .breadcrumb-item::before {
display: inline-block;
padding-right: 0.5rem;
- padding-left: 0.5rem;
color: #6c757d;
content: "/";
}
@@ -5236,6 +5653,7 @@ tbody.collapse.show {
}
.page-link:hover {
+ z-index: 2;
color: #0056b3;
text-decoration: none;
background-color: #e9ecef;
@@ -5323,6 +5741,11 @@ tbody.collapse.show {
border-radius: 0.25rem;
}
+a.badge:hover,
+a.badge:focus {
+ text-decoration: none;
+}
+
.badge:empty {
display: none;
}
@@ -5343,10 +5766,9 @@ tbody.collapse.show {
background-color: #007bff;
}
-.badge-primary[href]:hover,
-.badge-primary[href]:focus {
+a.badge-primary:hover,
+a.badge-primary:focus {
color: #fff;
- text-decoration: none;
background-color: #0062cc;
}
@@ -5355,10 +5777,9 @@ tbody.collapse.show {
background-color: #6c757d;
}
-.badge-secondary[href]:hover,
-.badge-secondary[href]:focus {
+a.badge-secondary:hover,
+a.badge-secondary:focus {
color: #fff;
- text-decoration: none;
background-color: #545b62;
}
@@ -5367,10 +5788,9 @@ tbody.collapse.show {
background-color: #28a745;
}
-.badge-success[href]:hover,
-.badge-success[href]:focus {
+a.badge-success:hover,
+a.badge-success:focus {
color: #fff;
- text-decoration: none;
background-color: #1e7e34;
}
@@ -5379,10 +5799,9 @@ tbody.collapse.show {
background-color: #17a2b8;
}
-.badge-info[href]:hover,
-.badge-info[href]:focus {
+a.badge-info:hover,
+a.badge-info:focus {
color: #fff;
- text-decoration: none;
background-color: #117a8b;
}
@@ -5391,10 +5810,9 @@ tbody.collapse.show {
background-color: #ffc107;
}
-.badge-warning[href]:hover,
-.badge-warning[href]:focus {
+a.badge-warning:hover,
+a.badge-warning:focus {
color: #212529;
- text-decoration: none;
background-color: #d39e00;
}
@@ -5403,10 +5821,9 @@ tbody.collapse.show {
background-color: #dc3545;
}
-.badge-danger[href]:hover,
-.badge-danger[href]:focus {
+a.badge-danger:hover,
+a.badge-danger:focus {
color: #fff;
- text-decoration: none;
background-color: #bd2130;
}
@@ -5415,10 +5832,9 @@ tbody.collapse.show {
background-color: #f8f9fa;
}
-.badge-light[href]:hover,
-.badge-light[href]:focus {
+a.badge-light:hover,
+a.badge-light:focus {
color: #212529;
- text-decoration: none;
background-color: #dae0e5;
}
@@ -5427,10 +5843,9 @@ tbody.collapse.show {
background-color: #343a40;
}
-.badge-dark[href]:hover,
-.badge-dark[href]:focus {
+a.badge-dark:hover,
+a.badge-dark:focus {
color: #fff;
- text-decoration: none;
background-color: #1d2124;
}
@@ -5637,11 +6052,19 @@ tbody.collapse.show {
justify-content: center;
color: #fff;
text-align: center;
+ white-space: nowrap;
background-color: #007bff;
-webkit-transition: width 0.6s ease;
transition: width 0.6s ease;
}
+@media screen and (prefers-reduced-motion: reduce) {
+ .progress-bar {
+ -webkit-transition: none;
+ transition: none;
+ }
+}
+
.progress-bar-striped {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-size: 1rem 1rem;
@@ -5726,6 +6149,7 @@ tbody.collapse.show {
.list-group-item.disabled,
.list-group-item:disabled {
color: #6c757d;
+ pointer-events: none;
background-color: #fff;
}
@@ -5742,11 +6166,16 @@ tbody.collapse.show {
border-radius: 0;
}
+.list-group-flush .list-group-item:last-child {
+ margin-bottom: -1px;
+}
+
.list-group-flush:first-child .list-group-item:first-child {
border-top: 0;
}
.list-group-flush:last-child .list-group-item:last-child {
+ margin-bottom: 0;
border-bottom: 0;
}
@@ -5896,45 +6325,104 @@ tbody.collapse.show {
opacity: .5;
}
-.close:hover,
-.close:focus {
+.close:hover {
color: #000;
text-decoration: none;
- opacity: .75;
}
.close:not(:disabled):not(.disabled) {
cursor: pointer;
}
+.close:not(:disabled):not(.disabled):hover,
+.close:not(:disabled):not(.disabled):focus {
+ opacity: .75;
+}
+
button.close {
padding: 0;
background-color: transparent;
border: 0;
-webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+}
+
+a.close.disabled {
+ pointer-events: none;
+}
+
+.toast {
+ max-width: 350px;
+ overflow: hidden;
+ font-size: 0.875rem;
+ background-color: rgba(255, 255, 255, 0.85);
+ background-clip: padding-box;
+ border: 1px solid rgba(0, 0, 0, 0.1);
+ border-radius: 0.25rem;
+ -webkit-box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
+ box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
+ -webkit-backdrop-filter: blur(10px);
+ backdrop-filter: blur(10px);
+ opacity: 0;
+}
+
+.toast:not(:last-child) {
+ margin-bottom: 0.75rem;
+}
+
+.toast.showing {
+ opacity: 1;
+}
+
+.toast.show {
+ display: block;
+ opacity: 1;
+}
+
+.toast.hide {
+ display: none;
+}
+
+.toast-header {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ padding: 0.25rem 0.75rem;
+ color: #6c757d;
+ background-color: rgba(255, 255, 255, 0.85);
+ background-clip: padding-box;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.toast-body {
+ padding: 0.75rem;
}
.modal-open {
overflow: hidden;
}
+.modal-open .modal {
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+
.modal {
position: fixed;
top: 0;
- right: 0;
- bottom: 0;
left: 0;
z-index: 1050;
display: none;
+ width: 100%;
+ height: 100%;
overflow: hidden;
outline: 0;
}
-.modal-open .modal {
- overflow-x: hidden;
- overflow-y: auto;
-}
-
.modal-dialog {
position: relative;
width: auto;
@@ -5947,13 +6435,20 @@ button.close {
transition: -webkit-transform 0.3s ease-out;
transition: transform 0.3s ease-out;
transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out;
- -webkit-transform: translate(0, -25%);
- transform: translate(0, -25%);
+ -webkit-transform: translate(0, -50px);
+ transform: translate(0, -50px);
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .modal.fade .modal-dialog {
+ -webkit-transition: none;
+ transition: none;
+ }
}
.modal.show .modal-dialog {
- -webkit-transform: translate(0, 0);
- transform: translate(0, 0);
+ -webkit-transform: none;
+ transform: none;
}
.modal-dialog-centered {
@@ -5966,6 +6461,12 @@ button.close {
min-height: calc(100% - (0.5rem * 2));
}
+.modal-dialog-centered::before {
+ display: block;
+ height: calc(100vh - (0.5rem * 2));
+ content: "";
+}
+
.modal-content {
position: relative;
display: -webkit-box;
@@ -5987,10 +6488,10 @@ button.close {
.modal-backdrop {
position: fixed;
top: 0;
- right: 0;
- bottom: 0;
left: 0;
z-index: 1040;
+ width: 100vw;
+ height: 100vh;
background-color: #000;
}
@@ -6012,14 +6513,14 @@ button.close {
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
- padding: 1rem;
+ padding: 1rem 1rem;
border-bottom: 1px solid #e9ecef;
border-top-left-radius: 0.3rem;
border-top-right-radius: 0.3rem;
}
.modal-header .close {
- padding: 1rem;
+ padding: 1rem 1rem;
margin: -1rem -1rem -1rem auto;
}
@@ -6048,6 +6549,8 @@ button.close {
justify-content: flex-end;
padding: 1rem;
border-top: 1px solid #e9ecef;
+ border-bottom-right-radius: 0.3rem;
+ border-bottom-left-radius: 0.3rem;
}
.modal-footer > :not(:first-child) {
@@ -6076,17 +6579,28 @@ button.close {
min-height: calc(100% - (1.75rem * 2));
}
+ .modal-dialog-centered::before {
+ height: calc(100vh - (1.75rem * 2));
+ }
+
.modal-sm {
max-width: 300px;
}
}
@media (min-width: 992px) {
- .modal-lg {
+ .modal-lg,
+ .modal-xl {
max-width: 800px;
}
}
+@media (min-width: 1200px) {
+ .modal-xl {
+ max-width: 1140px;
+ }
+}
+
.tooltip {
position: absolute;
z-index: 1070;
@@ -6414,80 +6928,90 @@ button.close {
position: relative;
}
+.carousel.pointer-event {
+ -ms-touch-action: pan-y;
+ touch-action: pan-y;
+}
+
.carousel-inner {
position: relative;
width: 100%;
overflow: hidden;
}
+.carousel-inner::after {
+ display: block;
+ clear: both;
+ content: "";
+}
+
.carousel-item {
position: relative;
display: none;
- -webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center;
+ float: left;
width: 100%;
- -webkit-transition: -webkit-transform 0.6s ease;
- transition: -webkit-transform 0.6s ease;
- transition: transform 0.6s ease;
- transition: transform 0.6s ease, -webkit-transform 0.6s ease;
+ margin-right: -100%;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
- -webkit-perspective: 1000px;
- perspective: 1000px;
+ -webkit-transition: -webkit-transform 0.6s ease-in-out;
+ transition: -webkit-transform 0.6s ease-in-out;
+ transition: transform 0.6s ease-in-out;
+ transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out;
}
-.carousel-item.active,
-.carousel-item-next,
-.carousel-item-prev {
- display: block;
+@media screen and (prefers-reduced-motion: reduce) {
+ .carousel-item {
+ -webkit-transition: none;
+ transition: none;
+ }
}
+.carousel-item.active,
.carousel-item-next,
.carousel-item-prev {
- position: absolute;
- top: 0;
-}
-
-.carousel-item-next.carousel-item-left,
-.carousel-item-prev.carousel-item-right {
- -webkit-transform: translateX(0);
- transform: translateX(0);
-}
-
-@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
- .carousel-item-next.carousel-item-left,
- .carousel-item-prev.carousel-item-right {
- -webkit-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
- }
+ display: block;
}
-.carousel-item-next,
+.carousel-item-next:not(.carousel-item-left),
.active.carousel-item-right {
-webkit-transform: translateX(100%);
transform: translateX(100%);
}
-@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
- .carousel-item-next,
- .active.carousel-item-right {
- -webkit-transform: translate3d(100%, 0, 0);
- transform: translate3d(100%, 0, 0);
- }
-}
-
-.carousel-item-prev,
+.carousel-item-prev:not(.carousel-item-right),
.active.carousel-item-left {
-webkit-transform: translateX(-100%);
transform: translateX(-100%);
}
-@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
- .carousel-item-prev,
- .active.carousel-item-left {
- -webkit-transform: translate3d(-100%, 0, 0);
- transform: translate3d(-100%, 0, 0);
+.carousel-fade .carousel-item {
+ opacity: 0;
+ -webkit-transition-property: opacity;
+ transition-property: opacity;
+ -webkit-transform: none;
+ transform: none;
+}
+
+.carousel-fade .carousel-item.active,
+.carousel-fade .carousel-item-next.carousel-item-left,
+.carousel-fade .carousel-item-prev.carousel-item-right {
+ z-index: 1;
+ opacity: 1;
+}
+
+.carousel-fade .active.carousel-item-left,
+.carousel-fade .active.carousel-item-right {
+ z-index: 0;
+ opacity: 0;
+ -webkit-transition: 0s 0.6s opacity;
+ transition: 0s 0.6s opacity;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .carousel-fade .active.carousel-item-left,
+ .carousel-fade .active.carousel-item-right {
+ -webkit-transition: none;
+ transition: none;
}
}
@@ -6496,6 +7020,7 @@ button.close {
position: absolute;
top: 0;
bottom: 0;
+ z-index: 1;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@@ -6509,6 +7034,16 @@ button.close {
color: #fff;
text-align: center;
opacity: 0.5;
+ -webkit-transition: opacity 0.15s ease;
+ transition: opacity 0.15s ease;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .carousel-control-prev,
+ .carousel-control-next {
+ -webkit-transition: none;
+ transition: none;
+ }
}
.carousel-control-prev:hover,
@@ -6518,7 +7053,7 @@ button.close {
color: #fff;
text-decoration: none;
outline: 0;
- opacity: .9;
+ opacity: 0.9;
}
.carousel-control-prev {
@@ -6539,17 +7074,17 @@ button.close {
}
.carousel-control-prev-icon {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3e%3c/svg%3e");
}
.carousel-control-next-icon {
- background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E");
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3e%3c/svg%3e");
}
.carousel-indicators {
position: absolute;
right: 0;
- bottom: 10px;
+ bottom: 0;
left: 0;
z-index: 15;
display: -webkit-box;
@@ -6565,7 +7100,8 @@ button.close {
}
.carousel-indicators li {
- position: relative;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
-webkit-box-flex: 0;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
@@ -6574,31 +7110,25 @@ button.close {
margin-right: 3px;
margin-left: 3px;
text-indent: -999px;
- background-color: rgba(255, 255, 255, 0.5);
-}
-
-.carousel-indicators li::before {
- position: absolute;
- top: -10px;
- left: 0;
- display: inline-block;
- width: 100%;
- height: 10px;
- content: "";
+ cursor: pointer;
+ background-color: #fff;
+ background-clip: padding-box;
+ border-top: 10px solid transparent;
+ border-bottom: 10px solid transparent;
+ opacity: .5;
+ -webkit-transition: opacity 0.6s ease;
+ transition: opacity 0.6s ease;
}
-.carousel-indicators li::after {
- position: absolute;
- bottom: -10px;
- left: 0;
- display: inline-block;
- width: 100%;
- height: 10px;
- content: "";
+@media screen and (prefers-reduced-motion: reduce) {
+ .carousel-indicators li {
+ -webkit-transition: none;
+ transition: none;
+ }
}
.carousel-indicators .active {
- background-color: #fff;
+ opacity: 1;
}
.carousel-caption {
@@ -6613,6 +7143,77 @@ button.close {
text-align: center;
}
+@-webkit-keyframes spinner-border {
+ to {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+@keyframes spinner-border {
+ to {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+.spinner-border {
+ display: inline-block;
+ width: 2rem;
+ height: 2rem;
+ vertical-align: text-bottom;
+ border: 0.25em solid currentColor;
+ border-right-color: transparent;
+ border-radius: 50%;
+ -webkit-animation: spinner-border .75s linear infinite;
+ animation: spinner-border .75s linear infinite;
+}
+
+.spinner-border-sm {
+ width: 1rem;
+ height: 1rem;
+ border-width: 0.2em;
+}
+
+@-webkit-keyframes spinner-grow {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+
+ 50% {
+ opacity: 1;
+ }
+}
+
+@keyframes spinner-grow {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+
+ 50% {
+ opacity: 1;
+ }
+}
+
+.spinner-grow {
+ display: inline-block;
+ width: 2rem;
+ height: 2rem;
+ vertical-align: text-bottom;
+ background-color: currentColor;
+ border-radius: 50%;
+ opacity: 0;
+ -webkit-animation: spinner-grow .75s linear infinite;
+ animation: spinner-grow .75s linear infinite;
+}
+
+.spinner-grow-sm {
+ width: 1rem;
+ height: 1rem;
+}
+
.align-baseline {
vertical-align: baseline !important;
}
@@ -6837,6 +7438,10 @@ button.bg-dark:focus {
border-radius: 50% !important;
}
+.rounded-pill {
+ border-radius: 50rem !important;
+}
+
.rounded-0 {
border-radius: 0 !important;
}
@@ -7132,8 +7737,8 @@ button.bg-dark:focus {
padding-top: 56.25%;
}
-.embed-responsive-4by3::before {
- padding-top: 75%;
+.embed-responsive-3by4::before {
+ padding-top: 133.33333333%;
}
.embed-responsive-1by1::before {
@@ -7183,6 +7788,34 @@ button.bg-dark:focus {
flex-wrap: wrap-reverse !important;
}
+.flex-fill {
+ -webkit-box-flex: 1 !important;
+ -ms-flex: 1 1 auto !important;
+ flex: 1 1 auto !important;
+}
+
+.flex-grow-0 {
+ -webkit-box-flex: 0 !important;
+ -ms-flex-positive: 0 !important;
+ flex-grow: 0 !important;
+}
+
+.flex-grow-1 {
+ -webkit-box-flex: 1 !important;
+ -ms-flex-positive: 1 !important;
+ flex-grow: 1 !important;
+}
+
+.flex-shrink-0 {
+ -ms-flex-negative: 0 !important;
+ flex-shrink: 0 !important;
+}
+
+.flex-shrink-1 {
+ -ms-flex-negative: 1 !important;
+ flex-shrink: 1 !important;
+}
+
.justify-content-start {
-webkit-box-pack: start !important;
-ms-flex-pack: start !important;
@@ -7346,6 +7979,34 @@ button.bg-dark:focus {
flex-wrap: wrap-reverse !important;
}
+ .flex-sm-fill {
+ -webkit-box-flex: 1 !important;
+ -ms-flex: 1 1 auto !important;
+ flex: 1 1 auto !important;
+ }
+
+ .flex-sm-grow-0 {
+ -webkit-box-flex: 0 !important;
+ -ms-flex-positive: 0 !important;
+ flex-grow: 0 !important;
+ }
+
+ .flex-sm-grow-1 {
+ -webkit-box-flex: 1 !important;
+ -ms-flex-positive: 1 !important;
+ flex-grow: 1 !important;
+ }
+
+ .flex-sm-shrink-0 {
+ -ms-flex-negative: 0 !important;
+ flex-shrink: 0 !important;
+ }
+
+ .flex-sm-shrink-1 {
+ -ms-flex-negative: 1 !important;
+ flex-shrink: 1 !important;
+ }
+
.justify-content-sm-start {
-webkit-box-pack: start !important;
-ms-flex-pack: start !important;
@@ -7510,6 +8171,34 @@ button.bg-dark:focus {
flex-wrap: wrap-reverse !important;
}
+ .flex-md-fill {
+ -webkit-box-flex: 1 !important;
+ -ms-flex: 1 1 auto !important;
+ flex: 1 1 auto !important;
+ }
+
+ .flex-md-grow-0 {
+ -webkit-box-flex: 0 !important;
+ -ms-flex-positive: 0 !important;
+ flex-grow: 0 !important;
+ }
+
+ .flex-md-grow-1 {
+ -webkit-box-flex: 1 !important;
+ -ms-flex-positive: 1 !important;
+ flex-grow: 1 !important;
+ }
+
+ .flex-md-shrink-0 {
+ -ms-flex-negative: 0 !important;
+ flex-shrink: 0 !important;
+ }
+
+ .flex-md-shrink-1 {
+ -ms-flex-negative: 1 !important;
+ flex-shrink: 1 !important;
+ }
+
.justify-content-md-start {
-webkit-box-pack: start !important;
-ms-flex-pack: start !important;
@@ -7674,6 +8363,34 @@ button.bg-dark:focus {
flex-wrap: wrap-reverse !important;
}
+ .flex-lg-fill {
+ -webkit-box-flex: 1 !important;
+ -ms-flex: 1 1 auto !important;
+ flex: 1 1 auto !important;
+ }
+
+ .flex-lg-grow-0 {
+ -webkit-box-flex: 0 !important;
+ -ms-flex-positive: 0 !important;
+ flex-grow: 0 !important;
+ }
+
+ .flex-lg-grow-1 {
+ -webkit-box-flex: 1 !important;
+ -ms-flex-positive: 1 !important;
+ flex-grow: 1 !important;
+ }
+
+ .flex-lg-shrink-0 {
+ -ms-flex-negative: 0 !important;
+ flex-shrink: 0 !important;
+ }
+
+ .flex-lg-shrink-1 {
+ -ms-flex-negative: 1 !important;
+ flex-shrink: 1 !important;
+ }
+
.justify-content-lg-start {
-webkit-box-pack: start !important;
-ms-flex-pack: start !important;
@@ -7838,6 +8555,34 @@ button.bg-dark:focus {
flex-wrap: wrap-reverse !important;
}
+ .flex-xl-fill {
+ -webkit-box-flex: 1 !important;
+ -ms-flex: 1 1 auto !important;
+ flex: 1 1 auto !important;
+ }
+
+ .flex-xl-grow-0 {
+ -webkit-box-flex: 0 !important;
+ -ms-flex-positive: 0 !important;
+ flex-grow: 0 !important;
+ }
+
+ .flex-xl-grow-1 {
+ -webkit-box-flex: 1 !important;
+ -ms-flex-positive: 1 !important;
+ flex-grow: 1 !important;
+ }
+
+ .flex-xl-shrink-0 {
+ -ms-flex-negative: 0 !important;
+ flex-shrink: 0 !important;
+ }
+
+ .flex-xl-shrink-1 {
+ -ms-flex-negative: 1 !important;
+ flex-shrink: 1 !important;
+ }
+
.justify-content-xl-start {
-webkit-box-pack: start !important;
-ms-flex-pack: start !important;
@@ -8026,6 +8771,14 @@ button.bg-dark:focus {
}
}
+.overflow-auto {
+ overflow: auto !important;
+}
+
+.overflow-hidden {
+ overflow: hidden !important;
+}
+
.position-static {
position: static !important;
}
@@ -8080,8 +8833,6 @@ button.bg-dark:focus {
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
- -webkit-clip-path: inset(50%);
- clip-path: inset(50%);
border: 0;
}
@@ -8093,8 +8844,26 @@ button.bg-dark:focus {
overflow: visible;
clip: auto;
white-space: normal;
- -webkit-clip-path: none;
- clip-path: none;
+}
+
+.shadow-sm {
+ -webkit-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+ box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+}
+
+.shadow {
+ -webkit-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+ box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+}
+
+.shadow-lg {
+ -webkit-box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+ box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+}
+
+.shadow-none {
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
}
.w-25 {
@@ -8113,6 +8882,10 @@ button.bg-dark:focus {
width: 100% !important;
}
+.w-auto {
+ width: auto !important;
+}
+
.h-25 {
height: 25% !important;
}
@@ -8129,6 +8902,10 @@ button.bg-dark:focus {
height: 100% !important;
}
+.h-auto {
+ height: auto !important;
+}
+
.mw-100 {
max-width: 100% !important;
}
@@ -8137,6 +8914,22 @@ button.bg-dark:focus {
max-height: 100% !important;
}
+.min-vw-100 {
+ min-width: 100vw !important;
+}
+
+.min-vh-100 {
+ min-height: 100vh !important;
+}
+
+.vw-100 {
+ width: 100vw !important;
+}
+
+.vh-100 {
+ height: 100vh !important;
+}
+
.m-0 {
margin: 0 !important;
}
@@ -8372,57 +9165,177 @@ button.bg-dark:focus {
padding-bottom: 1rem !important;
}
-.pl-3,
-.px-3 {
- padding-left: 1rem !important;
+.pl-3,
+.px-3 {
+ padding-left: 1rem !important;
+}
+
+.p-4 {
+ padding: 1.5rem !important;
+}
+
+.pt-4,
+.py-4 {
+ padding-top: 1.5rem !important;
+}
+
+.pr-4,
+.px-4 {
+ padding-right: 1.5rem !important;
+}
+
+.pb-4,
+.py-4 {
+ padding-bottom: 1.5rem !important;
+}
+
+.pl-4,
+.px-4 {
+ padding-left: 1.5rem !important;
+}
+
+.p-5 {
+ padding: 3rem !important;
+}
+
+.pt-5,
+.py-5 {
+ padding-top: 3rem !important;
+}
+
+.pr-5,
+.px-5 {
+ padding-right: 3rem !important;
+}
+
+.pb-5,
+.py-5 {
+ padding-bottom: 3rem !important;
+}
+
+.pl-5,
+.px-5 {
+ padding-left: 3rem !important;
+}
+
+.m-n1 {
+ margin: -0.25rem !important;
+}
+
+.mt-n1,
+.my-n1 {
+ margin-top: -0.25rem !important;
+}
+
+.mr-n1,
+.mx-n1 {
+ margin-right: -0.25rem !important;
+}
+
+.mb-n1,
+.my-n1 {
+ margin-bottom: -0.25rem !important;
+}
+
+.ml-n1,
+.mx-n1 {
+ margin-left: -0.25rem !important;
+}
+
+.m-n2 {
+ margin: -0.5rem !important;
+}
+
+.mt-n2,
+.my-n2 {
+ margin-top: -0.5rem !important;
+}
+
+.mr-n2,
+.mx-n2 {
+ margin-right: -0.5rem !important;
+}
+
+.mb-n2,
+.my-n2 {
+ margin-bottom: -0.5rem !important;
+}
+
+.ml-n2,
+.mx-n2 {
+ margin-left: -0.5rem !important;
+}
+
+.m-n3 {
+ margin: -1rem !important;
+}
+
+.mt-n3,
+.my-n3 {
+ margin-top: -1rem !important;
+}
+
+.mr-n3,
+.mx-n3 {
+ margin-right: -1rem !important;
+}
+
+.mb-n3,
+.my-n3 {
+ margin-bottom: -1rem !important;
+}
+
+.ml-n3,
+.mx-n3 {
+ margin-left: -1rem !important;
}
-.p-4 {
- padding: 1.5rem !important;
+.m-n4 {
+ margin: -1.5rem !important;
}
-.pt-4,
-.py-4 {
- padding-top: 1.5rem !important;
+.mt-n4,
+.my-n4 {
+ margin-top: -1.5rem !important;
}
-.pr-4,
-.px-4 {
- padding-right: 1.5rem !important;
+.mr-n4,
+.mx-n4 {
+ margin-right: -1.5rem !important;
}
-.pb-4,
-.py-4 {
- padding-bottom: 1.5rem !important;
+.mb-n4,
+.my-n4 {
+ margin-bottom: -1.5rem !important;
}
-.pl-4,
-.px-4 {
- padding-left: 1.5rem !important;
+.ml-n4,
+.mx-n4 {
+ margin-left: -1.5rem !important;
}
-.p-5 {
- padding: 3rem !important;
+.m-n5 {
+ margin: -3rem !important;
}
-.pt-5,
-.py-5 {
- padding-top: 3rem !important;
+.mt-n5,
+.my-n5 {
+ margin-top: -3rem !important;
}
-.pr-5,
-.px-5 {
- padding-right: 3rem !important;
+.mr-n5,
+.mx-n5 {
+ margin-right: -3rem !important;
}
-.pb-5,
-.py-5 {
- padding-bottom: 3rem !important;
+.mb-n5,
+.my-n5 {
+ margin-bottom: -3rem !important;
}
-.pl-5,
-.px-5 {
- padding-left: 3rem !important;
+.ml-n5,
+.mx-n5 {
+ margin-left: -3rem !important;
}
.m-auto {
@@ -8738,6 +9651,126 @@ button.bg-dark:focus {
padding-left: 3rem !important;
}
+ .m-sm-n1 {
+ margin: -0.25rem !important;
+ }
+
+ .mt-sm-n1,
+ .my-sm-n1 {
+ margin-top: -0.25rem !important;
+ }
+
+ .mr-sm-n1,
+ .mx-sm-n1 {
+ margin-right: -0.25rem !important;
+ }
+
+ .mb-sm-n1,
+ .my-sm-n1 {
+ margin-bottom: -0.25rem !important;
+ }
+
+ .ml-sm-n1,
+ .mx-sm-n1 {
+ margin-left: -0.25rem !important;
+ }
+
+ .m-sm-n2 {
+ margin: -0.5rem !important;
+ }
+
+ .mt-sm-n2,
+ .my-sm-n2 {
+ margin-top: -0.5rem !important;
+ }
+
+ .mr-sm-n2,
+ .mx-sm-n2 {
+ margin-right: -0.5rem !important;
+ }
+
+ .mb-sm-n2,
+ .my-sm-n2 {
+ margin-bottom: -0.5rem !important;
+ }
+
+ .ml-sm-n2,
+ .mx-sm-n2 {
+ margin-left: -0.5rem !important;
+ }
+
+ .m-sm-n3 {
+ margin: -1rem !important;
+ }
+
+ .mt-sm-n3,
+ .my-sm-n3 {
+ margin-top: -1rem !important;
+ }
+
+ .mr-sm-n3,
+ .mx-sm-n3 {
+ margin-right: -1rem !important;
+ }
+
+ .mb-sm-n3,
+ .my-sm-n3 {
+ margin-bottom: -1rem !important;
+ }
+
+ .ml-sm-n3,
+ .mx-sm-n3 {
+ margin-left: -1rem !important;
+ }
+
+ .m-sm-n4 {
+ margin: -1.5rem !important;
+ }
+
+ .mt-sm-n4,
+ .my-sm-n4 {
+ margin-top: -1.5rem !important;
+ }
+
+ .mr-sm-n4,
+ .mx-sm-n4 {
+ margin-right: -1.5rem !important;
+ }
+
+ .mb-sm-n4,
+ .my-sm-n4 {
+ margin-bottom: -1.5rem !important;
+ }
+
+ .ml-sm-n4,
+ .mx-sm-n4 {
+ margin-left: -1.5rem !important;
+ }
+
+ .m-sm-n5 {
+ margin: -3rem !important;
+ }
+
+ .mt-sm-n5,
+ .my-sm-n5 {
+ margin-top: -3rem !important;
+ }
+
+ .mr-sm-n5,
+ .mx-sm-n5 {
+ margin-right: -3rem !important;
+ }
+
+ .mb-sm-n5,
+ .my-sm-n5 {
+ margin-bottom: -3rem !important;
+ }
+
+ .ml-sm-n5,
+ .mx-sm-n5 {
+ margin-left: -3rem !important;
+ }
+
.m-sm-auto {
margin: auto !important;
}
@@ -9052,6 +10085,126 @@ button.bg-dark:focus {
padding-left: 3rem !important;
}
+ .m-md-n1 {
+ margin: -0.25rem !important;
+ }
+
+ .mt-md-n1,
+ .my-md-n1 {
+ margin-top: -0.25rem !important;
+ }
+
+ .mr-md-n1,
+ .mx-md-n1 {
+ margin-right: -0.25rem !important;
+ }
+
+ .mb-md-n1,
+ .my-md-n1 {
+ margin-bottom: -0.25rem !important;
+ }
+
+ .ml-md-n1,
+ .mx-md-n1 {
+ margin-left: -0.25rem !important;
+ }
+
+ .m-md-n2 {
+ margin: -0.5rem !important;
+ }
+
+ .mt-md-n2,
+ .my-md-n2 {
+ margin-top: -0.5rem !important;
+ }
+
+ .mr-md-n2,
+ .mx-md-n2 {
+ margin-right: -0.5rem !important;
+ }
+
+ .mb-md-n2,
+ .my-md-n2 {
+ margin-bottom: -0.5rem !important;
+ }
+
+ .ml-md-n2,
+ .mx-md-n2 {
+ margin-left: -0.5rem !important;
+ }
+
+ .m-md-n3 {
+ margin: -1rem !important;
+ }
+
+ .mt-md-n3,
+ .my-md-n3 {
+ margin-top: -1rem !important;
+ }
+
+ .mr-md-n3,
+ .mx-md-n3 {
+ margin-right: -1rem !important;
+ }
+
+ .mb-md-n3,
+ .my-md-n3 {
+ margin-bottom: -1rem !important;
+ }
+
+ .ml-md-n3,
+ .mx-md-n3 {
+ margin-left: -1rem !important;
+ }
+
+ .m-md-n4 {
+ margin: -1.5rem !important;
+ }
+
+ .mt-md-n4,
+ .my-md-n4 {
+ margin-top: -1.5rem !important;
+ }
+
+ .mr-md-n4,
+ .mx-md-n4 {
+ margin-right: -1.5rem !important;
+ }
+
+ .mb-md-n4,
+ .my-md-n4 {
+ margin-bottom: -1.5rem !important;
+ }
+
+ .ml-md-n4,
+ .mx-md-n4 {
+ margin-left: -1.5rem !important;
+ }
+
+ .m-md-n5 {
+ margin: -3rem !important;
+ }
+
+ .mt-md-n5,
+ .my-md-n5 {
+ margin-top: -3rem !important;
+ }
+
+ .mr-md-n5,
+ .mx-md-n5 {
+ margin-right: -3rem !important;
+ }
+
+ .mb-md-n5,
+ .my-md-n5 {
+ margin-bottom: -3rem !important;
+ }
+
+ .ml-md-n5,
+ .mx-md-n5 {
+ margin-left: -3rem !important;
+ }
+
.m-md-auto {
margin: auto !important;
}
@@ -9366,6 +10519,126 @@ button.bg-dark:focus {
padding-left: 3rem !important;
}
+ .m-lg-n1 {
+ margin: -0.25rem !important;
+ }
+
+ .mt-lg-n1,
+ .my-lg-n1 {
+ margin-top: -0.25rem !important;
+ }
+
+ .mr-lg-n1,
+ .mx-lg-n1 {
+ margin-right: -0.25rem !important;
+ }
+
+ .mb-lg-n1,
+ .my-lg-n1 {
+ margin-bottom: -0.25rem !important;
+ }
+
+ .ml-lg-n1,
+ .mx-lg-n1 {
+ margin-left: -0.25rem !important;
+ }
+
+ .m-lg-n2 {
+ margin: -0.5rem !important;
+ }
+
+ .mt-lg-n2,
+ .my-lg-n2 {
+ margin-top: -0.5rem !important;
+ }
+
+ .mr-lg-n2,
+ .mx-lg-n2 {
+ margin-right: -0.5rem !important;
+ }
+
+ .mb-lg-n2,
+ .my-lg-n2 {
+ margin-bottom: -0.5rem !important;
+ }
+
+ .ml-lg-n2,
+ .mx-lg-n2 {
+ margin-left: -0.5rem !important;
+ }
+
+ .m-lg-n3 {
+ margin: -1rem !important;
+ }
+
+ .mt-lg-n3,
+ .my-lg-n3 {
+ margin-top: -1rem !important;
+ }
+
+ .mr-lg-n3,
+ .mx-lg-n3 {
+ margin-right: -1rem !important;
+ }
+
+ .mb-lg-n3,
+ .my-lg-n3 {
+ margin-bottom: -1rem !important;
+ }
+
+ .ml-lg-n3,
+ .mx-lg-n3 {
+ margin-left: -1rem !important;
+ }
+
+ .m-lg-n4 {
+ margin: -1.5rem !important;
+ }
+
+ .mt-lg-n4,
+ .my-lg-n4 {
+ margin-top: -1.5rem !important;
+ }
+
+ .mr-lg-n4,
+ .mx-lg-n4 {
+ margin-right: -1.5rem !important;
+ }
+
+ .mb-lg-n4,
+ .my-lg-n4 {
+ margin-bottom: -1.5rem !important;
+ }
+
+ .ml-lg-n4,
+ .mx-lg-n4 {
+ margin-left: -1.5rem !important;
+ }
+
+ .m-lg-n5 {
+ margin: -3rem !important;
+ }
+
+ .mt-lg-n5,
+ .my-lg-n5 {
+ margin-top: -3rem !important;
+ }
+
+ .mr-lg-n5,
+ .mx-lg-n5 {
+ margin-right: -3rem !important;
+ }
+
+ .mb-lg-n5,
+ .my-lg-n5 {
+ margin-bottom: -3rem !important;
+ }
+
+ .ml-lg-n5,
+ .mx-lg-n5 {
+ margin-left: -3rem !important;
+ }
+
.m-lg-auto {
margin: auto !important;
}
@@ -9680,6 +10953,126 @@ button.bg-dark:focus {
padding-left: 3rem !important;
}
+ .m-xl-n1 {
+ margin: -0.25rem !important;
+ }
+
+ .mt-xl-n1,
+ .my-xl-n1 {
+ margin-top: -0.25rem !important;
+ }
+
+ .mr-xl-n1,
+ .mx-xl-n1 {
+ margin-right: -0.25rem !important;
+ }
+
+ .mb-xl-n1,
+ .my-xl-n1 {
+ margin-bottom: -0.25rem !important;
+ }
+
+ .ml-xl-n1,
+ .mx-xl-n1 {
+ margin-left: -0.25rem !important;
+ }
+
+ .m-xl-n2 {
+ margin: -0.5rem !important;
+ }
+
+ .mt-xl-n2,
+ .my-xl-n2 {
+ margin-top: -0.5rem !important;
+ }
+
+ .mr-xl-n2,
+ .mx-xl-n2 {
+ margin-right: -0.5rem !important;
+ }
+
+ .mb-xl-n2,
+ .my-xl-n2 {
+ margin-bottom: -0.5rem !important;
+ }
+
+ .ml-xl-n2,
+ .mx-xl-n2 {
+ margin-left: -0.5rem !important;
+ }
+
+ .m-xl-n3 {
+ margin: -1rem !important;
+ }
+
+ .mt-xl-n3,
+ .my-xl-n3 {
+ margin-top: -1rem !important;
+ }
+
+ .mr-xl-n3,
+ .mx-xl-n3 {
+ margin-right: -1rem !important;
+ }
+
+ .mb-xl-n3,
+ .my-xl-n3 {
+ margin-bottom: -1rem !important;
+ }
+
+ .ml-xl-n3,
+ .mx-xl-n3 {
+ margin-left: -1rem !important;
+ }
+
+ .m-xl-n4 {
+ margin: -1.5rem !important;
+ }
+
+ .mt-xl-n4,
+ .my-xl-n4 {
+ margin-top: -1.5rem !important;
+ }
+
+ .mr-xl-n4,
+ .mx-xl-n4 {
+ margin-right: -1.5rem !important;
+ }
+
+ .mb-xl-n4,
+ .my-xl-n4 {
+ margin-bottom: -1.5rem !important;
+ }
+
+ .ml-xl-n4,
+ .mx-xl-n4 {
+ margin-left: -1.5rem !important;
+ }
+
+ .m-xl-n5 {
+ margin: -3rem !important;
+ }
+
+ .mt-xl-n5,
+ .my-xl-n5 {
+ margin-top: -3rem !important;
+ }
+
+ .mr-xl-n5,
+ .mx-xl-n5 {
+ margin-right: -3rem !important;
+ }
+
+ .mb-xl-n5,
+ .my-xl-n5 {
+ margin-bottom: -3rem !important;
+ }
+
+ .ml-xl-n5,
+ .mx-xl-n5 {
+ margin-left: -3rem !important;
+ }
+
.m-xl-auto {
margin: auto !important;
}
@@ -9705,10 +11098,18 @@ button.bg-dark:focus {
}
}
+.text-monospace {
+ font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+}
+
.text-justify {
text-align: justify !important;
}
+.text-wrap {
+ white-space: normal !important;
+}
+
.text-nowrap {
white-space: nowrap !important;
}
@@ -9803,6 +11204,10 @@ button.bg-dark:focus {
font-weight: 300 !important;
}
+.font-weight-lighter {
+ font-weight: lighter !important;
+}
+
.font-weight-normal {
font-weight: 400 !important;
}
@@ -9811,6 +11216,10 @@ button.bg-dark:focus {
font-weight: 700 !important;
}
+.font-weight-bolder {
+ font-weight: bolder !important;
+}
+
.font-italic {
font-style: italic !important;
}
@@ -9825,7 +11234,7 @@ button.bg-dark:focus {
a.text-primary:hover,
a.text-primary:focus {
- color: #0062cc !important;
+ color: #0056b3 !important;
}
.text-secondary {
@@ -9834,7 +11243,7 @@ a.text-primary:focus {
a.text-secondary:hover,
a.text-secondary:focus {
- color: #545b62 !important;
+ color: #494f54 !important;
}
.text-success {
@@ -9843,7 +11252,7 @@ a.text-secondary:focus {
a.text-success:hover,
a.text-success:focus {
- color: #1e7e34 !important;
+ color: #19692c !important;
}
.text-info {
@@ -9852,7 +11261,7 @@ a.text-success:focus {
a.text-info:hover,
a.text-info:focus {
- color: #117a8b !important;
+ color: #0f6674 !important;
}
.text-warning {
@@ -9861,7 +11270,7 @@ a.text-info:focus {
a.text-warning:hover,
a.text-warning:focus {
- color: #d39e00 !important;
+ color: #ba8b00 !important;
}
.text-danger {
@@ -9870,7 +11279,7 @@ a.text-warning:focus {
a.text-danger:hover,
a.text-danger:focus {
- color: #bd2130 !important;
+ color: #a71d2a !important;
}
.text-light {
@@ -9879,7 +11288,7 @@ a.text-danger:focus {
a.text-light:hover,
a.text-light:focus {
- color: #dae0e5 !important;
+ color: #cbd3da !important;
}
.text-dark {
@@ -9888,13 +11297,25 @@ a.text-light:focus {
a.text-dark:hover,
a.text-dark:focus {
- color: #1d2124 !important;
+ color: #121416 !important;
+}
+
+.text-body {
+ color: #212529 !important;
}
.text-muted {
color: #6c757d !important;
}
+.text-black-50 {
+ color: rgba(0, 0, 0, 0.5) !important;
+}
+
+.text-white-50 {
+ color: rgba(255, 255, 255, 0.5) !important;
+}
+
.text-hide {
font: 0/0 a;
color: transparent;
@@ -9903,6 +11324,14 @@ a.text-dark:focus {
border: 0;
}
+.text-decoration-none {
+ text-decoration: none !important;
+}
+
+.text-reset {
+ color: inherit !important;
+}
+
.visible {
visibility: visible !important;
}
@@ -9934,7 +11363,7 @@ a.text-dark:focus {
pre,
blockquote {
- border: 1px solid #999;
+ border: 1px solid #adb5bd;
page-break-inside: avoid;
}
@@ -9990,7 +11419,23 @@ a.text-dark:focus {
.table-bordered th,
.table-bordered td {
- border: 1px solid #ddd !important;
+ border: 1px solid #dee2e6 !important;
+ }
+
+ .table-dark {
+ color: inherit;
+ }
+
+ .table-dark th,
+ .table-dark td,
+ .table-dark thead th,
+ .table-dark tbody + tbody {
+ border-color: #dee2e6;
+ }
+
+ .table .thead-dark th {
+ color: inherit;
+ border-color: #dee2e6;
}
}
diff --git a/public/js/app.js b/public/js/app.js
index b46963af3f9c713b0193d971062f74704e257a5d..7894b18a668cff96200b6494e5ee779719a07030 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -57,7 +57,7 @@
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
-/******/ __webpack_require__.p = "";
+/******/ __webpack_require__.p = "/";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 11);
@@ -508,7 +508,7 @@ module.exports = defaults;
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* WEBPACK VAR INJECTION */(function(global) {/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.12.9
+ * @version 1.14.7
* @license
* Copyright (c) 2016 Federico Zivolo and contributors
*
@@ -531,6 +531,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
* SOFTWARE.
*/
var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
+
var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];
var timeoutDuration = 0;
for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {
@@ -604,7 +605,8 @@ function getStyleComputedProperty(element, property) {
return [];
}
// NOTE: 1 DOM access here
- var css = getComputedStyle(element, null);
+ var window = element.ownerDocument.defaultView;
+ var css = window.getComputedStyle(element, null);
return property ? css[property] : css;
}
@@ -650,13 +652,33 @@ function getScrollParent(element) {
overflowX = _getStyleComputedProp.overflowX,
overflowY = _getStyleComputedProp.overflowY;
- if (/(auto|scroll)/.test(overflow + overflowY + overflowX)) {
+ if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
return element;
}
return getScrollParent(getParentNode(element));
}
+var isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);
+var isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);
+
+/**
+ * Determines if the browser is Internet Explorer
+ * @method
+ * @memberof Popper.Utils
+ * @param {Number} version to check
+ * @returns {Boolean} isIE
+ */
+function isIE(version) {
+ if (version === 11) {
+ return isIE11;
+ }
+ if (version === 10) {
+ return isIE10;
+ }
+ return isIE11 || isIE10;
+}
+
/**
* Returns the offset parent of the given element
* @method
@@ -665,21 +687,28 @@ function getScrollParent(element) {
* @returns {Element} offset parent
*/
function getOffsetParent(element) {
+ if (!element) {
+ return document.documentElement;
+ }
+
+ var noOffsetParent = isIE(10) ? document.body : null;
+
// NOTE: 1 DOM access here
- var offsetParent = element && element.offsetParent;
+ var offsetParent = element.offsetParent || null;
+ // Skip hidden elements which don't have an offsetParent
+ while (offsetParent === noOffsetParent && element.nextElementSibling) {
+ offsetParent = (element = element.nextElementSibling).offsetParent;
+ }
+
var nodeName = offsetParent && offsetParent.nodeName;
if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
- if (element) {
- return element.ownerDocument.documentElement;
- }
-
- return document.documentElement;
+ return element ? element.ownerDocument.documentElement : document.documentElement;
}
- // .offsetParent will return the closest TD or TABLE in case
+ // .offsetParent will return the closest TH, TD or TABLE in case
// no offsetParent is present, I hate this job...
- if (['TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {
+ if (['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {
return getOffsetParent(offsetParent);
}
@@ -816,29 +845,14 @@ function getBordersSize(styles, axis) {
return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
}
-/**
- * Tells if you are running Internet Explorer 10
- * @method
- * @memberof Popper.Utils
- * @returns {Boolean} isIE10
- */
-var isIE10 = undefined;
-
-var isIE10$1 = function () {
- if (isIE10 === undefined) {
- isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1;
- }
- return isIE10;
-};
-
function getSize(axis, body, html, computedStyle) {
- return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE10$1() ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
+ return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? parseInt(html['offset' + axis]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')]) : 0);
}
-function getWindowSizes() {
+function getWindowSizes(document) {
var body = document.body;
var html = document.documentElement;
- var computedStyle = isIE10$1() && getComputedStyle(html);
+ var computedStyle = isIE(10) && getComputedStyle(html);
return {
height: getSize('Height', body, html, computedStyle),
@@ -930,8 +944,8 @@ function getBoundingClientRect(element) {
// IE10 10 FIX: Please, don't ask, the element isn't
// considered in DOM in some circumstances...
// This isn't reproducible in IE10 compatibility mode of IE11
- if (isIE10$1()) {
- try {
+ try {
+ if (isIE(10)) {
rect = element.getBoundingClientRect();
var scrollTop = getScroll(element, 'top');
var scrollLeft = getScroll(element, 'left');
@@ -939,10 +953,10 @@ function getBoundingClientRect(element) {
rect.left += scrollLeft;
rect.bottom += scrollTop;
rect.right += scrollLeft;
- } catch (err) {}
- } else {
- rect = element.getBoundingClientRect();
- }
+ } else {
+ rect = element.getBoundingClientRect();
+ }
+ } catch (e) {}
var result = {
left: rect.left,
@@ -952,7 +966,7 @@ function getBoundingClientRect(element) {
};
// subtract scrollbar size from sizes
- var sizes = element.nodeName === 'HTML' ? getWindowSizes() : {};
+ var sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};
var width = sizes.width || element.clientWidth || result.right - result.left;
var height = sizes.height || element.clientHeight || result.bottom - result.top;
@@ -974,7 +988,9 @@ function getBoundingClientRect(element) {
}
function getOffsetRectRelativeToArbitraryNode(children, parent) {
- var isIE10 = isIE10$1();
+ var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+ var isIE10 = isIE(10);
var isHTML = parent.nodeName === 'HTML';
var childrenRect = getBoundingClientRect(children);
var parentRect = getBoundingClientRect(parent);
@@ -984,6 +1000,11 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);
+ // In cases where the parent is fixed, we must ignore negative scroll in offset calc
+ if (fixedPosition && isHTML) {
+ parentRect.top = Math.max(parentRect.top, 0);
+ parentRect.left = Math.max(parentRect.left, 0);
+ }
var offsets = getClientRect({
top: childrenRect.top - parentRect.top - borderTopWidth,
left: childrenRect.left - parentRect.left - borderLeftWidth,
@@ -1011,7 +1032,7 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
offsets.marginLeft = marginLeft;
}
- if (isIE10 ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+ if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
offsets = includeScroll(offsets, parent);
}
@@ -1019,13 +1040,15 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
}
function getViewportOffsetRectRelativeToArtbitraryNode(element) {
+ var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
var html = element.ownerDocument.documentElement;
var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
var width = Math.max(html.clientWidth, window.innerWidth || 0);
var height = Math.max(html.clientHeight, window.innerHeight || 0);
- var scrollTop = getScroll(html);
- var scrollLeft = getScroll(html, 'left');
+ var scrollTop = !excludeScroll ? getScroll(html) : 0;
+ var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
var offset = {
top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
@@ -1053,7 +1076,31 @@ function isFixed(element) {
if (getStyleComputedProperty(element, 'position') === 'fixed') {
return true;
}
- return isFixed(getParentNode(element));
+ var parentNode = getParentNode(element);
+ if (!parentNode) {
+ return false;
+ }
+ return isFixed(parentNode);
+}
+
+/**
+ * Finds the first parent of an element that has a transformed property defined
+ * @method
+ * @memberof Popper.Utils
+ * @argument {Element} element
+ * @returns {Element} first transformed parent or documentElement
+ */
+
+function getFixedPositionOffsetParent(element) {
+ // This check is needed to avoid errors in case one of the elements isn't defined for any reason
+ if (!element || !element.parentElement || isIE()) {
+ return document.documentElement;
+ }
+ var el = element.parentElement;
+ while (el && getStyleComputedProperty(el, 'transform') === 'none') {
+ el = el.parentElement;
+ }
+ return el || document.documentElement;
}
/**
@@ -1064,16 +1111,20 @@ function isFixed(element) {
* @param {HTMLElement} reference
* @param {number} padding
* @param {HTMLElement} boundariesElement - Element used to define the boundaries
+ * @param {Boolean} fixedPosition - Is in fixed position mode
* @returns {Object} Coordinates of the boundaries
*/
function getBoundaries(popper, reference, padding, boundariesElement) {
+ var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+
// NOTE: 1 DOM access here
+
var boundaries = { top: 0, left: 0 };
- var offsetParent = findCommonOffsetParent(popper, reference);
+ var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
// Handle viewport case
if (boundariesElement === 'viewport') {
- boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent);
+ boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
} else {
// Handle other cases based on DOM element used as boundaries
var boundariesNode = void 0;
@@ -1088,11 +1139,11 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
boundariesNode = boundariesElement;
}
- var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent);
+ var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
// In case of HTML, we need a different computation
if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
- var _getWindowSizes = getWindowSizes(),
+ var _getWindowSizes = getWindowSizes(popper.ownerDocument),
height = _getWindowSizes.height,
width = _getWindowSizes.width;
@@ -1107,10 +1158,12 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
}
// Add paddings
- boundaries.left += padding;
- boundaries.top += padding;
- boundaries.right -= padding;
- boundaries.bottom -= padding;
+ padding = padding || 0;
+ var isPaddingNumber = typeof padding === 'number';
+ boundaries.left += isPaddingNumber ? padding : padding.left || 0;
+ boundaries.top += isPaddingNumber ? padding : padding.top || 0;
+ boundaries.right -= isPaddingNumber ? padding : padding.right || 0;
+ boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0;
return boundaries;
}
@@ -1189,11 +1242,14 @@ function computeAutoPlacement(placement, refRect, popper, reference, boundariesE
* @param {Object} state
* @param {Element} popper - the popper element
* @param {Element} reference - the reference element (the popper will be relative to this)
+ * @param {Element} fixedPosition - is in fixed position mode
* @returns {Object} An object containing the offsets which will be applied to the popper
*/
function getReferenceOffsets(state, popper, reference) {
- var commonOffsetParent = findCommonOffsetParent(popper, reference);
- return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent);
+ var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+
+ var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
+ return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
}
/**
@@ -1204,9 +1260,10 @@ function getReferenceOffsets(state, popper, reference) {
* @returns {Object} object containing width and height properties
*/
function getOuterSizes(element) {
- var styles = getComputedStyle(element);
- var x = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
- var y = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight);
+ var window = element.ownerDocument.defaultView;
+ var styles = window.getComputedStyle(element);
+ var x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);
+ var y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);
var result = {
width: element.offsetWidth + y,
height: element.offsetHeight + x
@@ -1366,7 +1423,7 @@ function update() {
};
// compute reference element offsets
- data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference);
+ data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);
// compute auto placement, store placement inside the data object,
// modifiers will be able to edit `placement` if needed
@@ -1376,9 +1433,12 @@ function update() {
// store the computed placement inside `originalPlacement`
data.originalPlacement = data.placement;
+ data.positionFixed = this.options.positionFixed;
+
// compute the popper offsets
data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);
- data.offsets.popper.position = 'absolute';
+
+ data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';
// run the modifiers
data = runModifiers(this.modifiers, data);
@@ -1418,7 +1478,7 @@ function getSupportedPropertyName(property) {
var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
var upperProp = property.charAt(0).toUpperCase() + property.slice(1);
- for (var i = 0; i < prefixes.length - 1; i++) {
+ for (var i = 0; i < prefixes.length; i++) {
var prefix = prefixes[i];
var toCheck = prefix ? '' + prefix + upperProp : property;
if (typeof document.body.style[toCheck] !== 'undefined') {
@@ -1429,7 +1489,7 @@ function getSupportedPropertyName(property) {
}
/**
- * Destroy the popper
+ * Destroys the popper.
* @method
* @memberof Popper
*/
@@ -1439,9 +1499,12 @@ function destroy() {
// touch DOM only if `applyStyle` modifier is enabled
if (isModifierEnabled(this.modifiers, 'applyStyle')) {
this.popper.removeAttribute('x-placement');
- this.popper.style.left = '';
this.popper.style.position = '';
this.popper.style.top = '';
+ this.popper.style.left = '';
+ this.popper.style.right = '';
+ this.popper.style.bottom = '';
+ this.popper.style.willChange = '';
this.popper.style[getSupportedPropertyName('transform')] = '';
}
@@ -1533,7 +1596,7 @@ function removeEventListeners(reference, state) {
/**
* It will remove resize/scroll events and won't recalculate popper position
- * when they are triggered. It also won't trigger onUpdate callback anymore,
+ * when they are triggered. It also won't trigger `onUpdate` callback anymore,
* unless you call `update` method manually.
* @method
* @memberof Popper
@@ -1629,12 +1692,12 @@ function applyStyle(data) {
* @method
* @memberof Popper.modifiers
* @param {HTMLElement} reference - The reference element used to position the popper
- * @param {HTMLElement} popper - The HTML element used as popper.
+ * @param {HTMLElement} popper - The HTML element used as popper
* @param {Object} options - Popper.js options
*/
function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
// compute reference element offsets
- var referenceOffsets = getReferenceOffsets(state, popper, reference);
+ var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);
// compute auto placement, store placement inside the data object,
// modifiers will be able to edit `placement` if needed
@@ -1645,11 +1708,62 @@ function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
// Apply `position` to popper before anything else because
// without the position applied we can't guarantee correct computations
- setStyles(popper, { position: 'absolute' });
+ setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });
return options;
}
+/**
+ * @function
+ * @memberof Popper.Utils
+ * @argument {Object} data - The data object generated by `update` method
+ * @argument {Boolean} shouldRound - If the offsets should be rounded at all
+ * @returns {Object} The popper's position offsets rounded
+ *
+ * The tale of pixel-perfect positioning. It's still not 100% perfect, but as
+ * good as it can be within reason.
+ * Discussion here: https://github.com/FezVrasta/popper.js/pull/715
+ *
+ * Low DPI screens cause a popper to be blurry if not using full pixels (Safari
+ * as well on High DPI screens).
+ *
+ * Firefox prefers no rounding for positioning and does not have blurriness on
+ * high DPI screens.
+ *
+ * Only horizontal placement and left/right values need to be considered.
+ */
+function getRoundedOffsets(data, shouldRound) {
+ var _data$offsets = data.offsets,
+ popper = _data$offsets.popper,
+ reference = _data$offsets.reference;
+ var round = Math.round,
+ floor = Math.floor;
+
+ var noRound = function noRound(v) {
+ return v;
+ };
+
+ var referenceWidth = round(reference.width);
+ var popperWidth = round(popper.width);
+
+ var isVertical = ['left', 'right'].indexOf(data.placement) !== -1;
+ var isVariation = data.placement.indexOf('-') !== -1;
+ var sameWidthParity = referenceWidth % 2 === popperWidth % 2;
+ var bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;
+
+ var horizontalToInteger = !shouldRound ? noRound : isVertical || isVariation || sameWidthParity ? round : floor;
+ var verticalToInteger = !shouldRound ? noRound : round;
+
+ return {
+ left: horizontalToInteger(bothOddWidth && !isVariation && shouldRound ? popper.left - 1 : popper.left),
+ top: verticalToInteger(popper.top),
+ bottom: verticalToInteger(popper.bottom),
+ right: horizontalToInteger(popper.right)
+ };
+}
+
+var isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);
+
/**
* @function
* @memberof Modifiers
@@ -1680,13 +1794,7 @@ function computeStyle(data, options) {
position: popper.position
};
- // floor sides to avoid blurry text
- var offsets = {
- left: Math.floor(popper.left),
- top: Math.floor(popper.top),
- bottom: Math.floor(popper.bottom),
- right: Math.floor(popper.right)
- };
+ var offsets = getRoundedOffsets(data, window.devicePixelRatio < 2 || !isFirefox);
var sideA = x === 'bottom' ? 'top' : 'bottom';
var sideB = y === 'right' ? 'left' : 'right';
@@ -1708,12 +1816,22 @@ function computeStyle(data, options) {
var left = void 0,
top = void 0;
if (sideA === 'bottom') {
- top = -offsetParentRect.height + offsets.bottom;
+ // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)
+ // and not the bottom of the html element
+ if (offsetParent.nodeName === 'HTML') {
+ top = -offsetParent.clientHeight + offsets.bottom;
+ } else {
+ top = -offsetParentRect.height + offsets.bottom;
+ }
} else {
top = offsets.top;
}
if (sideB === 'right') {
- left = -offsetParentRect.width + offsets.right;
+ if (offsetParent.nodeName === 'HTML') {
+ left = -offsetParent.clientWidth + offsets.right;
+ } else {
+ left = -offsetParentRect.width + offsets.right;
+ }
} else {
left = offsets.left;
}
@@ -1822,7 +1940,7 @@ function arrow(data, options) {
//
// extends keepTogether behavior making sure the popper and its
- // reference have enough pixels in conjuction
+ // reference have enough pixels in conjunction
//
// top/left side
@@ -1892,7 +2010,7 @@ function getOppositeVariation(variation) {
* - `top-end` (on top of reference, right aligned)
* - `right-start` (on right of reference, top aligned)
* - `bottom` (on bottom, centered)
- * - `auto-right` (on the side with more space available, alignment depends by placement)
+ * - `auto-end` (on the side with more space available, alignment depends by placement)
*
* @static
* @type {Array}
@@ -1948,7 +2066,7 @@ function flip(data, options) {
return data;
}
- var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement);
+ var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);
var placement = data.placement.split('-')[0];
var placementOpposite = getOppositePlacement(placement);
@@ -2240,7 +2358,27 @@ function preventOverflow(data, options) {
boundariesElement = getOffsetParent(boundariesElement);
}
- var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement);
+ // NOTE: DOM access here
+ // resets the popper's position so that the document size can be calculated excluding
+ // the size of the popper element itself
+ var transformProp = getSupportedPropertyName('transform');
+ var popperStyles = data.instance.popper.style; // assignment to help minification
+ var top = popperStyles.top,
+ left = popperStyles.left,
+ transform = popperStyles[transformProp];
+
+ popperStyles.top = '';
+ popperStyles.left = '';
+ popperStyles[transformProp] = '';
+
+ var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);
+
+ // NOTE: DOM access here
+ // restores the original style properties after the offsets have been computed
+ popperStyles.top = top;
+ popperStyles.left = left;
+ popperStyles[transformProp] = transform;
+
options.boundaries = boundaries;
var order = options.priority;
@@ -2414,7 +2552,7 @@ var modifiers = {
* The `offset` modifier can shift your popper on both its axis.
*
* It accepts the following units:
- * - `px` or unitless, interpreted as pixels
+ * - `px` or unit-less, interpreted as pixels
* - `%` or `%r`, percentage relative to the length of the reference element
* - `%p`, percentage relative to the length of the popper element
* - `vw`, CSS viewport width unit
@@ -2422,7 +2560,7 @@ var modifiers = {
*
* For length is intended the main axis relative to the placement of the popper.<br />
* This means that if the placement is `top` or `bottom`, the length will be the
- * `width`. In case of `left` or `right`, it will be the height.
+ * `width`. In case of `left` or `right`, it will be the `height`.
*
* You can provide a single value (as `Number` or `String`), or a pair of values
* as `String` divided by a comma or one (or more) white spaces.<br />
@@ -2443,7 +2581,7 @@ var modifiers = {
* ```
* > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap
* > with their reference element, unfortunately, you will have to disable the `flip` modifier.
- * > More on this [reading this issue](https://github.com/FezVrasta/popper.js/issues/373)
+ * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).
*
* @memberof modifiers
* @inner
@@ -2464,7 +2602,7 @@ var modifiers = {
/**
* Modifier used to prevent the popper from being positioned outside the boundary.
*
- * An scenario exists where the reference itself is not within the boundaries.<br />
+ * A scenario exists where the reference itself is not within the boundaries.<br />
* We can say it has "escaped the boundaries" — or just "escaped".<br />
* In this case we need to decide whether the popper should either:
*
@@ -2494,23 +2632,23 @@ var modifiers = {
/**
* @prop {number} padding=5
* Amount of pixel used to define a minimum distance between the boundaries
- * and the popper this makes sure the popper has always a little padding
+ * and the popper. This makes sure the popper always has a little padding
* between the edges of its container
*/
padding: 5,
/**
* @prop {String|HTMLElement} boundariesElement='scrollParent'
- * Boundaries used by the modifier, can be `scrollParent`, `window`,
+ * Boundaries used by the modifier. Can be `scrollParent`, `window`,
* `viewport` or any DOM element.
*/
boundariesElement: 'scrollParent'
},
/**
- * Modifier used to make sure the reference and its popper stay near eachothers
- * without leaving any gap between the two. Expecially useful when the arrow is
- * enabled and you want to assure it to point to its reference element.
- * It cares only about the first axis, you can still have poppers with margin
+ * Modifier used to make sure the reference and its popper stay near each other
+ * without leaving any gap between the two. Especially useful when the arrow is
+ * enabled and you want to ensure that it points to its reference element.
+ * It cares only about the first axis. You can still have poppers with margin
* between the popper and its reference element.
* @memberof modifiers
* @inner
@@ -2528,7 +2666,7 @@ var modifiers = {
* This modifier is used to move the `arrowElement` of the popper to make
* sure it is positioned between the reference element and its popper element.
* It will read the outer size of the `arrowElement` node to detect how many
- * pixels of conjuction are needed.
+ * pixels of conjunction are needed.
*
* It has no effect if no `arrowElement` is provided.
* @memberof modifiers
@@ -2567,7 +2705,7 @@ var modifiers = {
* @prop {String|Array} behavior='flip'
* The behavior used to change the popper's placement. It can be one of
* `flip`, `clockwise`, `counterclockwise` or an array with a list of valid
- * placements (with optional variations).
+ * placements (with optional variations)
*/
behavior: 'flip',
/**
@@ -2577,9 +2715,9 @@ var modifiers = {
padding: 5,
/**
* @prop {String|HTMLElement} boundariesElement='viewport'
- * The element which will define the boundaries of the popper position,
- * the popper will never be placed outside of the defined boundaries
- * (except if keepTogether is enabled)
+ * The element which will define the boundaries of the popper position.
+ * The popper will never be placed outside of the defined boundaries
+ * (except if `keepTogether` is enabled)
*/
boundariesElement: 'viewport'
},
@@ -2643,8 +2781,8 @@ var modifiers = {
fn: computeStyle,
/**
* @prop {Boolean} gpuAcceleration=true
- * If true, it uses the CSS 3d transformation to position the popper.
- * Otherwise, it will use the `top` and `left` properties.
+ * If true, it uses the CSS 3D transformation to position the popper.
+ * Otherwise, it will use the `top` and `left` properties
*/
gpuAcceleration: true,
/**
@@ -2671,7 +2809,7 @@ var modifiers = {
* Note that if you disable this modifier, you must make sure the popper element
* has its position set to `absolute` before Popper.js can do its work!
*
- * Just disable this modifier and define you own to achieve the desired effect.
+ * Just disable this modifier and define your own to achieve the desired effect.
*
* @memberof modifiers
* @inner
@@ -2688,27 +2826,27 @@ var modifiers = {
/**
* @deprecated since version 1.10.0, the property moved to `computeStyle` modifier
* @prop {Boolean} gpuAcceleration=true
- * If true, it uses the CSS 3d transformation to position the popper.
- * Otherwise, it will use the `top` and `left` properties.
+ * If true, it uses the CSS 3D transformation to position the popper.
+ * Otherwise, it will use the `top` and `left` properties
*/
gpuAcceleration: undefined
}
};
/**
- * The `dataObject` is an object containing all the informations used by Popper.js
- * this object get passed to modifiers and to the `onCreate` and `onUpdate` callbacks.
+ * The `dataObject` is an object containing all the information used by Popper.js.
+ * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.
* @name dataObject
* @property {Object} data.instance The Popper.js instance
* @property {String} data.placement Placement applied to popper
* @property {String} data.originalPlacement Placement originally defined on init
* @property {Boolean} data.flipped True if popper has been flipped by flip modifier
- * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper.
+ * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper
* @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier
- * @property {Object} data.styles Any CSS property defined here will be applied to the popper, it expects the JavaScript nomenclature (eg. `marginBottom`)
- * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow, it expects the JavaScript nomenclature (eg. `marginBottom`)
+ * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)
+ * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)
* @property {Object} data.boundaries Offsets of the popper boundaries
- * @property {Object} data.offsets The measurements of popper, reference and arrow elements.
+ * @property {Object} data.offsets The measurements of popper, reference and arrow elements
* @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values
* @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values
* @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0
@@ -2716,9 +2854,9 @@ var modifiers = {
/**
* Default options provided to Popper.js constructor.<br />
- * These can be overriden using the `options` argument of Popper.js.<br />
- * To override an option, simply pass as 3rd argument an object with the same
- * structure of this object, example:
+ * These can be overridden using the `options` argument of Popper.js.<br />
+ * To override an option, simply pass an object with the same
+ * structure of the `options` object, as the 3rd argument. For example:
* ```
* new Popper(ref, pop, {
* modifiers: {
@@ -2732,13 +2870,19 @@ var modifiers = {
*/
var Defaults = {
/**
- * Popper's placement
+ * Popper's placement.
* @prop {Popper.placements} placement='bottom'
*/
placement: 'bottom',
/**
- * Whether events (resize, scroll) are initially enabled
+ * Set this to true if you want popper to position it self in 'fixed' mode
+ * @prop {Boolean} positionFixed=false
+ */
+ positionFixed: false,
+
+ /**
+ * Whether events (resize, scroll) are initially enabled.
* @prop {Boolean} eventsEnabled=true
*/
eventsEnabled: true,
@@ -2752,17 +2896,17 @@ var Defaults = {
/**
* Callback called when the popper is created.<br />
- * By default, is set to no-op.<br />
+ * By default, it is set to no-op.<br />
* Access Popper.js instance with `data.instance`.
* @prop {onCreate}
*/
onCreate: function onCreate() {},
/**
- * Callback called when the popper is updated, this callback is not called
+ * Callback called when the popper is updated. This callback is not called
* on the initialization/creation of the popper, but only on subsequent
* updates.<br />
- * By default, is set to no-op.<br />
+ * By default, it is set to no-op.<br />
* Access Popper.js instance with `data.instance`.
* @prop {onUpdate}
*/
@@ -2770,7 +2914,7 @@ var Defaults = {
/**
* List of modifiers used to modify the offsets before they are applied to the popper.
- * They provide most of the functionalities of Popper.js
+ * They provide most of the functionalities of Popper.js.
* @prop {modifiers}
*/
modifiers: modifiers
@@ -2790,10 +2934,10 @@ var Defaults = {
// Methods
var Popper = function () {
/**
- * Create a new Popper.js instance
+ * Creates a new Popper.js instance.
* @class Popper
* @param {HTMLElement|referenceObject} reference - The reference element used to position the popper
- * @param {HTMLElement} popper - The HTML element used as popper.
+ * @param {HTMLElement} popper - The HTML element used as the popper
* @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)
* @return {Object} instance - The generated Popper.js instance
*/
@@ -2889,7 +3033,7 @@ var Popper = function () {
}
/**
- * Schedule an update, it will run on the next UI update available
+ * Schedules an update. It will run on the next UI update available.
* @method scheduleUpdate
* @memberof Popper
*/
@@ -2926,7 +3070,7 @@ var Popper = function () {
* new Popper(referenceObject, popperNode);
* ```
*
- * NB: This feature isn't supported in Internet Explorer 10
+ * NB: This feature isn't supported in Internet Explorer 10.
* @name referenceObject
* @property {Function} data.getBoundingClientRect
* A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.
@@ -13889,7 +14033,7 @@ if (token) {
var undefined;
/** Used as the semantic version number. */
- var VERSION = '4.17.5';
+ var VERSION = '4.17.11';
/** Used as the size to enable large array optimizations. */
var LARGE_ARRAY_SIZE = 200;
@@ -14153,7 +14297,7 @@ if (token) {
var reHasUnicode = RegExp('[' + rsZWJ + rsAstralRange + rsComboRange + rsVarRange + ']');
/** Used to detect strings that need a more robust regexp to match words. */
- var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2,}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
+ var reHasUnicodeWord = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
/** Used to assign default `context` object properties. */
var contextProps = [
@@ -14313,6 +14457,14 @@ if (token) {
/** Used to access faster Node.js helpers. */
var nodeUtil = (function() {
try {
+ // Use `util.types` for Node.js 10+.
+ var types = freeModule && freeModule.require && freeModule.require('util').types;
+
+ if (types) {
+ return types;
+ }
+
+ // Legacy `process.binding('util')` for Node.js < 10.
return freeProcess && freeProcess.binding && freeProcess.binding('util');
} catch (e) {}
}());
@@ -15093,20 +15245,6 @@ if (token) {
return result;
}
- /**
- * Gets the value at `key`, unless `key` is "__proto__".
- *
- * @private
- * @param {Object} object The object to query.
- * @param {string} key The key of the property to get.
- * @returns {*} Returns the property value.
- */
- function safeGet(object, key) {
- return key == '__proto__'
- ? undefined
- : object[key];
- }
-
/**
* Converts `set` to an array of its values.
*
@@ -17564,7 +17702,7 @@ if (token) {
if (isArguments(objValue)) {
newValue = toPlainObject(objValue);
}
- else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
+ else if (!isObject(objValue) || isFunction(objValue)) {
newValue = initCloneObject(srcValue);
}
}
@@ -20487,6 +20625,22 @@ if (token) {
return array;
}
+ /**
+ * Gets the value at `key`, unless `key` is "__proto__".
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the property to get.
+ * @returns {*} Returns the property value.
+ */
+ function safeGet(object, key) {
+ if (key == '__proto__') {
+ return;
+ }
+
+ return object[key];
+ }
+
/**
* Sets metadata for `func`.
*
@@ -31009,85 +31163,101 @@ module.exports = function(module) {
/***/ (function(module, exports, __webpack_require__) {
/*!
- * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Bootstrap v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
(function (global, factory) {
- true ? factory(exports, __webpack_require__(4), __webpack_require__(3)) :
- typeof define === 'function' && define.amd ? define(['exports', 'jquery', 'popper.js'], factory) :
- (factory((global.bootstrap = {}),global.jQuery,global.Popper));
-}(this, (function (exports,$,Popper) { 'use strict';
+ true ? factory(exports, __webpack_require__(3), __webpack_require__(4)) :
+ typeof define === 'function' && define.amd ? define(['exports', 'popper.js', 'jquery'], factory) :
+ (factory((global.bootstrap = {}),global.Popper,global.jQuery));
+}(this, (function (exports,Popper,$) { 'use strict';
-$ = $ && $.hasOwnProperty('default') ? $['default'] : $;
-Popper = Popper && Popper.hasOwnProperty('default') ? Popper['default'] : Popper;
+ Popper = Popper && Popper.hasOwnProperty('default') ? Popper['default'] : Popper;
+ $ = $ && $.hasOwnProperty('default') ? $['default'] : $;
-function _defineProperties(target, props) {
- 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);
+ function _defineProperties(target, props) {
+ 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);
+ }
}
-}
-function _createClass(Constructor, protoProps, staticProps) {
- if (protoProps) _defineProperties(Constructor.prototype, protoProps);
- if (staticProps) _defineProperties(Constructor, staticProps);
- return Constructor;
-}
+ function _createClass(Constructor, protoProps, staticProps) {
+ if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+ if (staticProps) _defineProperties(Constructor, staticProps);
+ return Constructor;
+ }
+
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
-function _extends() {
- _extends = Object.assign || function (target) {
+ function _objectSpread(target) {
for (var i = 1; i < arguments.length; i++) {
- var source = arguments[i];
+ var source = arguments[i] != null ? arguments[i] : {};
+ var ownKeys = Object.keys(source);
- for (var key in source) {
- if (Object.prototype.hasOwnProperty.call(source, key)) {
- target[key] = source[key];
- }
+ if (typeof Object.getOwnPropertySymbols === 'function') {
+ ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
+ return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+ }));
}
+
+ ownKeys.forEach(function (key) {
+ _defineProperty(target, key, source[key]);
+ });
}
return target;
- };
-
- return _extends.apply(this, arguments);
-}
-
-function _inheritsLoose(subClass, superClass) {
- subClass.prototype = Object.create(superClass.prototype);
- subClass.prototype.constructor = subClass;
- subClass.__proto__ = superClass;
-}
+ }
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): util.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
+ function _inheritsLoose(subClass, superClass) {
+ subClass.prototype = Object.create(superClass.prototype);
+ subClass.prototype.constructor = subClass;
+ subClass.__proto__ = superClass;
+ }
-var Util = function ($$$1) {
+ /**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v4.2.1): util.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * --------------------------------------------------------------------------
+ */
/**
* ------------------------------------------------------------------------
* Private TransitionEnd Helpers
* ------------------------------------------------------------------------
*/
- var transition = false;
- var MAX_UID = 1000000; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
+
+ var TRANSITION_END = 'transitionend';
+ var MAX_UID = 1000000;
+ var MILLISECONDS_MULTIPLIER = 1000; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
- return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+ return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
}
function getSpecialTransitionEndEvent() {
return {
- bindType: transition.end,
- delegateType: transition.end,
+ bindType: TRANSITION_END,
+ delegateType: TRANSITION_END,
handle: function handle(event) {
- if ($$$1(event.target).is(this)) {
+ if ($(event.target).is(this)) {
return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
}
@@ -31096,21 +31266,11 @@ var Util = function ($$$1) {
};
}
- function transitionEndTest() {
- if (typeof window !== 'undefined' && window.QUnit) {
- return false;
- }
-
- return {
- end: 'transitionend'
- };
- }
-
function transitionEndEmulator(duration) {
var _this = this;
var called = false;
- $$$1(this).one(Util.TRANSITION_END, function () {
+ $(this).one(Util.TRANSITION_END, function () {
called = true;
});
setTimeout(function () {
@@ -31122,19 +31282,8 @@ var Util = function ($$$1) {
}
function setTransitionEndSupport() {
- transition = transitionEndTest();
- $$$1.fn.emulateTransitionEnd = transitionEndEmulator;
-
- if (Util.supportsTransitionEnd()) {
- $$$1.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
- }
- }
-
- function escapeId(selector) {
- // We escape IDs in case of special selectors (selector = '#myId:something')
- // $.escapeSelector does not exist in jQuery < 3
- selector = typeof $$$1.escapeSelector === 'function' ? $$$1.escapeSelector(selector).substr(1) : selector.replace(/(:|\.|\[|\]|,|=|@)/g, '\\$1');
- return selector;
+ $.fn.emulateTransitionEnd = transitionEndEmulator;
+ $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
}
/**
* --------------------------------------------------------------------------
@@ -31157,29 +31306,41 @@ var Util = function ($$$1) {
var selector = element.getAttribute('data-target');
if (!selector || selector === '#') {
- selector = element.getAttribute('href') || '';
- } // If it's an ID
+ var hrefAttr = element.getAttribute('href');
+ selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
+ }
+ return selector && document.querySelector(selector) ? selector : null;
+ },
+ getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
+ if (!element) {
+ return 0;
+ } // Get transition-duration of the element
- if (selector.charAt(0) === '#') {
- selector = escapeId(selector);
- }
- try {
- var $selector = $$$1(document).find(selector);
- return $selector.length > 0 ? selector : null;
- } catch (err) {
- return null;
- }
+ var transitionDuration = $(element).css('transition-duration');
+ var transitionDelay = $(element).css('transition-delay');
+ var floatTransitionDuration = parseFloat(transitionDuration);
+ var floatTransitionDelay = parseFloat(transitionDelay); // Return 0 if element or transition duration is not found
+
+ if (!floatTransitionDuration && !floatTransitionDelay) {
+ return 0;
+ } // If multiple durations are defined, take the first
+
+
+ transitionDuration = transitionDuration.split(',')[0];
+ transitionDelay = transitionDelay.split(',')[0];
+ return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER;
},
reflow: function reflow(element) {
return element.offsetHeight;
},
triggerTransitionEnd: function triggerTransitionEnd(element) {
- $$$1(element).trigger(transition.end);
+ $(element).trigger(TRANSITION_END);
},
+ // TODO: Remove in v5
supportsTransitionEnd: function supportsTransitionEnd() {
- return Boolean(transition);
+ return Boolean(TRANSITION_END);
},
isElement: function isElement(obj) {
return (obj[0] || obj).nodeType;
@@ -31196,32 +31357,44 @@ var Util = function ($$$1) {
}
}
}
+ },
+ findShadowRoot: function findShadowRoot(element) {
+ if (!document.documentElement.attachShadow) {
+ return null;
+ } // Can find the shadow root otherwise it'll return the document
+
+
+ if (typeof element.getRootNode === 'function') {
+ var root = element.getRootNode();
+ return root instanceof ShadowRoot ? root : null;
+ }
+
+ if (element instanceof ShadowRoot) {
+ return element;
+ } // when we don't find a shadow root
+
+
+ if (!element.parentNode) {
+ return null;
+ }
+
+ return Util.findShadowRoot(element.parentNode);
}
};
setTransitionEndSupport();
- return Util;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): alert.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-var Alert = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
+
var NAME = 'alert';
- var VERSION = '4.0.0';
+ var VERSION = '4.2.1';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 150;
+ var JQUERY_NO_CONFLICT = $.fn[NAME];
var Selector = {
DISMISS: '[data-dismiss="alert"]'
};
@@ -31254,9 +31427,11 @@ var Alert = function ($$$1) {
// Public
_proto.close = function close(element) {
- element = element || this._element;
+ var rootElement = this._element;
- var rootElement = this._getRootElement(element);
+ if (element) {
+ rootElement = this._getRootElement(element);
+ }
var customEvent = this._triggerCloseEvent(rootElement);
@@ -31268,7 +31443,7 @@ var Alert = function ($$$1) {
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
+ $.removeData(this._element, DATA_KEY);
this._element = null;
}; // Private
@@ -31278,46 +31453,47 @@ var Alert = function ($$$1) {
var parent = false;
if (selector) {
- parent = $$$1(selector)[0];
+ parent = document.querySelector(selector);
}
if (!parent) {
- parent = $$$1(element).closest("." + ClassName.ALERT)[0];
+ parent = $(element).closest("." + ClassName.ALERT)[0];
}
return parent;
};
_proto._triggerCloseEvent = function _triggerCloseEvent(element) {
- var closeEvent = $$$1.Event(Event.CLOSE);
- $$$1(element).trigger(closeEvent);
+ var closeEvent = $.Event(Event.CLOSE);
+ $(element).trigger(closeEvent);
return closeEvent;
};
_proto._removeElement = function _removeElement(element) {
var _this = this;
- $$$1(element).removeClass(ClassName.SHOW);
+ $(element).removeClass(ClassName.SHOW);
- if (!Util.supportsTransitionEnd() || !$$$1(element).hasClass(ClassName.FADE)) {
+ if (!$(element).hasClass(ClassName.FADE)) {
this._destroyElement(element);
return;
}
- $$$1(element).one(Util.TRANSITION_END, function (event) {
+ var transitionDuration = Util.getTransitionDurationFromElement(element);
+ $(element).one(Util.TRANSITION_END, function (event) {
return _this._destroyElement(element, event);
- }).emulateTransitionEnd(TRANSITION_DURATION);
+ }).emulateTransitionEnd(transitionDuration);
};
_proto._destroyElement = function _destroyElement(element) {
- $$$1(element).detach().trigger(Event.CLOSED).remove();
+ $(element).detach().trigger(Event.CLOSED).remove();
}; // Static
Alert._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var $element = $$$1(this);
+ var $element = $(this);
var data = $element.data(DATA_KEY);
if (!data) {
@@ -31347,6 +31523,7 @@ var Alert = function ($$$1) {
return VERSION;
}
}]);
+
return Alert;
}();
/**
@@ -31356,58 +31533,48 @@ var Alert = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
+ $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
/**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Alert._jQueryInterface;
- $$$1.fn[NAME].Constructor = Alert;
+ $.fn[NAME] = Alert._jQueryInterface;
+ $.fn[NAME].Constructor = Alert;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME].noConflict = function () {
+ $.fn[NAME] = JQUERY_NO_CONFLICT;
return Alert._jQueryInterface;
};
- return Alert;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): button.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Button = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'button';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.button';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var ClassName = {
+
+ var NAME$1 = 'button';
+ var VERSION$1 = '4.2.1';
+ var DATA_KEY$1 = 'bs.button';
+ var EVENT_KEY$1 = "." + DATA_KEY$1;
+ var DATA_API_KEY$1 = '.data-api';
+ var JQUERY_NO_CONFLICT$1 = $.fn[NAME$1];
+ var ClassName$1 = {
ACTIVE: 'active',
BUTTON: 'btn',
FOCUS: 'focus'
};
- var Selector = {
+ var Selector$1 = {
DATA_TOGGLE_CARROT: '[data-toggle^="button"]',
DATA_TOGGLE: '[data-toggle="buttons"]',
- INPUT: 'input',
+ INPUT: 'input:not([type="hidden"])',
ACTIVE: '.active',
BUTTON: '.btn'
};
- var Event = {
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY,
- FOCUS_BLUR_DATA_API: "focus" + EVENT_KEY + DATA_API_KEY + " " + ("blur" + EVENT_KEY + DATA_API_KEY)
+ var Event$1 = {
+ CLICK_DATA_API: "click" + EVENT_KEY$1 + DATA_API_KEY$1,
+ FOCUS_BLUR_DATA_API: "focus" + EVENT_KEY$1 + DATA_API_KEY$1 + " " + ("blur" + EVENT_KEY$1 + DATA_API_KEY$1)
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -31430,20 +31597,20 @@ var Button = function ($$$1) {
_proto.toggle = function toggle() {
var triggerChangeEvent = true;
var addAriaPressed = true;
- var rootElement = $$$1(this._element).closest(Selector.DATA_TOGGLE)[0];
+ var rootElement = $(this._element).closest(Selector$1.DATA_TOGGLE)[0];
if (rootElement) {
- var input = $$$1(this._element).find(Selector.INPUT)[0];
+ var input = this._element.querySelector(Selector$1.INPUT);
if (input) {
if (input.type === 'radio') {
- if (input.checked && $$$1(this._element).hasClass(ClassName.ACTIVE)) {
+ if (input.checked && this._element.classList.contains(ClassName$1.ACTIVE)) {
triggerChangeEvent = false;
} else {
- var activeElement = $$$1(rootElement).find(Selector.ACTIVE)[0];
+ var activeElement = rootElement.querySelector(Selector$1.ACTIVE);
if (activeElement) {
- $$$1(activeElement).removeClass(ClassName.ACTIVE);
+ $(activeElement).removeClass(ClassName$1.ACTIVE);
}
}
}
@@ -31453,8 +31620,8 @@ var Button = function ($$$1) {
return;
}
- input.checked = !$$$1(this._element).hasClass(ClassName.ACTIVE);
- $$$1(input).trigger('change');
+ input.checked = !this._element.classList.contains(ClassName$1.ACTIVE);
+ $(input).trigger('change');
}
input.focus();
@@ -31463,27 +31630,27 @@ var Button = function ($$$1) {
}
if (addAriaPressed) {
- this._element.setAttribute('aria-pressed', !$$$1(this._element).hasClass(ClassName.ACTIVE));
+ this._element.setAttribute('aria-pressed', !this._element.classList.contains(ClassName$1.ACTIVE));
}
if (triggerChangeEvent) {
- $$$1(this._element).toggleClass(ClassName.ACTIVE);
+ $(this._element).toggleClass(ClassName$1.ACTIVE);
}
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
+ $.removeData(this._element, DATA_KEY$1);
this._element = null;
}; // Static
Button._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$1);
if (!data) {
data = new Button(this);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$1, data);
}
if (config === 'toggle') {
@@ -31495,9 +31662,10 @@ var Button = function ($$$1) {
_createClass(Button, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$1;
}
}]);
+
return Button;
}();
/**
@@ -31507,18 +31675,18 @@ var Button = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) {
+ $(document).on(Event$1.CLICK_DATA_API, Selector$1.DATA_TOGGLE_CARROT, function (event) {
event.preventDefault();
var button = event.target;
- if (!$$$1(button).hasClass(ClassName.BUTTON)) {
- button = $$$1(button).closest(Selector.BUTTON);
+ if (!$(button).hasClass(ClassName$1.BUTTON)) {
+ button = $(button).closest(Selector$1.BUTTON);
}
- Button._jQueryInterface.call($$$1(button), 'toggle');
- }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) {
- var button = $$$1(event.target).closest(Selector.BUTTON)[0];
- $$$1(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type));
+ Button._jQueryInterface.call($(button), 'toggle');
+ }).on(Event$1.FOCUS_BLUR_DATA_API, Selector$1.DATA_TOGGLE_CARROT, function (event) {
+ var button = $(event.target).closest(Selector$1.BUTTON)[0];
+ $(button).toggleClass(ClassName$1.FOCUS, /^focus(in)?$/.test(event.type));
});
/**
* ------------------------------------------------------------------------
@@ -31526,56 +31694,48 @@ var Button = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Button._jQueryInterface;
- $$$1.fn[NAME].Constructor = Button;
+ $.fn[NAME$1] = Button._jQueryInterface;
+ $.fn[NAME$1].Constructor = Button;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$1].noConflict = function () {
+ $.fn[NAME$1] = JQUERY_NO_CONFLICT$1;
return Button._jQueryInterface;
};
- return Button;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): carousel.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Carousel = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'carousel';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.carousel';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 600;
+
+ var NAME$2 = 'carousel';
+ var VERSION$2 = '4.2.1';
+ var DATA_KEY$2 = 'bs.carousel';
+ var EVENT_KEY$2 = "." + DATA_KEY$2;
+ var DATA_API_KEY$2 = '.data-api';
+ var JQUERY_NO_CONFLICT$2 = $.fn[NAME$2];
var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
+ var SWIPE_THRESHOLD = 40;
var Default = {
interval: 5000,
keyboard: true,
slide: false,
pause: 'hover',
- wrap: true
+ wrap: true,
+ touch: true
};
var DefaultType = {
interval: '(number|boolean)',
keyboard: 'boolean',
slide: '(boolean|string)',
pause: '(string|boolean)',
- wrap: 'boolean'
+ wrap: 'boolean',
+ touch: 'boolean'
};
var Direction = {
NEXT: 'next',
@@ -31583,17 +31743,22 @@ var Carousel = function ($$$1) {
LEFT: 'left',
RIGHT: 'right'
};
- var Event = {
- SLIDE: "slide" + EVENT_KEY,
- SLID: "slid" + EVENT_KEY,
- KEYDOWN: "keydown" + EVENT_KEY,
- MOUSEENTER: "mouseenter" + EVENT_KEY,
- MOUSELEAVE: "mouseleave" + EVENT_KEY,
- TOUCHEND: "touchend" + EVENT_KEY,
- LOAD_DATA_API: "load" + EVENT_KEY + DATA_API_KEY,
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY
+ var Event$2 = {
+ SLIDE: "slide" + EVENT_KEY$2,
+ SLID: "slid" + EVENT_KEY$2,
+ KEYDOWN: "keydown" + EVENT_KEY$2,
+ MOUSEENTER: "mouseenter" + EVENT_KEY$2,
+ MOUSELEAVE: "mouseleave" + EVENT_KEY$2,
+ TOUCHSTART: "touchstart" + EVENT_KEY$2,
+ TOUCHMOVE: "touchmove" + EVENT_KEY$2,
+ TOUCHEND: "touchend" + EVENT_KEY$2,
+ POINTERDOWN: "pointerdown" + EVENT_KEY$2,
+ POINTERUP: "pointerup" + EVENT_KEY$2,
+ DRAG_START: "dragstart" + EVENT_KEY$2,
+ LOAD_DATA_API: "load" + EVENT_KEY$2 + DATA_API_KEY$2,
+ CLICK_DATA_API: "click" + EVENT_KEY$2 + DATA_API_KEY$2
};
- var ClassName = {
+ var ClassName$2 = {
CAROUSEL: 'carousel',
ACTIVE: 'active',
SLIDE: 'slide',
@@ -31601,16 +31766,22 @@ var Carousel = function ($$$1) {
LEFT: 'carousel-item-left',
NEXT: 'carousel-item-next',
PREV: 'carousel-item-prev',
- ITEM: 'carousel-item'
+ ITEM: 'carousel-item',
+ POINTER_EVENT: 'pointer-event'
};
- var Selector = {
+ var Selector$2 = {
ACTIVE: '.active',
ACTIVE_ITEM: '.active.carousel-item',
ITEM: '.carousel-item',
+ ITEM_IMG: '.carousel-item img',
NEXT_PREV: '.carousel-item-next, .carousel-item-prev',
INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]'
+ };
+ var PointerType = {
+ TOUCH: 'touch',
+ PEN: 'pen'
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -31629,9 +31800,13 @@ var Carousel = function ($$$1) {
this._isPaused = false;
this._isSliding = false;
this.touchTimeout = null;
+ this.touchStartX = 0;
+ this.touchDeltaX = 0;
this._config = this._getConfig(config);
- this._element = $$$1(element)[0];
- this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0];
+ this._element = element;
+ this._indicatorsElement = this._element.querySelector(Selector$2.INDICATORS);
+ this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
+ this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent);
this._addEventListeners();
} // Getters
@@ -31649,7 +31824,7 @@ var Carousel = function ($$$1) {
_proto.nextWhenVisible = function nextWhenVisible() {
// Don't call next when the page isn't visible
// or the carousel or its parent isn't visible
- if (!document.hidden && $$$1(this._element).is(':visible') && $$$1(this._element).css('visibility') !== 'hidden') {
+ if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') {
this.next();
}
};
@@ -31665,7 +31840,7 @@ var Carousel = function ($$$1) {
this._isPaused = true;
}
- if ($$$1(this._element).find(Selector.NEXT_PREV)[0] && Util.supportsTransitionEnd()) {
+ if (this._element.querySelector(Selector$2.NEXT_PREV)) {
Util.triggerTransitionEnd(this._element);
this.cycle(true);
}
@@ -31692,7 +31867,7 @@ var Carousel = function ($$$1) {
_proto.to = function to(index) {
var _this = this;
- this._activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0];
+ this._activeElement = this._element.querySelector(Selector$2.ACTIVE_ITEM);
var activeIndex = this._getItemIndex(this._activeElement);
@@ -31701,7 +31876,7 @@ var Carousel = function ($$$1) {
}
if (this._isSliding) {
- $$$1(this._element).one(Event.SLID, function () {
+ $(this._element).one(Event$2.SLID, function () {
return _this.to(index);
});
return;
@@ -31719,8 +31894,8 @@ var Carousel = function ($$$1) {
};
_proto.dispose = function dispose() {
- $$$1(this._element).off(EVENT_KEY);
- $$$1.removeData(this._element, DATA_KEY);
+ $(this._element).off(EVENT_KEY$2);
+ $.removeData(this._element, DATA_KEY$2);
this._items = null;
this._config = null;
this._element = null;
@@ -31733,28 +31908,82 @@ var Carousel = function ($$$1) {
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, Default, config);
- Util.typeCheckConfig(NAME, config, DefaultType);
+ config = _objectSpread({}, Default, config);
+ Util.typeCheckConfig(NAME$2, config, DefaultType);
return config;
};
+ _proto._handleSwipe = function _handleSwipe() {
+ var absDeltax = Math.abs(this.touchDeltaX);
+
+ if (absDeltax <= SWIPE_THRESHOLD) {
+ return;
+ }
+
+ var direction = absDeltax / this.touchDeltaX; // swipe left
+
+ if (direction > 0) {
+ this.prev();
+ } // swipe right
+
+
+ if (direction < 0) {
+ this.next();
+ }
+ };
+
_proto._addEventListeners = function _addEventListeners() {
var _this2 = this;
if (this._config.keyboard) {
- $$$1(this._element).on(Event.KEYDOWN, function (event) {
+ $(this._element).on(Event$2.KEYDOWN, function (event) {
return _this2._keydown(event);
});
}
if (this._config.pause === 'hover') {
- $$$1(this._element).on(Event.MOUSEENTER, function (event) {
+ $(this._element).on(Event$2.MOUSEENTER, function (event) {
return _this2.pause(event);
- }).on(Event.MOUSELEAVE, function (event) {
+ }).on(Event$2.MOUSELEAVE, function (event) {
return _this2.cycle(event);
});
+ }
- if ('ontouchstart' in document.documentElement) {
+ this._addTouchEventListeners();
+ };
+
+ _proto._addTouchEventListeners = function _addTouchEventListeners() {
+ var _this3 = this;
+
+ if (!this._touchSupported) {
+ return;
+ }
+
+ var start = function start(event) {
+ if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+ _this3.touchStartX = event.originalEvent.clientX;
+ } else if (!_this3._pointerEvent) {
+ _this3.touchStartX = event.originalEvent.touches[0].clientX;
+ }
+ };
+
+ var move = function move(event) {
+ // ensure swiping with one touch and not pinching
+ if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
+ _this3.touchDeltaX = 0;
+ } else {
+ _this3.touchDeltaX = event.originalEvent.touches[0].clientX - _this3.touchStartX;
+ }
+ };
+
+ var end = function end(event) {
+ if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+ _this3.touchDeltaX = event.originalEvent.clientX - _this3.touchStartX;
+ }
+
+ _this3._handleSwipe();
+
+ if (_this3._config.pause === 'hover') {
// If it's a touch-enabled device, mouseenter/leave are fired as
// part of the mouse compatibility events on first tap - the carousel
// would stop cycling until user tapped out of it;
@@ -31762,18 +31991,41 @@ var Carousel = function ($$$1) {
// (as if it's the second time we tap on it, mouseenter compat event
// is NOT fired) and after a timeout (to allow for mouse compatibility
// events to fire) we explicitly restart cycling
- $$$1(this._element).on(Event.TOUCHEND, function () {
- _this2.pause();
+ _this3.pause();
- if (_this2.touchTimeout) {
- clearTimeout(_this2.touchTimeout);
- }
+ if (_this3.touchTimeout) {
+ clearTimeout(_this3.touchTimeout);
+ }
- _this2.touchTimeout = setTimeout(function (event) {
- return _this2.cycle(event);
- }, TOUCHEVENT_COMPAT_WAIT + _this2._config.interval);
- });
+ _this3.touchTimeout = setTimeout(function (event) {
+ return _this3.cycle(event);
+ }, TOUCHEVENT_COMPAT_WAIT + _this3._config.interval);
}
+ };
+
+ $(this._element.querySelectorAll(Selector$2.ITEM_IMG)).on(Event$2.DRAG_START, function (e) {
+ return e.preventDefault();
+ });
+
+ if (this._pointerEvent) {
+ $(this._element).on(Event$2.POINTERDOWN, function (event) {
+ return start(event);
+ });
+ $(this._element).on(Event$2.POINTERUP, function (event) {
+ return end(event);
+ });
+
+ this._element.classList.add(ClassName$2.POINTER_EVENT);
+ } else {
+ $(this._element).on(Event$2.TOUCHSTART, function (event) {
+ return start(event);
+ });
+ $(this._element).on(Event$2.TOUCHMOVE, function (event) {
+ return move(event);
+ });
+ $(this._element).on(Event$2.TOUCHEND, function (event) {
+ return end(event);
+ });
}
};
@@ -31798,7 +32050,7 @@ var Carousel = function ($$$1) {
};
_proto._getItemIndex = function _getItemIndex(element) {
- this._items = $$$1.makeArray($$$1(element).parent().find(Selector.ITEM));
+ this._items = element && element.parentNode ? [].slice.call(element.parentNode.querySelectorAll(Selector$2.ITEM)) : [];
return this._items.indexOf(element);
};
@@ -31823,34 +32075,35 @@ var Carousel = function ($$$1) {
_proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
var targetIndex = this._getItemIndex(relatedTarget);
- var fromIndex = this._getItemIndex($$$1(this._element).find(Selector.ACTIVE_ITEM)[0]);
+ var fromIndex = this._getItemIndex(this._element.querySelector(Selector$2.ACTIVE_ITEM));
- var slideEvent = $$$1.Event(Event.SLIDE, {
+ var slideEvent = $.Event(Event$2.SLIDE, {
relatedTarget: relatedTarget,
direction: eventDirectionName,
from: fromIndex,
to: targetIndex
});
- $$$1(this._element).trigger(slideEvent);
+ $(this._element).trigger(slideEvent);
return slideEvent;
};
_proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) {
if (this._indicatorsElement) {
- $$$1(this._indicatorsElement).find(Selector.ACTIVE).removeClass(ClassName.ACTIVE);
+ var indicators = [].slice.call(this._indicatorsElement.querySelectorAll(Selector$2.ACTIVE));
+ $(indicators).removeClass(ClassName$2.ACTIVE);
var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)];
if (nextIndicator) {
- $$$1(nextIndicator).addClass(ClassName.ACTIVE);
+ $(nextIndicator).addClass(ClassName$2.ACTIVE);
}
}
};
_proto._slide = function _slide(direction, element) {
- var _this3 = this;
+ var _this4 = this;
- var activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0];
+ var activeElement = this._element.querySelector(Selector$2.ACTIVE_ITEM);
var activeElementIndex = this._getItemIndex(activeElement);
@@ -31864,16 +32117,16 @@ var Carousel = function ($$$1) {
var eventDirectionName;
if (direction === Direction.NEXT) {
- directionalClassName = ClassName.LEFT;
- orderClassName = ClassName.NEXT;
+ directionalClassName = ClassName$2.LEFT;
+ orderClassName = ClassName$2.NEXT;
eventDirectionName = Direction.LEFT;
} else {
- directionalClassName = ClassName.RIGHT;
- orderClassName = ClassName.PREV;
+ directionalClassName = ClassName$2.RIGHT;
+ orderClassName = ClassName$2.PREV;
eventDirectionName = Direction.RIGHT;
}
- if (nextElement && $$$1(nextElement).hasClass(ClassName.ACTIVE)) {
+ if (nextElement && $(nextElement).hasClass(ClassName$2.ACTIVE)) {
this._isSliding = false;
return;
}
@@ -31897,31 +32150,41 @@ var Carousel = function ($$$1) {
this._setActiveIndicatorElement(nextElement);
- var slidEvent = $$$1.Event(Event.SLID, {
+ var slidEvent = $.Event(Event$2.SLID, {
relatedTarget: nextElement,
direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
});
- if (Util.supportsTransitionEnd() && $$$1(this._element).hasClass(ClassName.SLIDE)) {
- $$$1(nextElement).addClass(orderClassName);
+ if ($(this._element).hasClass(ClassName$2.SLIDE)) {
+ $(nextElement).addClass(orderClassName);
Util.reflow(nextElement);
- $$$1(activeElement).addClass(directionalClassName);
- $$$1(nextElement).addClass(directionalClassName);
- $$$1(activeElement).one(Util.TRANSITION_END, function () {
- $$$1(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(ClassName.ACTIVE);
- $$$1(activeElement).removeClass(ClassName.ACTIVE + " " + orderClassName + " " + directionalClassName);
- _this3._isSliding = false;
+ $(activeElement).addClass(directionalClassName);
+ $(nextElement).addClass(directionalClassName);
+ var nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10);
+
+ if (nextElementInterval) {
+ this._config.defaultInterval = this._config.defaultInterval || this._config.interval;
+ this._config.interval = nextElementInterval;
+ } else {
+ this._config.interval = this._config.defaultInterval || this._config.interval;
+ }
+
+ var transitionDuration = Util.getTransitionDurationFromElement(activeElement);
+ $(activeElement).one(Util.TRANSITION_END, function () {
+ $(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(ClassName$2.ACTIVE);
+ $(activeElement).removeClass(ClassName$2.ACTIVE + " " + orderClassName + " " + directionalClassName);
+ _this4._isSliding = false;
setTimeout(function () {
- return $$$1(_this3._element).trigger(slidEvent);
+ return $(_this4._element).trigger(slidEvent);
}, 0);
- }).emulateTransitionEnd(TRANSITION_DURATION);
+ }).emulateTransitionEnd(transitionDuration);
} else {
- $$$1(activeElement).removeClass(ClassName.ACTIVE);
- $$$1(nextElement).addClass(ClassName.ACTIVE);
+ $(activeElement).removeClass(ClassName$2.ACTIVE);
+ $(nextElement).addClass(ClassName$2.ACTIVE);
this._isSliding = false;
- $$$1(this._element).trigger(slidEvent);
+ $(this._element).trigger(slidEvent);
}
if (isCycling) {
@@ -31932,19 +32195,19 @@ var Carousel = function ($$$1) {
Carousel._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$2);
- var _config = _extends({}, Default, $$$1(this).data());
+ var _config = _objectSpread({}, Default, $(this).data());
if (typeof config === 'object') {
- _config = _extends({}, _config, config);
+ _config = _objectSpread({}, _config, config);
}
var action = typeof config === 'string' ? config : _config.slide;
if (!data) {
data = new Carousel(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$2, data);
}
if (typeof config === 'number') {
@@ -31969,23 +32232,24 @@ var Carousel = function ($$$1) {
return;
}
- var target = $$$1(selector)[0];
+ var target = $(selector)[0];
- if (!target || !$$$1(target).hasClass(ClassName.CAROUSEL)) {
+ if (!target || !$(target).hasClass(ClassName$2.CAROUSEL)) {
return;
}
- var config = _extends({}, $$$1(target).data(), $$$1(this).data());
+ var config = _objectSpread({}, $(target).data(), $(this).data());
+
var slideIndex = this.getAttribute('data-slide-to');
if (slideIndex) {
config.interval = false;
}
- Carousel._jQueryInterface.call($$$1(target), config);
+ Carousel._jQueryInterface.call($(target), config);
if (slideIndex) {
- $$$1(target).data(DATA_KEY).to(slideIndex);
+ $(target).data(DATA_KEY$2).to(slideIndex);
}
event.preventDefault();
@@ -31994,7 +32258,7 @@ var Carousel = function ($$$1) {
_createClass(Carousel, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$2;
}
}, {
key: "Default",
@@ -32002,6 +32266,7 @@ var Carousel = function ($$$1) {
return Default;
}
}]);
+
return Carousel;
}();
/**
@@ -32011,13 +32276,15 @@ var Carousel = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler);
- $$$1(window).on(Event.LOAD_DATA_API, function () {
- $$$1(Selector.DATA_RIDE).each(function () {
- var $carousel = $$$1(this);
+ $(document).on(Event$2.CLICK_DATA_API, Selector$2.DATA_SLIDE, Carousel._dataApiClickHandler);
+ $(window).on(Event$2.LOAD_DATA_API, function () {
+ var carousels = [].slice.call(document.querySelectorAll(Selector$2.DATA_RIDE));
+
+ for (var i = 0, len = carousels.length; i < len; i++) {
+ var $carousel = $(carousels[i]);
Carousel._jQueryInterface.call($carousel, $carousel.data());
- });
+ }
});
/**
* ------------------------------------------------------------------------
@@ -32025,53 +32292,42 @@ var Carousel = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Carousel._jQueryInterface;
- $$$1.fn[NAME].Constructor = Carousel;
+ $.fn[NAME$2] = Carousel._jQueryInterface;
+ $.fn[NAME$2].Constructor = Carousel;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$2].noConflict = function () {
+ $.fn[NAME$2] = JQUERY_NO_CONFLICT$2;
return Carousel._jQueryInterface;
};
- return Carousel;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): collapse.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Collapse = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'collapse';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.collapse';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 600;
- var Default = {
+
+ var NAME$3 = 'collapse';
+ var VERSION$3 = '4.2.1';
+ var DATA_KEY$3 = 'bs.collapse';
+ var EVENT_KEY$3 = "." + DATA_KEY$3;
+ var DATA_API_KEY$3 = '.data-api';
+ var JQUERY_NO_CONFLICT$3 = $.fn[NAME$3];
+ var Default$1 = {
toggle: true,
parent: ''
};
- var DefaultType = {
+ var DefaultType$1 = {
toggle: 'boolean',
parent: '(string|element)'
};
- var Event = {
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY
+ var Event$3 = {
+ SHOW: "show" + EVENT_KEY$3,
+ SHOWN: "shown" + EVENT_KEY$3,
+ HIDE: "hide" + EVENT_KEY$3,
+ HIDDEN: "hidden" + EVENT_KEY$3,
+ CLICK_DATA_API: "click" + EVENT_KEY$3 + DATA_API_KEY$3
};
- var ClassName = {
+ var ClassName$3 = {
SHOW: 'show',
COLLAPSE: 'collapse',
COLLAPSING: 'collapsing',
@@ -32081,7 +32337,7 @@ var Collapse = function ($$$1) {
WIDTH: 'width',
HEIGHT: 'height'
};
- var Selector = {
+ var Selector$3 = {
ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]'
/**
@@ -32099,14 +32355,17 @@ var Collapse = function ($$$1) {
this._isTransitioning = false;
this._element = element;
this._config = this._getConfig(config);
- this._triggerArray = $$$1.makeArray($$$1("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]")));
- var tabToggles = $$$1(Selector.DATA_TOGGLE);
+ this._triggerArray = [].slice.call(document.querySelectorAll("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]")));
+ var toggleList = [].slice.call(document.querySelectorAll(Selector$3.DATA_TOGGLE));
- for (var i = 0; i < tabToggles.length; i++) {
- var elem = tabToggles[i];
+ for (var i = 0, len = toggleList.length; i < len; i++) {
+ var elem = toggleList[i];
var selector = Util.getSelectorFromElement(elem);
+ var filterElement = [].slice.call(document.querySelectorAll(selector)).filter(function (foundElem) {
+ return foundElem === element;
+ });
- if (selector !== null && $$$1(selector).filter(element).length > 0) {
+ if (selector !== null && filterElement.length > 0) {
this._selector = selector;
this._triggerArray.push(elem);
@@ -32129,7 +32388,7 @@ var Collapse = function ($$$1) {
// Public
_proto.toggle = function toggle() {
- if ($$$1(this._element).hasClass(ClassName.SHOW)) {
+ if ($(this._element).hasClass(ClassName$3.SHOW)) {
this.hide();
} else {
this.show();
@@ -32139,7 +32398,7 @@ var Collapse = function ($$$1) {
_proto.show = function show() {
var _this = this;
- if (this._isTransitioning || $$$1(this._element).hasClass(ClassName.SHOW)) {
+ if (this._isTransitioning || $(this._element).hasClass(ClassName$3.SHOW)) {
return;
}
@@ -32147,7 +32406,13 @@ var Collapse = function ($$$1) {
var activesData;
if (this._parent) {
- actives = $$$1.makeArray($$$1(this._parent).find(Selector.ACTIVES).filter("[data-parent=\"" + this._config.parent + "\"]"));
+ actives = [].slice.call(this._parent.querySelectorAll(Selector$3.ACTIVES)).filter(function (elem) {
+ if (typeof _this._config.parent === 'string') {
+ return elem.getAttribute('data-parent') === _this._config.parent;
+ }
+
+ return elem.classList.contains(ClassName$3.COLLAPSE);
+ });
if (actives.length === 0) {
actives = null;
@@ -32155,68 +32420,64 @@ var Collapse = function ($$$1) {
}
if (actives) {
- activesData = $$$1(actives).not(this._selector).data(DATA_KEY);
+ activesData = $(actives).not(this._selector).data(DATA_KEY$3);
if (activesData && activesData._isTransitioning) {
return;
}
}
- var startEvent = $$$1.Event(Event.SHOW);
- $$$1(this._element).trigger(startEvent);
+ var startEvent = $.Event(Event$3.SHOW);
+ $(this._element).trigger(startEvent);
if (startEvent.isDefaultPrevented()) {
return;
}
if (actives) {
- Collapse._jQueryInterface.call($$$1(actives).not(this._selector), 'hide');
+ Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
if (!activesData) {
- $$$1(actives).data(DATA_KEY, null);
+ $(actives).data(DATA_KEY$3, null);
}
}
var dimension = this._getDimension();
- $$$1(this._element).removeClass(ClassName.COLLAPSE).addClass(ClassName.COLLAPSING);
+ $(this._element).removeClass(ClassName$3.COLLAPSE).addClass(ClassName$3.COLLAPSING);
this._element.style[dimension] = 0;
- if (this._triggerArray.length > 0) {
- $$$1(this._triggerArray).removeClass(ClassName.COLLAPSED).attr('aria-expanded', true);
+ if (this._triggerArray.length) {
+ $(this._triggerArray).removeClass(ClassName$3.COLLAPSED).attr('aria-expanded', true);
}
this.setTransitioning(true);
var complete = function complete() {
- $$$1(_this._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.SHOW);
+ $(_this._element).removeClass(ClassName$3.COLLAPSING).addClass(ClassName$3.COLLAPSE).addClass(ClassName$3.SHOW);
_this._element.style[dimension] = '';
_this.setTransitioning(false);
- $$$1(_this._element).trigger(Event.SHOWN);
+ $(_this._element).trigger(Event$3.SHOWN);
};
- if (!Util.supportsTransitionEnd()) {
- complete();
- return;
- }
-
var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
var scrollSize = "scroll" + capitalizedDimension;
- $$$1(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
+ var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+ $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
this._element.style[dimension] = this._element[scrollSize] + "px";
};
_proto.hide = function hide() {
var _this2 = this;
- if (this._isTransitioning || !$$$1(this._element).hasClass(ClassName.SHOW)) {
+ if (this._isTransitioning || !$(this._element).hasClass(ClassName$3.SHOW)) {
return;
}
- var startEvent = $$$1.Event(Event.HIDE);
- $$$1(this._element).trigger(startEvent);
+ var startEvent = $.Event(Event$3.HIDE);
+ $(this._element).trigger(startEvent);
if (startEvent.isDefaultPrevented()) {
return;
@@ -32226,18 +32487,19 @@ var Collapse = function ($$$1) {
this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px";
Util.reflow(this._element);
- $$$1(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.SHOW);
+ $(this._element).addClass(ClassName$3.COLLAPSING).removeClass(ClassName$3.COLLAPSE).removeClass(ClassName$3.SHOW);
+ var triggerArrayLength = this._triggerArray.length;
- if (this._triggerArray.length > 0) {
- for (var i = 0; i < this._triggerArray.length; i++) {
+ if (triggerArrayLength > 0) {
+ for (var i = 0; i < triggerArrayLength; i++) {
var trigger = this._triggerArray[i];
var selector = Util.getSelectorFromElement(trigger);
if (selector !== null) {
- var $elem = $$$1(selector);
+ var $elem = $([].slice.call(document.querySelectorAll(selector)));
- if (!$elem.hasClass(ClassName.SHOW)) {
- $$$1(trigger).addClass(ClassName.COLLAPSED).attr('aria-expanded', false);
+ if (!$elem.hasClass(ClassName$3.SHOW)) {
+ $(trigger).addClass(ClassName$3.COLLAPSED).attr('aria-expanded', false);
}
}
}
@@ -32248,17 +32510,12 @@ var Collapse = function ($$$1) {
var complete = function complete() {
_this2.setTransitioning(false);
- $$$1(_this2._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).trigger(Event.HIDDEN);
+ $(_this2._element).removeClass(ClassName$3.COLLAPSING).addClass(ClassName$3.COLLAPSE).trigger(Event$3.HIDDEN);
};
this._element.style[dimension] = '';
-
- if (!Util.supportsTransitionEnd()) {
- complete();
- return;
- }
-
- $$$1(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
+ var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+ $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
};
_proto.setTransitioning = function setTransitioning(isTransitioning) {
@@ -32266,7 +32523,7 @@ var Collapse = function ($$$1) {
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
+ $.removeData(this._element, DATA_KEY$3);
this._config = null;
this._parent = null;
this._element = null;
@@ -32276,22 +32533,22 @@ var Collapse = function ($$$1) {
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, Default, config);
+ config = _objectSpread({}, Default$1, config);
config.toggle = Boolean(config.toggle); // Coerce string values
- Util.typeCheckConfig(NAME, config, DefaultType);
+ Util.typeCheckConfig(NAME$3, config, DefaultType$1);
return config;
};
_proto._getDimension = function _getDimension() {
- var hasWidth = $$$1(this._element).hasClass(Dimension.WIDTH);
+ var hasWidth = $(this._element).hasClass(Dimension.WIDTH);
return hasWidth ? Dimension.WIDTH : Dimension.HEIGHT;
};
_proto._getParent = function _getParent() {
var _this3 = this;
- var parent = null;
+ var parent;
if (Util.isElement(this._config.parent)) {
parent = this._config.parent; // It's a jQuery object
@@ -32300,38 +32557,37 @@ var Collapse = function ($$$1) {
parent = this._config.parent[0];
}
} else {
- parent = $$$1(this._config.parent)[0];
+ parent = document.querySelector(this._config.parent);
}
var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]";
- $$$1(parent).find(selector).each(function (i, element) {
+ var children = [].slice.call(parent.querySelectorAll(selector));
+ $(children).each(function (i, element) {
_this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]);
});
return parent;
};
_proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
- if (element) {
- var isOpen = $$$1(element).hasClass(ClassName.SHOW);
+ var isOpen = $(element).hasClass(ClassName$3.SHOW);
- if (triggerArray.length > 0) {
- $$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
- }
+ if (triggerArray.length) {
+ $(triggerArray).toggleClass(ClassName$3.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
}; // Static
Collapse._getTargetFromElement = function _getTargetFromElement(element) {
var selector = Util.getSelectorFromElement(element);
- return selector ? $$$1(selector)[0] : null;
+ return selector ? document.querySelector(selector) : null;
};
Collapse._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var $this = $$$1(this);
- var data = $this.data(DATA_KEY);
+ var $this = $(this);
+ var data = $this.data(DATA_KEY$3);
- var _config = _extends({}, Default, $this.data(), typeof config === 'object' && config);
+ var _config = _objectSpread({}, Default$1, $this.data(), typeof config === 'object' && config ? config : {});
if (!data && _config.toggle && /show|hide/.test(config)) {
_config.toggle = false;
@@ -32339,7 +32595,7 @@ var Collapse = function ($$$1) {
if (!data) {
data = new Collapse(this, _config);
- $this.data(DATA_KEY, data);
+ $this.data(DATA_KEY$3, data);
}
if (typeof config === 'string') {
@@ -32355,14 +32611,15 @@ var Collapse = function ($$$1) {
_createClass(Collapse, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$3;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$1;
}
}]);
+
return Collapse;
}();
/**
@@ -32372,17 +32629,18 @@ var Collapse = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
+ $(document).on(Event$3.CLICK_DATA_API, Selector$3.DATA_TOGGLE, function (event) {
// preventDefault only for <a> elements (which change the URL) not inside the collapsible element
if (event.currentTarget.tagName === 'A') {
event.preventDefault();
}
- var $trigger = $$$1(this);
+ var $trigger = $(this);
var selector = Util.getSelectorFromElement(this);
- $$$1(selector).each(function () {
- var $target = $$$1(this);
- var data = $target.data(DATA_KEY);
+ var selectors = [].slice.call(document.querySelectorAll(selector));
+ $(selectors).each(function () {
+ var $target = $(this);
+ var data = $target.data(DATA_KEY$3);
var config = data ? 'toggle' : $trigger.data();
Collapse._jQueryInterface.call($target, config);
@@ -32394,36 +32652,26 @@ var Collapse = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Collapse._jQueryInterface;
- $$$1.fn[NAME].Constructor = Collapse;
+ $.fn[NAME$3] = Collapse._jQueryInterface;
+ $.fn[NAME$3].Constructor = Collapse;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$3].noConflict = function () {
+ $.fn[NAME$3] = JQUERY_NO_CONFLICT$3;
return Collapse._jQueryInterface;
};
- return Collapse;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): dropdown.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Dropdown = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'dropdown';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.dropdown';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
+
+ var NAME$4 = 'dropdown';
+ var VERSION$4 = '4.2.1';
+ var DATA_KEY$4 = 'bs.dropdown';
+ var EVENT_KEY$4 = "." + DATA_KEY$4;
+ var DATA_API_KEY$4 = '.data-api';
+ var JQUERY_NO_CONFLICT$4 = $.fn[NAME$4];
var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key
@@ -32437,17 +32685,17 @@ var Dropdown = function ($$$1) {
var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse)
var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE);
- var Event = {
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- CLICK: "click" + EVENT_KEY,
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY,
- KEYDOWN_DATA_API: "keydown" + EVENT_KEY + DATA_API_KEY,
- KEYUP_DATA_API: "keyup" + EVENT_KEY + DATA_API_KEY
+ var Event$4 = {
+ HIDE: "hide" + EVENT_KEY$4,
+ HIDDEN: "hidden" + EVENT_KEY$4,
+ SHOW: "show" + EVENT_KEY$4,
+ SHOWN: "shown" + EVENT_KEY$4,
+ CLICK: "click" + EVENT_KEY$4,
+ CLICK_DATA_API: "click" + EVENT_KEY$4 + DATA_API_KEY$4,
+ KEYDOWN_DATA_API: "keydown" + EVENT_KEY$4 + DATA_API_KEY$4,
+ KEYUP_DATA_API: "keyup" + EVENT_KEY$4 + DATA_API_KEY$4
};
- var ClassName = {
+ var ClassName$4 = {
DISABLED: 'disabled',
SHOW: 'show',
DROPUP: 'dropup',
@@ -32457,12 +32705,12 @@ var Dropdown = function ($$$1) {
MENULEFT: 'dropdown-menu-left',
POSITION_STATIC: 'position-static'
};
- var Selector = {
+ var Selector$4 = {
DATA_TOGGLE: '[data-toggle="dropdown"]',
FORM_CHILD: '.dropdown form',
MENU: '.dropdown-menu',
NAVBAR_NAV: '.navbar-nav',
- VISIBLE_ITEMS: '.dropdown-menu .dropdown-item:not(.disabled)'
+ VISIBLE_ITEMS: '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)'
};
var AttachmentMap = {
TOP: 'top-start',
@@ -32474,15 +32722,19 @@ var Dropdown = function ($$$1) {
LEFT: 'left-start',
LEFTEND: 'left-end'
};
- var Default = {
+ var Default$2 = {
offset: 0,
flip: true,
- boundary: 'scrollParent'
+ boundary: 'scrollParent',
+ reference: 'toggle',
+ display: 'dynamic'
};
- var DefaultType = {
+ var DefaultType$2 = {
offset: '(number|string|function)',
flip: 'boolean',
- boundary: '(string|element)'
+ boundary: '(string|element)',
+ reference: '(string|element)',
+ display: 'string'
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -32509,13 +32761,13 @@ var Dropdown = function ($$$1) {
// Public
_proto.toggle = function toggle() {
- if (this._element.disabled || $$$1(this._element).hasClass(ClassName.DISABLED)) {
+ if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED)) {
return;
}
var parent = Dropdown._getParentFromElement(this._element);
- var isActive = $$$1(this._menu).hasClass(ClassName.SHOW);
+ var isActive = $(this._menu).hasClass(ClassName$4.SHOW);
Dropdown._clearMenus();
@@ -32526,8 +32778,8 @@ var Dropdown = function ($$$1) {
var relatedTarget = {
relatedTarget: this._element
};
- var showEvent = $$$1.Event(Event.SHOW, relatedTarget);
- $$$1(parent).trigger(showEvent);
+ var showEvent = $.Event(Event$4.SHOW, relatedTarget);
+ $(parent).trigger(showEvent);
if (showEvent.isDefaultPrevented()) {
return;
@@ -32540,14 +32792,18 @@ var Dropdown = function ($$$1) {
* Popper - https://popper.js.org
*/
if (typeof Popper === 'undefined') {
- throw new TypeError('Bootstrap dropdown require Popper.js (https://popper.js.org)');
+ throw new TypeError('Bootstrap\'s dropdowns require Popper.js (https://popper.js.org/)');
}
- var element = this._element; // For dropup with alignment we use the parent as popper container
+ var referenceElement = this._element;
- if ($$$1(parent).hasClass(ClassName.DROPUP)) {
- if ($$$1(this._menu).hasClass(ClassName.MENULEFT) || $$$1(this._menu).hasClass(ClassName.MENURIGHT)) {
- element = parent;
+ if (this._config.reference === 'parent') {
+ referenceElement = parent;
+ } else if (Util.isElement(this._config.reference)) {
+ referenceElement = this._config.reference; // Check if it's jQuery element
+
+ if (typeof this._config.reference.jquery !== 'undefined') {
+ referenceElement = this._config.reference[0];
}
} // If boundary is not `scrollParent`, then set position to `static`
// to allow the menu to "escape" the scroll parent's boundaries
@@ -32555,31 +32811,75 @@ var Dropdown = function ($$$1) {
if (this._config.boundary !== 'scrollParent') {
- $$$1(parent).addClass(ClassName.POSITION_STATIC);
+ $(parent).addClass(ClassName$4.POSITION_STATIC);
}
- this._popper = new Popper(element, this._menu, this._getPopperConfig());
+ this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig());
} // If this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
- if ('ontouchstart' in document.documentElement && $$$1(parent).closest(Selector.NAVBAR_NAV).length === 0) {
- $$$1('body').children().on('mouseover', null, $$$1.noop);
+ if ('ontouchstart' in document.documentElement && $(parent).closest(Selector$4.NAVBAR_NAV).length === 0) {
+ $(document.body).children().on('mouseover', null, $.noop);
}
this._element.focus();
this._element.setAttribute('aria-expanded', true);
- $$$1(this._menu).toggleClass(ClassName.SHOW);
- $$$1(parent).toggleClass(ClassName.SHOW).trigger($$$1.Event(Event.SHOWN, relatedTarget));
+ $(this._menu).toggleClass(ClassName$4.SHOW);
+ $(parent).toggleClass(ClassName$4.SHOW).trigger($.Event(Event$4.SHOWN, relatedTarget));
+ };
+
+ _proto.show = function show() {
+ if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED) || $(this._menu).hasClass(ClassName$4.SHOW)) {
+ return;
+ }
+
+ var relatedTarget = {
+ relatedTarget: this._element
+ };
+ var showEvent = $.Event(Event$4.SHOW, relatedTarget);
+
+ var parent = Dropdown._getParentFromElement(this._element);
+
+ $(parent).trigger(showEvent);
+
+ if (showEvent.isDefaultPrevented()) {
+ return;
+ }
+
+ $(this._menu).toggleClass(ClassName$4.SHOW);
+ $(parent).toggleClass(ClassName$4.SHOW).trigger($.Event(Event$4.SHOWN, relatedTarget));
+ };
+
+ _proto.hide = function hide() {
+ if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED) || !$(this._menu).hasClass(ClassName$4.SHOW)) {
+ return;
+ }
+
+ var relatedTarget = {
+ relatedTarget: this._element
+ };
+ var hideEvent = $.Event(Event$4.HIDE, relatedTarget);
+
+ var parent = Dropdown._getParentFromElement(this._element);
+
+ $(parent).trigger(hideEvent);
+
+ if (hideEvent.isDefaultPrevented()) {
+ return;
+ }
+
+ $(this._menu).toggleClass(ClassName$4.SHOW);
+ $(parent).toggleClass(ClassName$4.SHOW).trigger($.Event(Event$4.HIDDEN, relatedTarget));
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
- $$$1(this._element).off(EVENT_KEY);
+ $.removeData(this._element, DATA_KEY$4);
+ $(this._element).off(EVENT_KEY$4);
this._element = null;
this._menu = null;
@@ -32602,7 +32902,7 @@ var Dropdown = function ($$$1) {
_proto._addEventListeners = function _addEventListeners() {
var _this = this;
- $$$1(this._element).on(Event.CLICK, function (event) {
+ $(this._element).on(Event$4.CLICK, function (event) {
event.preventDefault();
event.stopPropagation();
@@ -32611,8 +32911,8 @@ var Dropdown = function ($$$1) {
};
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, this.constructor.Default, $$$1(this._element).data(), config);
- Util.typeCheckConfig(NAME, config, this.constructor.DefaultType);
+ config = _objectSpread({}, this.constructor.Default, $(this._element).data(), config);
+ Util.typeCheckConfig(NAME$4, config, this.constructor.DefaultType);
return config;
};
@@ -32620,27 +32920,29 @@ var Dropdown = function ($$$1) {
if (!this._menu) {
var parent = Dropdown._getParentFromElement(this._element);
- this._menu = $$$1(parent).find(Selector.MENU)[0];
+ if (parent) {
+ this._menu = parent.querySelector(Selector$4.MENU);
+ }
}
return this._menu;
};
_proto._getPlacement = function _getPlacement() {
- var $parentDropdown = $$$1(this._element).parent();
+ var $parentDropdown = $(this._element.parentNode);
var placement = AttachmentMap.BOTTOM; // Handle dropup
- if ($parentDropdown.hasClass(ClassName.DROPUP)) {
+ if ($parentDropdown.hasClass(ClassName$4.DROPUP)) {
placement = AttachmentMap.TOP;
- if ($$$1(this._menu).hasClass(ClassName.MENURIGHT)) {
+ if ($(this._menu).hasClass(ClassName$4.MENURIGHT)) {
placement = AttachmentMap.TOPEND;
}
- } else if ($parentDropdown.hasClass(ClassName.DROPRIGHT)) {
+ } else if ($parentDropdown.hasClass(ClassName$4.DROPRIGHT)) {
placement = AttachmentMap.RIGHT;
- } else if ($parentDropdown.hasClass(ClassName.DROPLEFT)) {
+ } else if ($parentDropdown.hasClass(ClassName$4.DROPLEFT)) {
placement = AttachmentMap.LEFT;
- } else if ($$$1(this._menu).hasClass(ClassName.MENURIGHT)) {
+ } else if ($(this._menu).hasClass(ClassName$4.MENURIGHT)) {
placement = AttachmentMap.BOTTOMEND;
}
@@ -32648,7 +32950,7 @@ var Dropdown = function ($$$1) {
};
_proto._detectNavbar = function _detectNavbar() {
- return $$$1(this._element).closest('.navbar').length > 0;
+ return $(this._element).closest('.navbar').length > 0;
};
_proto._getPopperConfig = function _getPopperConfig() {
@@ -32658,7 +32960,7 @@ var Dropdown = function ($$$1) {
if (typeof this._config.offset === 'function') {
offsetConf.fn = function (data) {
- data.offsets = _extends({}, data.offsets, _this2._config.offset(data.offsets) || {});
+ data.offsets = _objectSpread({}, data.offsets, _this2._config.offset(data.offsets) || {});
return data;
};
} else {
@@ -32675,21 +32977,29 @@ var Dropdown = function ($$$1) {
preventOverflow: {
boundariesElement: this._config.boundary
}
- }
+ } // Disable Popper.js if we have a static display
+
};
+
+ if (this._config.display === 'static') {
+ popperConfig.modifiers.applyStyle = {
+ enabled: false
+ };
+ }
+
return popperConfig;
}; // Static
Dropdown._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$4);
var _config = typeof config === 'object' ? config : null;
if (!data) {
data = new Dropdown(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$4, data);
}
if (typeof config === 'string') {
@@ -32707,32 +33017,36 @@ var Dropdown = function ($$$1) {
return;
}
- var toggles = $$$1.makeArray($$$1(Selector.DATA_TOGGLE));
+ var toggles = [].slice.call(document.querySelectorAll(Selector$4.DATA_TOGGLE));
- for (var i = 0; i < toggles.length; i++) {
+ for (var i = 0, len = toggles.length; i < len; i++) {
var parent = Dropdown._getParentFromElement(toggles[i]);
- var context = $$$1(toggles[i]).data(DATA_KEY);
+ var context = $(toggles[i]).data(DATA_KEY$4);
var relatedTarget = {
relatedTarget: toggles[i]
};
+ if (event && event.type === 'click') {
+ relatedTarget.clickEvent = event;
+ }
+
if (!context) {
continue;
}
var dropdownMenu = context._menu;
- if (!$$$1(parent).hasClass(ClassName.SHOW)) {
+ if (!$(parent).hasClass(ClassName$4.SHOW)) {
continue;
}
- if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $$$1.contains(parent, event.target)) {
+ if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $.contains(parent, event.target)) {
continue;
}
- var hideEvent = $$$1.Event(Event.HIDE, relatedTarget);
- $$$1(parent).trigger(hideEvent);
+ var hideEvent = $.Event(Event$4.HIDE, relatedTarget);
+ $(parent).trigger(hideEvent);
if (hideEvent.isDefaultPrevented()) {
continue;
@@ -32741,12 +33055,12 @@ var Dropdown = function ($$$1) {
if ('ontouchstart' in document.documentElement) {
- $$$1('body').children().off('mouseover', null, $$$1.noop);
+ $(document.body).children().off('mouseover', null, $.noop);
}
toggles[i].setAttribute('aria-expanded', 'false');
- $$$1(dropdownMenu).removeClass(ClassName.SHOW);
- $$$1(parent).removeClass(ClassName.SHOW).trigger($$$1.Event(Event.HIDDEN, relatedTarget));
+ $(dropdownMenu).removeClass(ClassName$4.SHOW);
+ $(parent).removeClass(ClassName$4.SHOW).trigger($.Event(Event$4.HIDDEN, relatedTarget));
}
};
@@ -32755,7 +33069,7 @@ var Dropdown = function ($$$1) {
var selector = Util.getSelectorFromElement(element);
if (selector) {
- parent = $$$1(selector)[0];
+ parent = document.querySelector(selector);
}
return parent || element.parentNode;
@@ -32770,32 +33084,32 @@ var Dropdown = function ($$$1) {
// - If key is other than escape
// - If key is not up or down => not a dropdown command
// - If trigger inside the menu => not a dropdown command
- if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $$$1(event.target).closest(Selector.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {
+ if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $(event.target).closest(Selector$4.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {
return;
}
event.preventDefault();
event.stopPropagation();
- if (this.disabled || $$$1(this).hasClass(ClassName.DISABLED)) {
+ if (this.disabled || $(this).hasClass(ClassName$4.DISABLED)) {
return;
}
var parent = Dropdown._getParentFromElement(this);
- var isActive = $$$1(parent).hasClass(ClassName.SHOW);
+ var isActive = $(parent).hasClass(ClassName$4.SHOW);
- if (!isActive && (event.which !== ESCAPE_KEYCODE || event.which !== SPACE_KEYCODE) || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
+ if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
if (event.which === ESCAPE_KEYCODE) {
- var toggle = $$$1(parent).find(Selector.DATA_TOGGLE)[0];
- $$$1(toggle).trigger('focus');
+ var toggle = parent.querySelector(Selector$4.DATA_TOGGLE);
+ $(toggle).trigger('focus');
}
- $$$1(this).trigger('click');
+ $(this).trigger('click');
return;
}
- var items = $$$1(parent).find(Selector.VISIBLE_ITEMS).get();
+ var items = [].slice.call(parent.querySelectorAll(Selector$4.VISIBLE_ITEMS));
if (items.length === 0) {
return;
@@ -32823,19 +33137,20 @@ var Dropdown = function ($$$1) {
_createClass(Dropdown, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$4;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$2;
}
}, {
key: "DefaultType",
get: function get() {
- return DefaultType;
+ return DefaultType$2;
}
}]);
+
return Dropdown;
}();
/**
@@ -32845,12 +33160,12 @@ var Dropdown = function ($$$1) {
*/
- $$$1(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API + " " + Event.KEYUP_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
+ $(document).on(Event$4.KEYDOWN_DATA_API, Selector$4.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event$4.KEYDOWN_DATA_API, Selector$4.MENU, Dropdown._dataApiKeydownHandler).on(Event$4.CLICK_DATA_API + " " + Event$4.KEYUP_DATA_API, Dropdown._clearMenus).on(Event$4.CLICK_DATA_API, Selector$4.DATA_TOGGLE, function (event) {
event.preventDefault();
event.stopPropagation();
- Dropdown._jQueryInterface.call($$$1(this), 'toggle');
- }).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) {
+ Dropdown._jQueryInterface.call($(this), 'toggle');
+ }).on(Event$4.CLICK_DATA_API, Selector$4.FORM_CHILD, function (e) {
e.stopPropagation();
});
/**
@@ -32859,79 +33174,66 @@ var Dropdown = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Dropdown._jQueryInterface;
- $$$1.fn[NAME].Constructor = Dropdown;
+ $.fn[NAME$4] = Dropdown._jQueryInterface;
+ $.fn[NAME$4].Constructor = Dropdown;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$4].noConflict = function () {
+ $.fn[NAME$4] = JQUERY_NO_CONFLICT$4;
return Dropdown._jQueryInterface;
};
- return Dropdown;
-}($, Popper);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): modal.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Modal = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'modal';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.modal';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 300;
- var BACKDROP_TRANSITION_DURATION = 150;
- var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
- var Default = {
+ var NAME$5 = 'modal';
+ var VERSION$5 = '4.2.1';
+ var DATA_KEY$5 = 'bs.modal';
+ var EVENT_KEY$5 = "." + DATA_KEY$5;
+ var DATA_API_KEY$5 = '.data-api';
+ var JQUERY_NO_CONFLICT$5 = $.fn[NAME$5];
+ var ESCAPE_KEYCODE$1 = 27; // KeyboardEvent.which value for Escape (Esc) key
+
+ var Default$3 = {
backdrop: true,
keyboard: true,
focus: true,
show: true
};
- var DefaultType = {
+ var DefaultType$3 = {
backdrop: '(boolean|string)',
keyboard: 'boolean',
focus: 'boolean',
show: 'boolean'
};
- var Event = {
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- FOCUSIN: "focusin" + EVENT_KEY,
- RESIZE: "resize" + EVENT_KEY,
- CLICK_DISMISS: "click.dismiss" + EVENT_KEY,
- KEYDOWN_DISMISS: "keydown.dismiss" + EVENT_KEY,
- MOUSEUP_DISMISS: "mouseup.dismiss" + EVENT_KEY,
- MOUSEDOWN_DISMISS: "mousedown.dismiss" + EVENT_KEY,
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY
+ var Event$5 = {
+ HIDE: "hide" + EVENT_KEY$5,
+ HIDDEN: "hidden" + EVENT_KEY$5,
+ SHOW: "show" + EVENT_KEY$5,
+ SHOWN: "shown" + EVENT_KEY$5,
+ FOCUSIN: "focusin" + EVENT_KEY$5,
+ RESIZE: "resize" + EVENT_KEY$5,
+ CLICK_DISMISS: "click.dismiss" + EVENT_KEY$5,
+ KEYDOWN_DISMISS: "keydown.dismiss" + EVENT_KEY$5,
+ MOUSEUP_DISMISS: "mouseup.dismiss" + EVENT_KEY$5,
+ MOUSEDOWN_DISMISS: "mousedown.dismiss" + EVENT_KEY$5,
+ CLICK_DATA_API: "click" + EVENT_KEY$5 + DATA_API_KEY$5
};
- var ClassName = {
+ var ClassName$5 = {
SCROLLBAR_MEASURER: 'modal-scrollbar-measure',
BACKDROP: 'modal-backdrop',
OPEN: 'modal-open',
FADE: 'fade',
SHOW: 'show'
};
- var Selector = {
+ var Selector$5 = {
DIALOG: '.modal-dialog',
DATA_TOGGLE: '[data-toggle="modal"]',
DATA_DISMISS: '[data-dismiss="modal"]',
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
- STICKY_CONTENT: '.sticky-top',
- NAVBAR_TOGGLER: '.navbar-toggler'
+ STICKY_CONTENT: '.sticky-top'
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -32946,12 +33248,12 @@ var Modal = function ($$$1) {
function Modal(element, config) {
this._config = this._getConfig(config);
this._element = element;
- this._dialog = $$$1(element).find(Selector.DIALOG)[0];
+ this._dialog = element.querySelector(Selector$5.DIALOG);
this._backdrop = null;
this._isShown = false;
this._isBodyOverflowing = false;
this._ignoreBackdropClick = false;
- this._originalBodyPadding = 0;
+ this._isTransitioning = false;
this._scrollbarWidth = 0;
} // Getters
@@ -32966,18 +33268,18 @@ var Modal = function ($$$1) {
_proto.show = function show(relatedTarget) {
var _this = this;
- if (this._isTransitioning || this._isShown) {
+ if (this._isShown || this._isTransitioning) {
return;
}
- if (Util.supportsTransitionEnd() && $$$1(this._element).hasClass(ClassName.FADE)) {
+ if ($(this._element).hasClass(ClassName$5.FADE)) {
this._isTransitioning = true;
}
- var showEvent = $$$1.Event(Event.SHOW, {
+ var showEvent = $.Event(Event$5.SHOW, {
relatedTarget: relatedTarget
});
- $$$1(this._element).trigger(showEvent);
+ $(this._element).trigger(showEvent);
if (this._isShown || showEvent.isDefaultPrevented()) {
return;
@@ -32991,18 +33293,16 @@ var Modal = function ($$$1) {
this._adjustDialog();
- $$$1(document.body).addClass(ClassName.OPEN);
-
this._setEscapeEvent();
this._setResizeEvent();
- $$$1(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, function (event) {
+ $(this._element).on(Event$5.CLICK_DISMISS, Selector$5.DATA_DISMISS, function (event) {
return _this.hide(event);
});
- $$$1(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () {
- $$$1(_this._element).one(Event.MOUSEUP_DISMISS, function (event) {
- if ($$$1(event.target).is(_this._element)) {
+ $(this._dialog).on(Event$5.MOUSEDOWN_DISMISS, function () {
+ $(_this._element).one(Event$5.MOUSEUP_DISMISS, function (event) {
+ if ($(event.target).is(_this._element)) {
_this._ignoreBackdropClick = true;
}
});
@@ -33020,19 +33320,19 @@ var Modal = function ($$$1) {
event.preventDefault();
}
- if (this._isTransitioning || !this._isShown) {
+ if (!this._isShown || this._isTransitioning) {
return;
}
- var hideEvent = $$$1.Event(Event.HIDE);
- $$$1(this._element).trigger(hideEvent);
+ var hideEvent = $.Event(Event$5.HIDE);
+ $(this._element).trigger(hideEvent);
if (!this._isShown || hideEvent.isDefaultPrevented()) {
return;
}
this._isShown = false;
- var transition = Util.supportsTransitionEnd() && $$$1(this._element).hasClass(ClassName.FADE);
+ var transition = $(this._element).hasClass(ClassName$5.FADE);
if (transition) {
this._isTransitioning = true;
@@ -33042,23 +33342,33 @@ var Modal = function ($$$1) {
this._setResizeEvent();
- $$$1(document).off(Event.FOCUSIN);
- $$$1(this._element).removeClass(ClassName.SHOW);
- $$$1(this._element).off(Event.CLICK_DISMISS);
- $$$1(this._dialog).off(Event.MOUSEDOWN_DISMISS);
+ $(document).off(Event$5.FOCUSIN);
+ $(this._element).removeClass(ClassName$5.SHOW);
+ $(this._element).off(Event$5.CLICK_DISMISS);
+ $(this._dialog).off(Event$5.MOUSEDOWN_DISMISS);
if (transition) {
- $$$1(this._element).one(Util.TRANSITION_END, function (event) {
+ var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+ $(this._element).one(Util.TRANSITION_END, function (event) {
return _this2._hideModal(event);
- }).emulateTransitionEnd(TRANSITION_DURATION);
+ }).emulateTransitionEnd(transitionDuration);
} else {
this._hideModal();
}
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
- $$$1(window, document, this._element, this._backdrop).off(EVENT_KEY);
+ [window, this._element, this._dialog].forEach(function (htmlElement) {
+ return $(htmlElement).off(EVENT_KEY$5);
+ });
+ /**
+ * `document` has 2 events `Event.FOCUSIN` and `Event.CLICK_DATA_API`
+ * Do not move `document` in `htmlElements` array
+ * It will remove `Event.CLICK_DATA_API` event that should remain
+ */
+
+ $(document).off(Event$5.FOCUSIN);
+ $.removeData(this._element, DATA_KEY$5);
this._config = null;
this._element = null;
this._dialog = null;
@@ -33066,6 +33376,7 @@ var Modal = function ($$$1) {
this._isShown = null;
this._isBodyOverflowing = null;
this._ignoreBackdropClick = null;
+ this._isTransitioning = null;
this._scrollbarWidth = null;
};
@@ -33075,15 +33386,15 @@ var Modal = function ($$$1) {
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, Default, config);
- Util.typeCheckConfig(NAME, config, DefaultType);
+ config = _objectSpread({}, Default$3, config);
+ Util.typeCheckConfig(NAME$5, config, DefaultType$3);
return config;
};
_proto._showElement = function _showElement(relatedTarget) {
var _this3 = this;
- var transition = Util.supportsTransitionEnd() && $$$1(this._element).hasClass(ClassName.FADE);
+ var transition = $(this._element).hasClass(ClassName$5.FADE);
if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
// Don't move modal's DOM position
@@ -33094,19 +33405,21 @@ var Modal = function ($$$1) {
this._element.removeAttribute('aria-hidden');
+ this._element.setAttribute('aria-modal', true);
+
this._element.scrollTop = 0;
if (transition) {
Util.reflow(this._element);
}
- $$$1(this._element).addClass(ClassName.SHOW);
+ $(this._element).addClass(ClassName$5.SHOW);
if (this._config.focus) {
this._enforceFocus();
}
- var shownEvent = $$$1.Event(Event.SHOWN, {
+ var shownEvent = $.Event(Event$5.SHOWN, {
relatedTarget: relatedTarget
});
@@ -33116,11 +33429,12 @@ var Modal = function ($$$1) {
}
_this3._isTransitioning = false;
- $$$1(_this3._element).trigger(shownEvent);
+ $(_this3._element).trigger(shownEvent);
};
if (transition) {
- $$$1(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(TRANSITION_DURATION);
+ var transitionDuration = Util.getTransitionDurationFromElement(this._dialog);
+ $(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
} else {
transitionComplete();
}
@@ -33129,9 +33443,9 @@ var Modal = function ($$$1) {
_proto._enforceFocus = function _enforceFocus() {
var _this4 = this;
- $$$1(document).off(Event.FOCUSIN) // Guard against infinite focus loop
- .on(Event.FOCUSIN, function (event) {
- if (document !== event.target && _this4._element !== event.target && $$$1(_this4._element).has(event.target).length === 0) {
+ $(document).off(Event$5.FOCUSIN) // Guard against infinite focus loop
+ .on(Event$5.FOCUSIN, function (event) {
+ if (document !== event.target && _this4._element !== event.target && $(_this4._element).has(event.target).length === 0) {
_this4._element.focus();
}
});
@@ -33141,15 +33455,15 @@ var Modal = function ($$$1) {
var _this5 = this;
if (this._isShown && this._config.keyboard) {
- $$$1(this._element).on(Event.KEYDOWN_DISMISS, function (event) {
- if (event.which === ESCAPE_KEYCODE) {
+ $(this._element).on(Event$5.KEYDOWN_DISMISS, function (event) {
+ if (event.which === ESCAPE_KEYCODE$1) {
event.preventDefault();
_this5.hide();
}
});
} else if (!this._isShown) {
- $$$1(this._element).off(Event.KEYDOWN_DISMISS);
+ $(this._element).off(Event$5.KEYDOWN_DISMISS);
}
};
@@ -33157,11 +33471,11 @@ var Modal = function ($$$1) {
var _this6 = this;
if (this._isShown) {
- $$$1(window).on(Event.RESIZE, function (event) {
+ $(window).on(Event$5.RESIZE, function (event) {
return _this6.handleUpdate(event);
});
} else {
- $$$1(window).off(Event.RESIZE);
+ $(window).off(Event$5.RESIZE);
}
};
@@ -33172,22 +33486,24 @@ var Modal = function ($$$1) {
this._element.setAttribute('aria-hidden', true);
+ this._element.removeAttribute('aria-modal');
+
this._isTransitioning = false;
this._showBackdrop(function () {
- $$$1(document.body).removeClass(ClassName.OPEN);
+ $(document.body).removeClass(ClassName$5.OPEN);
_this7._resetAdjustments();
_this7._resetScrollbar();
- $$$1(_this7._element).trigger(Event.HIDDEN);
+ $(_this7._element).trigger(Event$5.HIDDEN);
});
};
_proto._removeBackdrop = function _removeBackdrop() {
if (this._backdrop) {
- $$$1(this._backdrop).remove();
+ $(this._backdrop).remove();
this._backdrop = null;
}
};
@@ -33195,19 +33511,18 @@ var Modal = function ($$$1) {
_proto._showBackdrop = function _showBackdrop(callback) {
var _this8 = this;
- var animate = $$$1(this._element).hasClass(ClassName.FADE) ? ClassName.FADE : '';
+ var animate = $(this._element).hasClass(ClassName$5.FADE) ? ClassName$5.FADE : '';
if (this._isShown && this._config.backdrop) {
- var doAnimate = Util.supportsTransitionEnd() && animate;
this._backdrop = document.createElement('div');
- this._backdrop.className = ClassName.BACKDROP;
+ this._backdrop.className = ClassName$5.BACKDROP;
if (animate) {
- $$$1(this._backdrop).addClass(animate);
+ this._backdrop.classList.add(animate);
}
- $$$1(this._backdrop).appendTo(document.body);
- $$$1(this._element).on(Event.CLICK_DISMISS, function (event) {
+ $(this._backdrop).appendTo(document.body);
+ $(this._element).on(Event$5.CLICK_DISMISS, function (event) {
if (_this8._ignoreBackdropClick) {
_this8._ignoreBackdropClick = false;
return;
@@ -33224,24 +33539,25 @@ var Modal = function ($$$1) {
}
});
- if (doAnimate) {
+ if (animate) {
Util.reflow(this._backdrop);
}
- $$$1(this._backdrop).addClass(ClassName.SHOW);
+ $(this._backdrop).addClass(ClassName$5.SHOW);
if (!callback) {
return;
}
- if (!doAnimate) {
+ if (!animate) {
callback();
return;
}
- $$$1(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(BACKDROP_TRANSITION_DURATION);
+ var backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+ $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
} else if (!this._isShown && this._backdrop) {
- $$$1(this._backdrop).removeClass(ClassName.SHOW);
+ $(this._backdrop).removeClass(ClassName$5.SHOW);
var callbackRemove = function callbackRemove() {
_this8._removeBackdrop();
@@ -33251,8 +33567,10 @@ var Modal = function ($$$1) {
}
};
- if (Util.supportsTransitionEnd() && $$$1(this._element).hasClass(ClassName.FADE)) {
- $$$1(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(BACKDROP_TRANSITION_DURATION);
+ if ($(this._element).hasClass(ClassName$5.FADE)) {
+ var _backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+
+ $(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
} else {
callbackRemove();
}
@@ -33294,60 +33612,56 @@ var Modal = function ($$$1) {
if (this._isBodyOverflowing) {
// Note: DOMNode.style.paddingRight returns the actual value or '' if not set
// while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set
- // Adjust fixed content padding
- $$$1(Selector.FIXED_CONTENT).each(function (index, element) {
- var actualPadding = $$$1(element)[0].style.paddingRight;
- var calculatedPadding = $$$1(element).css('padding-right');
- $$$1(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + "px");
- }); // Adjust sticky content margin
+ var fixedContent = [].slice.call(document.querySelectorAll(Selector$5.FIXED_CONTENT));
+ var stickyContent = [].slice.call(document.querySelectorAll(Selector$5.STICKY_CONTENT)); // Adjust fixed content padding
- $$$1(Selector.STICKY_CONTENT).each(function (index, element) {
- var actualMargin = $$$1(element)[0].style.marginRight;
- var calculatedMargin = $$$1(element).css('margin-right');
- $$$1(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this9._scrollbarWidth + "px");
- }); // Adjust navbar-toggler margin
+ $(fixedContent).each(function (index, element) {
+ var actualPadding = element.style.paddingRight;
+ var calculatedPadding = $(element).css('padding-right');
+ $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + "px");
+ }); // Adjust sticky content margin
- $$$1(Selector.NAVBAR_TOGGLER).each(function (index, element) {
- var actualMargin = $$$1(element)[0].style.marginRight;
- var calculatedMargin = $$$1(element).css('margin-right');
- $$$1(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + "px");
+ $(stickyContent).each(function (index, element) {
+ var actualMargin = element.style.marginRight;
+ var calculatedMargin = $(element).css('margin-right');
+ $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this9._scrollbarWidth + "px");
}); // Adjust body padding
var actualPadding = document.body.style.paddingRight;
- var calculatedPadding = $$$1('body').css('padding-right');
- $$$1('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
+ var calculatedPadding = $(document.body).css('padding-right');
+ $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
}
+
+ $(document.body).addClass(ClassName$5.OPEN);
};
_proto._resetScrollbar = function _resetScrollbar() {
// Restore fixed content padding
- $$$1(Selector.FIXED_CONTENT).each(function (index, element) {
- var padding = $$$1(element).data('padding-right');
+ var fixedContent = [].slice.call(document.querySelectorAll(Selector$5.FIXED_CONTENT));
+ $(fixedContent).each(function (index, element) {
+ var padding = $(element).data('padding-right');
+ $(element).removeData('padding-right');
+ element.style.paddingRight = padding ? padding : '';
+ }); // Restore sticky content
- if (typeof padding !== 'undefined') {
- $$$1(element).css('padding-right', padding).removeData('padding-right');
- }
- }); // Restore sticky content and navbar-toggler margin
-
- $$$1(Selector.STICKY_CONTENT + ", " + Selector.NAVBAR_TOGGLER).each(function (index, element) {
- var margin = $$$1(element).data('margin-right');
+ var elements = [].slice.call(document.querySelectorAll("" + Selector$5.STICKY_CONTENT));
+ $(elements).each(function (index, element) {
+ var margin = $(element).data('margin-right');
if (typeof margin !== 'undefined') {
- $$$1(element).css('margin-right', margin).removeData('margin-right');
+ $(element).css('margin-right', margin).removeData('margin-right');
}
}); // Restore body padding
- var padding = $$$1('body').data('padding-right');
-
- if (typeof padding !== 'undefined') {
- $$$1('body').css('padding-right', padding).removeData('padding-right');
- }
+ var padding = $(document.body).data('padding-right');
+ $(document.body).removeData('padding-right');
+ document.body.style.paddingRight = padding ? padding : '';
};
_proto._getScrollbarWidth = function _getScrollbarWidth() {
// thx d.walsh
var scrollDiv = document.createElement('div');
- scrollDiv.className = ClassName.SCROLLBAR_MEASURER;
+ scrollDiv.className = ClassName$5.SCROLLBAR_MEASURER;
document.body.appendChild(scrollDiv);
var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
document.body.removeChild(scrollDiv);
@@ -33357,13 +33671,13 @@ var Modal = function ($$$1) {
Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$5);
- var _config = _extends({}, Modal.Default, $$$1(this).data(), typeof config === 'object' && config);
+ var _config = _objectSpread({}, Default$3, $(this).data(), typeof config === 'object' && config ? config : {});
if (!data) {
data = new Modal(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$5, data);
}
if (typeof config === 'string') {
@@ -33381,14 +33695,15 @@ var Modal = function ($$$1) {
_createClass(Modal, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$5;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$3;
}
}]);
+
return Modal;
}();
/**
@@ -33398,36 +33713,36 @@ var Modal = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
+ $(document).on(Event$5.CLICK_DATA_API, Selector$5.DATA_TOGGLE, function (event) {
var _this10 = this;
var target;
var selector = Util.getSelectorFromElement(this);
if (selector) {
- target = $$$1(selector)[0];
+ target = document.querySelector(selector);
}
- var config = $$$1(target).data(DATA_KEY) ? 'toggle' : _extends({}, $$$1(target).data(), $$$1(this).data());
+ var config = $(target).data(DATA_KEY$5) ? 'toggle' : _objectSpread({}, $(target).data(), $(this).data());
if (this.tagName === 'A' || this.tagName === 'AREA') {
event.preventDefault();
}
- var $target = $$$1(target).one(Event.SHOW, function (showEvent) {
+ var $target = $(target).one(Event$5.SHOW, function (showEvent) {
if (showEvent.isDefaultPrevented()) {
// Only register focus restorer if modal will actually get shown
return;
}
- $target.one(Event.HIDDEN, function () {
- if ($$$1(_this10).is(':visible')) {
+ $target.one(Event$5.HIDDEN, function () {
+ if ($(_this10).is(':visible')) {
_this10.focus();
}
});
});
- Modal._jQueryInterface.call($$$1(target), config, this);
+ Modal._jQueryInterface.call($(target), config, this);
});
/**
* ------------------------------------------------------------------------
@@ -33435,39 +33750,28 @@ var Modal = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Modal._jQueryInterface;
- $$$1.fn[NAME].Constructor = Modal;
+ $.fn[NAME$5] = Modal._jQueryInterface;
+ $.fn[NAME$5].Constructor = Modal;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$5].noConflict = function () {
+ $.fn[NAME$5] = JQUERY_NO_CONFLICT$5;
return Modal._jQueryInterface;
};
- return Modal;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): tooltip.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Tooltip = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'tooltip';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.tooltip';
- var EVENT_KEY = "." + DATA_KEY;
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 150;
+
+ var NAME$6 = 'tooltip';
+ var VERSION$6 = '4.2.1';
+ var DATA_KEY$6 = 'bs.tooltip';
+ var EVENT_KEY$6 = "." + DATA_KEY$6;
+ var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
var CLASS_PREFIX = 'bs-tooltip';
var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g');
- var DefaultType = {
+ var DefaultType$4 = {
animation: 'boolean',
template: 'string',
title: '(string|element|function)',
@@ -33481,14 +33785,14 @@ var Tooltip = function ($$$1) {
fallbackPlacement: '(string|array)',
boundary: '(string|element)'
};
- var AttachmentMap = {
+ var AttachmentMap$1 = {
AUTO: 'auto',
TOP: 'top',
RIGHT: 'right',
BOTTOM: 'bottom',
LEFT: 'left'
};
- var Default = {
+ var Default$4 = {
animation: true,
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
trigger: 'hover focus',
@@ -33506,23 +33810,23 @@ var Tooltip = function ($$$1) {
SHOW: 'show',
OUT: 'out'
};
- var Event = {
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- INSERTED: "inserted" + EVENT_KEY,
- CLICK: "click" + EVENT_KEY,
- FOCUSIN: "focusin" + EVENT_KEY,
- FOCUSOUT: "focusout" + EVENT_KEY,
- MOUSEENTER: "mouseenter" + EVENT_KEY,
- MOUSELEAVE: "mouseleave" + EVENT_KEY
+ var Event$6 = {
+ HIDE: "hide" + EVENT_KEY$6,
+ HIDDEN: "hidden" + EVENT_KEY$6,
+ SHOW: "show" + EVENT_KEY$6,
+ SHOWN: "shown" + EVENT_KEY$6,
+ INSERTED: "inserted" + EVENT_KEY$6,
+ CLICK: "click" + EVENT_KEY$6,
+ FOCUSIN: "focusin" + EVENT_KEY$6,
+ FOCUSOUT: "focusout" + EVENT_KEY$6,
+ MOUSEENTER: "mouseenter" + EVENT_KEY$6,
+ MOUSELEAVE: "mouseleave" + EVENT_KEY$6
};
- var ClassName = {
+ var ClassName$6 = {
FADE: 'fade',
SHOW: 'show'
};
- var Selector = {
+ var Selector$6 = {
TOOLTIP: '.tooltip',
TOOLTIP_INNER: '.tooltip-inner',
ARROW: '.arrow'
@@ -33549,7 +33853,7 @@ var Tooltip = function ($$$1) {
* Popper - https://popper.js.org
*/
if (typeof Popper === 'undefined') {
- throw new TypeError('Bootstrap tooltips require Popper.js (https://popper.js.org)');
+ throw new TypeError('Bootstrap\'s tooltips require Popper.js (https://popper.js.org/)');
} // private
@@ -33589,11 +33893,11 @@ var Tooltip = function ($$$1) {
if (event) {
var dataKey = this.constructor.DATA_KEY;
- var context = $$$1(event.currentTarget).data(dataKey);
+ var context = $(event.currentTarget).data(dataKey);
if (!context) {
context = new this.constructor(event.currentTarget, this._getDelegateConfig());
- $$$1(event.currentTarget).data(dataKey, context);
+ $(event.currentTarget).data(dataKey, context);
}
context._activeTrigger.click = !context._activeTrigger.click;
@@ -33604,7 +33908,7 @@ var Tooltip = function ($$$1) {
context._leave(null, context);
}
} else {
- if ($$$1(this.getTipElement()).hasClass(ClassName.SHOW)) {
+ if ($(this.getTipElement()).hasClass(ClassName$6.SHOW)) {
this._leave(null, this);
return;
@@ -33616,12 +33920,12 @@ var Tooltip = function ($$$1) {
_proto.dispose = function dispose() {
clearTimeout(this._timeout);
- $$$1.removeData(this.element, this.constructor.DATA_KEY);
- $$$1(this.element).off(this.constructor.EVENT_KEY);
- $$$1(this.element).closest('.modal').off('hide.bs.modal');
+ $.removeData(this.element, this.constructor.DATA_KEY);
+ $(this.element).off(this.constructor.EVENT_KEY);
+ $(this.element).closest('.modal').off('hide.bs.modal');
if (this.tip) {
- $$$1(this.tip).remove();
+ $(this.tip).remove();
}
this._isEnabled = null;
@@ -33642,15 +33946,16 @@ var Tooltip = function ($$$1) {
_proto.show = function show() {
var _this = this;
- if ($$$1(this.element).css('display') === 'none') {
+ if ($(this.element).css('display') === 'none') {
throw new Error('Please use show on visible elements');
}
- var showEvent = $$$1.Event(this.constructor.Event.SHOW);
+ var showEvent = $.Event(this.constructor.Event.SHOW);
if (this.isWithContent() && this._isEnabled) {
- $$$1(this.element).trigger(showEvent);
- var isInTheDom = $$$1.contains(this.element.ownerDocument.documentElement, this.element);
+ $(this.element).trigger(showEvent);
+ var shadowRoot = Util.findShadowRoot(this.element);
+ var isInTheDom = $.contains(shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement, this.element);
if (showEvent.isDefaultPrevented() || !isInTheDom) {
return;
@@ -33663,7 +33968,7 @@ var Tooltip = function ($$$1) {
this.setContent();
if (this.config.animation) {
- $$$1(tip).addClass(ClassName.FADE);
+ $(tip).addClass(ClassName$6.FADE);
}
var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement;
@@ -33671,14 +33976,16 @@ var Tooltip = function ($$$1) {
var attachment = this._getAttachment(placement);
this.addAttachmentClass(attachment);
- var container = this.config.container === false ? document.body : $$$1(this.config.container);
- $$$1(tip).data(this.constructor.DATA_KEY, this);
- if (!$$$1.contains(this.element.ownerDocument.documentElement, this.tip)) {
- $$$1(tip).appendTo(container);
+ var container = this._getContainer();
+
+ $(tip).data(this.constructor.DATA_KEY, this);
+
+ if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {
+ $(tip).appendTo(container);
}
- $$$1(this.element).trigger(this.constructor.Event.INSERTED);
+ $(this.element).trigger(this.constructor.Event.INSERTED);
this._popper = new Popper(this.element, tip, {
placement: attachment,
modifiers: {
@@ -33689,7 +33996,7 @@ var Tooltip = function ($$$1) {
behavior: this.config.fallbackPlacement
},
arrow: {
- element: Selector.ARROW
+ element: Selector$6.ARROW
},
preventOverflow: {
boundariesElement: this.config.boundary
@@ -33701,16 +34008,16 @@ var Tooltip = function ($$$1) {
}
},
onUpdate: function onUpdate(data) {
- _this._handlePopperPlacementChange(data);
+ return _this._handlePopperPlacementChange(data);
}
});
- $$$1(tip).addClass(ClassName.SHOW); // If this is a touch-enabled device we add extra
+ $(tip).addClass(ClassName$6.SHOW); // If this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
if ('ontouchstart' in document.documentElement) {
- $$$1('body').children().on('mouseover', null, $$$1.noop);
+ $(document.body).children().on('mouseover', null, $.noop);
}
var complete = function complete() {
@@ -33720,15 +34027,16 @@ var Tooltip = function ($$$1) {
var prevHoverState = _this._hoverState;
_this._hoverState = null;
- $$$1(_this.element).trigger(_this.constructor.Event.SHOWN);
+ $(_this.element).trigger(_this.constructor.Event.SHOWN);
if (prevHoverState === HoverState.OUT) {
_this._leave(null, _this);
}
};
- if (Util.supportsTransitionEnd() && $$$1(this.tip).hasClass(ClassName.FADE)) {
- $$$1(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(Tooltip._TRANSITION_DURATION);
+ if ($(this.tip).hasClass(ClassName$6.FADE)) {
+ var transitionDuration = Util.getTransitionDurationFromElement(this.tip);
+ $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
} else {
complete();
}
@@ -33739,7 +34047,7 @@ var Tooltip = function ($$$1) {
var _this2 = this;
var tip = this.getTipElement();
- var hideEvent = $$$1.Event(this.constructor.Event.HIDE);
+ var hideEvent = $.Event(this.constructor.Event.HIDE);
var complete = function complete() {
if (_this2._hoverState !== HoverState.SHOW && tip.parentNode) {
@@ -33750,7 +34058,7 @@ var Tooltip = function ($$$1) {
_this2.element.removeAttribute('aria-describedby');
- $$$1(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
+ $(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
if (_this2._popper !== null) {
_this2._popper.destroy();
@@ -33761,25 +34069,26 @@ var Tooltip = function ($$$1) {
}
};
- $$$1(this.element).trigger(hideEvent);
+ $(this.element).trigger(hideEvent);
if (hideEvent.isDefaultPrevented()) {
return;
}
- $$$1(tip).removeClass(ClassName.SHOW); // If this is a touch-enabled device we remove the extra
+ $(tip).removeClass(ClassName$6.SHOW); // If this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support
if ('ontouchstart' in document.documentElement) {
- $$$1('body').children().off('mouseover', null, $$$1.noop);
+ $(document.body).children().off('mouseover', null, $.noop);
}
this._activeTrigger[Trigger.CLICK] = false;
this._activeTrigger[Trigger.FOCUS] = false;
this._activeTrigger[Trigger.HOVER] = false;
- if (Util.supportsTransitionEnd() && $$$1(this.tip).hasClass(ClassName.FADE)) {
- $$$1(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
+ if ($(this.tip).hasClass(ClassName$6.FADE)) {
+ var transitionDuration = Util.getTransitionDurationFromElement(tip);
+ $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
} else {
complete();
}
@@ -33799,18 +34108,18 @@ var Tooltip = function ($$$1) {
};
_proto.addAttachmentClass = function addAttachmentClass(attachment) {
- $$$1(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
+ $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
};
_proto.getTipElement = function getTipElement() {
- this.tip = this.tip || $$$1(this.config.template)[0];
+ this.tip = this.tip || $(this.config.template)[0];
return this.tip;
};
_proto.setContent = function setContent() {
- var $tip = $$$1(this.getTipElement());
- this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
- $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW);
+ var tip = this.getTipElement();
+ this.setElementContent($(tip.querySelectorAll(Selector$6.TOOLTIP_INNER)), this.getTitle());
+ $(tip).removeClass(ClassName$6.FADE + " " + ClassName$6.SHOW);
};
_proto.setElementContent = function setElementContent($element, content) {
@@ -33819,11 +34128,11 @@ var Tooltip = function ($$$1) {
if (typeof content === 'object' && (content.nodeType || content.jquery)) {
// Content is a DOM node or a jQuery
if (html) {
- if (!$$$1(content).parent().is($element)) {
+ if (!$(content).parent().is($element)) {
$element.empty().append(content);
}
} else {
- $element.text($$$1(content).text());
+ $element.text($(content).text());
}
} else {
$element[html ? 'html' : 'text'](content);
@@ -33841,8 +34150,20 @@ var Tooltip = function ($$$1) {
}; // Private
+ _proto._getContainer = function _getContainer() {
+ if (this.config.container === false) {
+ return document.body;
+ }
+
+ if (Util.isElement(this.config.container)) {
+ return $(this.config.container);
+ }
+
+ return $(document).find(this.config.container);
+ };
+
_proto._getAttachment = function _getAttachment(placement) {
- return AttachmentMap[placement.toUpperCase()];
+ return AttachmentMap$1[placement.toUpperCase()];
};
_proto._setListeners = function _setListeners() {
@@ -33851,26 +34172,27 @@ var Tooltip = function ($$$1) {
var triggers = this.config.trigger.split(' ');
triggers.forEach(function (trigger) {
if (trigger === 'click') {
- $$$1(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, function (event) {
+ $(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, function (event) {
return _this3.toggle(event);
});
} else if (trigger !== Trigger.MANUAL) {
var eventIn = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSEENTER : _this3.constructor.Event.FOCUSIN;
var eventOut = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSELEAVE : _this3.constructor.Event.FOCUSOUT;
- $$$1(_this3.element).on(eventIn, _this3.config.selector, function (event) {
+ $(_this3.element).on(eventIn, _this3.config.selector, function (event) {
return _this3._enter(event);
}).on(eventOut, _this3.config.selector, function (event) {
return _this3._leave(event);
});
}
-
- $$$1(_this3.element).closest('.modal').on('hide.bs.modal', function () {
- return _this3.hide();
- });
+ });
+ $(this.element).closest('.modal').on('hide.bs.modal', function () {
+ if (_this3.element) {
+ _this3.hide();
+ }
});
if (this.config.selector) {
- this.config = _extends({}, this.config, {
+ this.config = _objectSpread({}, this.config, {
trigger: 'manual',
selector: ''
});
@@ -33890,18 +34212,18 @@ var Tooltip = function ($$$1) {
_proto._enter = function _enter(event, context) {
var dataKey = this.constructor.DATA_KEY;
- context = context || $$$1(event.currentTarget).data(dataKey);
+ context = context || $(event.currentTarget).data(dataKey);
if (!context) {
context = new this.constructor(event.currentTarget, this._getDelegateConfig());
- $$$1(event.currentTarget).data(dataKey, context);
+ $(event.currentTarget).data(dataKey, context);
}
if (event) {
context._activeTrigger[event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER] = true;
}
- if ($$$1(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) {
+ if ($(context.getTipElement()).hasClass(ClassName$6.SHOW) || context._hoverState === HoverState.SHOW) {
context._hoverState = HoverState.SHOW;
return;
}
@@ -33923,11 +34245,11 @@ var Tooltip = function ($$$1) {
_proto._leave = function _leave(event, context) {
var dataKey = this.constructor.DATA_KEY;
- context = context || $$$1(event.currentTarget).data(dataKey);
+ context = context || $(event.currentTarget).data(dataKey);
if (!context) {
context = new this.constructor(event.currentTarget, this._getDelegateConfig());
- $$$1(event.currentTarget).data(dataKey, context);
+ $(event.currentTarget).data(dataKey, context);
}
if (event) {
@@ -33964,7 +34286,7 @@ var Tooltip = function ($$$1) {
};
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, this.constructor.Default, $$$1(this.element).data(), config);
+ config = _objectSpread({}, this.constructor.Default, $(this.element).data(), typeof config === 'object' && config ? config : {});
if (typeof config.delay === 'number') {
config.delay = {
@@ -33981,7 +34303,7 @@ var Tooltip = function ($$$1) {
config.content = config.content.toString();
}
- Util.typeCheckConfig(NAME, config, this.constructor.DefaultType);
+ Util.typeCheckConfig(NAME$6, config, this.constructor.DefaultType);
return config;
};
@@ -34000,18 +34322,21 @@ var Tooltip = function ($$$1) {
};
_proto._cleanTipClass = function _cleanTipClass() {
- var $tip = $$$1(this.getTipElement());
+ var $tip = $(this.getTipElement());
var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX);
- if (tabClass !== null && tabClass.length > 0) {
+ if (tabClass !== null && tabClass.length) {
$tip.removeClass(tabClass.join(''));
}
};
- _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(data) {
+ _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(popperData) {
+ var popperInstance = popperData.instance;
+ this.tip = popperInstance.popper;
+
this._cleanTipClass();
- this.addAttachmentClass(this._getAttachment(data.placement));
+ this.addAttachmentClass(this._getAttachment(popperData.placement));
};
_proto._fixTransition = function _fixTransition() {
@@ -34022,7 +34347,7 @@ var Tooltip = function ($$$1) {
return;
}
- $$$1(tip).removeClass(ClassName.FADE);
+ $(tip).removeClass(ClassName$6.FADE);
this.config.animation = false;
this.hide();
this.show();
@@ -34032,7 +34357,7 @@ var Tooltip = function ($$$1) {
Tooltip._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$6);
var _config = typeof config === 'object' && config;
@@ -34042,7 +34367,7 @@ var Tooltip = function ($$$1) {
if (!data) {
data = new Tooltip(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$6, data);
}
if (typeof config === 'string') {
@@ -34058,39 +34383,40 @@ var Tooltip = function ($$$1) {
_createClass(Tooltip, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$6;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$4;
}
}, {
key: "NAME",
get: function get() {
- return NAME;
+ return NAME$6;
}
}, {
key: "DATA_KEY",
get: function get() {
- return DATA_KEY;
+ return DATA_KEY$6;
}
}, {
key: "Event",
get: function get() {
- return Event;
+ return Event$6;
}
}, {
key: "EVENT_KEY",
get: function get() {
- return EVENT_KEY;
+ return EVENT_KEY$6;
}
}, {
key: "DefaultType",
get: function get() {
- return DefaultType;
+ return DefaultType$4;
}
}]);
+
return Tooltip;
}();
/**
@@ -34100,65 +34426,58 @@ var Tooltip = function ($$$1) {
*/
- $$$1.fn[NAME] = Tooltip._jQueryInterface;
- $$$1.fn[NAME].Constructor = Tooltip;
+ $.fn[NAME$6] = Tooltip._jQueryInterface;
+ $.fn[NAME$6].Constructor = Tooltip;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$6].noConflict = function () {
+ $.fn[NAME$6] = JQUERY_NO_CONFLICT$6;
return Tooltip._jQueryInterface;
};
- return Tooltip;
-}($, Popper);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): popover.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Popover = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'popover';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.popover';
- var EVENT_KEY = "." + DATA_KEY;
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var CLASS_PREFIX = 'bs-popover';
- var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g');
- var Default = _extends({}, Tooltip.Default, {
+
+ var NAME$7 = 'popover';
+ var VERSION$7 = '4.2.1';
+ var DATA_KEY$7 = 'bs.popover';
+ var EVENT_KEY$7 = "." + DATA_KEY$7;
+ var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
+ var CLASS_PREFIX$1 = 'bs-popover';
+ var BSCLS_PREFIX_REGEX$1 = new RegExp("(^|\\s)" + CLASS_PREFIX$1 + "\\S+", 'g');
+
+ var Default$5 = _objectSpread({}, Tooltip.Default, {
placement: 'right',
trigger: 'click',
content: '',
template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div></div>'
});
- var DefaultType = _extends({}, Tooltip.DefaultType, {
+
+ var DefaultType$5 = _objectSpread({}, Tooltip.DefaultType, {
content: '(string|element|function)'
});
- var ClassName = {
+
+ var ClassName$7 = {
FADE: 'fade',
SHOW: 'show'
};
- var Selector = {
+ var Selector$7 = {
TITLE: '.popover-header',
CONTENT: '.popover-body'
};
- var Event = {
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- INSERTED: "inserted" + EVENT_KEY,
- CLICK: "click" + EVENT_KEY,
- FOCUSIN: "focusin" + EVENT_KEY,
- FOCUSOUT: "focusout" + EVENT_KEY,
- MOUSEENTER: "mouseenter" + EVENT_KEY,
- MOUSELEAVE: "mouseleave" + EVENT_KEY
+ var Event$7 = {
+ HIDE: "hide" + EVENT_KEY$7,
+ HIDDEN: "hidden" + EVENT_KEY$7,
+ SHOW: "show" + EVENT_KEY$7,
+ SHOWN: "shown" + EVENT_KEY$7,
+ INSERTED: "inserted" + EVENT_KEY$7,
+ CLICK: "click" + EVENT_KEY$7,
+ FOCUSIN: "focusin" + EVENT_KEY$7,
+ FOCUSOUT: "focusout" + EVENT_KEY$7,
+ MOUSEENTER: "mouseenter" + EVENT_KEY$7,
+ MOUSELEAVE: "mouseleave" + EVENT_KEY$7
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -34184,18 +34503,18 @@ var Popover = function ($$$1) {
};
_proto.addAttachmentClass = function addAttachmentClass(attachment) {
- $$$1(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
+ $(this.getTipElement()).addClass(CLASS_PREFIX$1 + "-" + attachment);
};
_proto.getTipElement = function getTipElement() {
- this.tip = this.tip || $$$1(this.config.template)[0];
+ this.tip = this.tip || $(this.config.template)[0];
return this.tip;
};
_proto.setContent = function setContent() {
- var $tip = $$$1(this.getTipElement()); // We use append for html objects to maintain js events
+ var $tip = $(this.getTipElement()); // We use append for html objects to maintain js events
- this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
+ this.setElementContent($tip.find(Selector$7.TITLE), this.getTitle());
var content = this._getContent();
@@ -34203,8 +34522,8 @@ var Popover = function ($$$1) {
content = content.call(this.element);
}
- this.setElementContent($tip.find(Selector.CONTENT), content);
- $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW);
+ this.setElementContent($tip.find(Selector$7.CONTENT), content);
+ $tip.removeClass(ClassName$7.FADE + " " + ClassName$7.SHOW);
}; // Private
@@ -34213,8 +34532,8 @@ var Popover = function ($$$1) {
};
_proto._cleanTipClass = function _cleanTipClass() {
- var $tip = $$$1(this.getTipElement());
- var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX);
+ var $tip = $(this.getTipElement());
+ var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX$1);
if (tabClass !== null && tabClass.length > 0) {
$tip.removeClass(tabClass.join(''));
@@ -34224,17 +34543,17 @@ var Popover = function ($$$1) {
Popover._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$7);
var _config = typeof config === 'object' ? config : null;
- if (!data && /destroy|hide/.test(config)) {
+ if (!data && /dispose|hide/.test(config)) {
return;
}
if (!data) {
data = new Popover(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$7, data);
}
if (typeof config === 'string') {
@@ -34251,39 +34570,40 @@ var Popover = function ($$$1) {
key: "VERSION",
// Getters
get: function get() {
- return VERSION;
+ return VERSION$7;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$5;
}
}, {
key: "NAME",
get: function get() {
- return NAME;
+ return NAME$7;
}
}, {
key: "DATA_KEY",
get: function get() {
- return DATA_KEY;
+ return DATA_KEY$7;
}
}, {
key: "Event",
get: function get() {
- return Event;
+ return Event$7;
}
}, {
key: "EVENT_KEY",
get: function get() {
- return EVENT_KEY;
+ return EVENT_KEY$7;
}
}, {
key: "DefaultType",
get: function get() {
- return DefaultType;
+ return DefaultType$5;
}
}]);
+
return Popover;
}(Tooltip);
/**
@@ -34293,57 +34613,47 @@ var Popover = function ($$$1) {
*/
- $$$1.fn[NAME] = Popover._jQueryInterface;
- $$$1.fn[NAME].Constructor = Popover;
+ $.fn[NAME$7] = Popover._jQueryInterface;
+ $.fn[NAME$7].Constructor = Popover;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$7].noConflict = function () {
+ $.fn[NAME$7] = JQUERY_NO_CONFLICT$7;
return Popover._jQueryInterface;
};
- return Popover;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): scrollspy.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var ScrollSpy = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'scrollspy';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.scrollspy';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var Default = {
+
+ var NAME$8 = 'scrollspy';
+ var VERSION$8 = '4.2.1';
+ var DATA_KEY$8 = 'bs.scrollspy';
+ var EVENT_KEY$8 = "." + DATA_KEY$8;
+ var DATA_API_KEY$6 = '.data-api';
+ var JQUERY_NO_CONFLICT$8 = $.fn[NAME$8];
+ var Default$6 = {
offset: 10,
method: 'auto',
target: ''
};
- var DefaultType = {
+ var DefaultType$6 = {
offset: 'number',
method: 'string',
target: '(string|element)'
};
- var Event = {
- ACTIVATE: "activate" + EVENT_KEY,
- SCROLL: "scroll" + EVENT_KEY,
- LOAD_DATA_API: "load" + EVENT_KEY + DATA_API_KEY
+ var Event$8 = {
+ ACTIVATE: "activate" + EVENT_KEY$8,
+ SCROLL: "scroll" + EVENT_KEY$8,
+ LOAD_DATA_API: "load" + EVENT_KEY$8 + DATA_API_KEY$6
};
- var ClassName = {
+ var ClassName$8 = {
DROPDOWN_ITEM: 'dropdown-item',
DROPDOWN_MENU: 'dropdown-menu',
ACTIVE: 'active'
};
- var Selector = {
+ var Selector$8 = {
DATA_SPY: '[data-spy="scroll"]',
ACTIVE: '.active',
NAV_LIST_GROUP: '.nav, .list-group',
@@ -34374,12 +34684,12 @@ var ScrollSpy = function ($$$1) {
this._element = element;
this._scrollElement = element.tagName === 'BODY' ? window : element;
this._config = this._getConfig(config);
- this._selector = this._config.target + " " + Selector.NAV_LINKS + "," + (this._config.target + " " + Selector.LIST_ITEMS + ",") + (this._config.target + " " + Selector.DROPDOWN_ITEMS);
+ this._selector = this._config.target + " " + Selector$8.NAV_LINKS + "," + (this._config.target + " " + Selector$8.LIST_ITEMS + ",") + (this._config.target + " " + Selector$8.DROPDOWN_ITEMS);
this._offsets = [];
this._targets = [];
this._activeTarget = null;
this._scrollHeight = 0;
- $$$1(this._scrollElement).on(Event.SCROLL, function (event) {
+ $(this._scrollElement).on(Event$8.SCROLL, function (event) {
return _this._process(event);
});
this.refresh();
@@ -34400,13 +34710,13 @@ var ScrollSpy = function ($$$1) {
this._offsets = [];
this._targets = [];
this._scrollHeight = this._getScrollHeight();
- var targets = $$$1.makeArray($$$1(this._selector));
+ var targets = [].slice.call(document.querySelectorAll(this._selector));
targets.map(function (element) {
var target;
var targetSelector = Util.getSelectorFromElement(element);
if (targetSelector) {
- target = $$$1(targetSelector)[0];
+ target = document.querySelector(targetSelector);
}
if (target) {
@@ -34414,7 +34724,7 @@ var ScrollSpy = function ($$$1) {
if (targetBCR.width || targetBCR.height) {
// TODO (fat): remove sketch reliance on jQuery position/offset
- return [$$$1(target)[offsetMethod]().top + offsetBase, targetSelector];
+ return [$(target)[offsetMethod]().top + offsetBase, targetSelector];
}
}
@@ -34431,8 +34741,8 @@ var ScrollSpy = function ($$$1) {
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
- $$$1(this._scrollElement).off(EVENT_KEY);
+ $.removeData(this._element, DATA_KEY$8);
+ $(this._scrollElement).off(EVENT_KEY$8);
this._element = null;
this._scrollElement = null;
this._config = null;
@@ -34445,20 +34755,20 @@ var ScrollSpy = function ($$$1) {
_proto._getConfig = function _getConfig(config) {
- config = _extends({}, Default, config);
+ config = _objectSpread({}, Default$6, typeof config === 'object' && config ? config : {});
if (typeof config.target !== 'string') {
- var id = $$$1(config.target).attr('id');
+ var id = $(config.target).attr('id');
if (!id) {
- id = Util.getUID(NAME);
- $$$1(config.target).attr('id', id);
+ id = Util.getUID(NAME$8);
+ $(config.target).attr('id', id);
}
config.target = "#" + id;
}
- Util.typeCheckConfig(NAME, config, DefaultType);
+ Util.typeCheckConfig(NAME$8, config, DefaultType$6);
return config;
};
@@ -34503,7 +34813,9 @@ var ScrollSpy = function ($$$1) {
return;
}
- for (var i = this._offsets.length; i--;) {
+ var offsetLength = this._offsets.length;
+
+ for (var i = offsetLength; i--;) {
var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
if (isActiveTarget) {
@@ -34517,46 +34829,48 @@ var ScrollSpy = function ($$$1) {
this._clear();
- var queries = this._selector.split(','); // eslint-disable-next-line arrow-body-style
-
-
- queries = queries.map(function (selector) {
- return selector + "[data-target=\"" + target + "\"]," + (selector + "[href=\"" + target + "\"]");
+ var queries = this._selector.split(',').map(function (selector) {
+ return selector + "[data-target=\"" + target + "\"]," + selector + "[href=\"" + target + "\"]";
});
- var $link = $$$1(queries.join(','));
- if ($link.hasClass(ClassName.DROPDOWN_ITEM)) {
- $link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
- $link.addClass(ClassName.ACTIVE);
+ var $link = $([].slice.call(document.querySelectorAll(queries.join(','))));
+
+ if ($link.hasClass(ClassName$8.DROPDOWN_ITEM)) {
+ $link.closest(Selector$8.DROPDOWN).find(Selector$8.DROPDOWN_TOGGLE).addClass(ClassName$8.ACTIVE);
+ $link.addClass(ClassName$8.ACTIVE);
} else {
// Set triggered link as active
- $link.addClass(ClassName.ACTIVE); // Set triggered links parents as active
+ $link.addClass(ClassName$8.ACTIVE); // Set triggered links parents as active
// With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
- $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ", " + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE); // Handle special case when .nav-link is inside .nav-item
+ $link.parents(Selector$8.NAV_LIST_GROUP).prev(Selector$8.NAV_LINKS + ", " + Selector$8.LIST_ITEMS).addClass(ClassName$8.ACTIVE); // Handle special case when .nav-link is inside .nav-item
- $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_ITEMS).children(Selector.NAV_LINKS).addClass(ClassName.ACTIVE);
+ $link.parents(Selector$8.NAV_LIST_GROUP).prev(Selector$8.NAV_ITEMS).children(Selector$8.NAV_LINKS).addClass(ClassName$8.ACTIVE);
}
- $$$1(this._scrollElement).trigger(Event.ACTIVATE, {
+ $(this._scrollElement).trigger(Event$8.ACTIVATE, {
relatedTarget: target
});
};
_proto._clear = function _clear() {
- $$$1(this._selector).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE);
+ [].slice.call(document.querySelectorAll(this._selector)).filter(function (node) {
+ return node.classList.contains(ClassName$8.ACTIVE);
+ }).forEach(function (node) {
+ return node.classList.remove(ClassName$8.ACTIVE);
+ });
}; // Static
ScrollSpy._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var data = $$$1(this).data(DATA_KEY);
+ var data = $(this).data(DATA_KEY$8);
var _config = typeof config === 'object' && config;
if (!data) {
data = new ScrollSpy(this, _config);
- $$$1(this).data(DATA_KEY, data);
+ $(this).data(DATA_KEY$8, data);
}
if (typeof config === 'string') {
@@ -34572,14 +34886,15 @@ var ScrollSpy = function ($$$1) {
_createClass(ScrollSpy, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$8;
}
}, {
key: "Default",
get: function get() {
- return Default;
+ return Default$6;
}
}]);
+
return ScrollSpy;
}();
/**
@@ -34589,11 +34904,12 @@ var ScrollSpy = function ($$$1) {
*/
- $$$1(window).on(Event.LOAD_DATA_API, function () {
- var scrollSpys = $$$1.makeArray($$$1(Selector.DATA_SPY));
+ $(window).on(Event$8.LOAD_DATA_API, function () {
+ var scrollSpys = [].slice.call(document.querySelectorAll(Selector$8.DATA_SPY));
+ var scrollSpysLength = scrollSpys.length;
- for (var i = scrollSpys.length; i--;) {
- var $spy = $$$1(scrollSpys[i]);
+ for (var i = scrollSpysLength; i--;) {
+ var $spy = $(scrollSpys[i]);
ScrollSpy._jQueryInterface.call($spy, $spy.data());
}
@@ -34604,52 +34920,41 @@ var ScrollSpy = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = ScrollSpy._jQueryInterface;
- $$$1.fn[NAME].Constructor = ScrollSpy;
+ $.fn[NAME$8] = ScrollSpy._jQueryInterface;
+ $.fn[NAME$8].Constructor = ScrollSpy;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$8].noConflict = function () {
+ $.fn[NAME$8] = JQUERY_NO_CONFLICT$8;
return ScrollSpy._jQueryInterface;
};
- return ScrollSpy;
-}($);
-
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0): tab.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
-
-var Tab = function ($$$1) {
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
- var NAME = 'tab';
- var VERSION = '4.0.0';
- var DATA_KEY = 'bs.tab';
- var EVENT_KEY = "." + DATA_KEY;
- var DATA_API_KEY = '.data-api';
- var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
- var TRANSITION_DURATION = 150;
- var Event = {
- HIDE: "hide" + EVENT_KEY,
- HIDDEN: "hidden" + EVENT_KEY,
- SHOW: "show" + EVENT_KEY,
- SHOWN: "shown" + EVENT_KEY,
- CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY
+
+ var NAME$9 = 'tab';
+ var VERSION$9 = '4.2.1';
+ var DATA_KEY$9 = 'bs.tab';
+ var EVENT_KEY$9 = "." + DATA_KEY$9;
+ var DATA_API_KEY$7 = '.data-api';
+ var JQUERY_NO_CONFLICT$9 = $.fn[NAME$9];
+ var Event$9 = {
+ HIDE: "hide" + EVENT_KEY$9,
+ HIDDEN: "hidden" + EVENT_KEY$9,
+ SHOW: "show" + EVENT_KEY$9,
+ SHOWN: "shown" + EVENT_KEY$9,
+ CLICK_DATA_API: "click" + EVENT_KEY$9 + DATA_API_KEY$7
};
- var ClassName = {
+ var ClassName$9 = {
DROPDOWN_MENU: 'dropdown-menu',
ACTIVE: 'active',
DISABLED: 'disabled',
FADE: 'fade',
SHOW: 'show'
};
- var Selector = {
+ var Selector$9 = {
DROPDOWN: '.dropdown',
NAV_LIST_GROUP: '.nav, .list-group',
ACTIVE: '.active',
@@ -34679,53 +34984,53 @@ var Tab = function ($$$1) {
_proto.show = function show() {
var _this = this;
- if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $$$1(this._element).hasClass(ClassName.ACTIVE) || $$$1(this._element).hasClass(ClassName.DISABLED)) {
+ if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName$9.ACTIVE) || $(this._element).hasClass(ClassName$9.DISABLED)) {
return;
}
var target;
var previous;
- var listElement = $$$1(this._element).closest(Selector.NAV_LIST_GROUP)[0];
+ var listElement = $(this._element).closest(Selector$9.NAV_LIST_GROUP)[0];
var selector = Util.getSelectorFromElement(this._element);
if (listElement) {
- var itemSelector = listElement.nodeName === 'UL' ? Selector.ACTIVE_UL : Selector.ACTIVE;
- previous = $$$1.makeArray($$$1(listElement).find(itemSelector));
+ var itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? Selector$9.ACTIVE_UL : Selector$9.ACTIVE;
+ previous = $.makeArray($(listElement).find(itemSelector));
previous = previous[previous.length - 1];
}
- var hideEvent = $$$1.Event(Event.HIDE, {
+ var hideEvent = $.Event(Event$9.HIDE, {
relatedTarget: this._element
});
- var showEvent = $$$1.Event(Event.SHOW, {
+ var showEvent = $.Event(Event$9.SHOW, {
relatedTarget: previous
});
if (previous) {
- $$$1(previous).trigger(hideEvent);
+ $(previous).trigger(hideEvent);
}
- $$$1(this._element).trigger(showEvent);
+ $(this._element).trigger(showEvent);
if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) {
return;
}
if (selector) {
- target = $$$1(selector)[0];
+ target = document.querySelector(selector);
}
this._activate(this._element, listElement);
var complete = function complete() {
- var hiddenEvent = $$$1.Event(Event.HIDDEN, {
+ var hiddenEvent = $.Event(Event$9.HIDDEN, {
relatedTarget: _this._element
});
- var shownEvent = $$$1.Event(Event.SHOWN, {
+ var shownEvent = $.Event(Event$9.SHOWN, {
relatedTarget: previous
});
- $$$1(previous).trigger(hiddenEvent);
- $$$1(_this._element).trigger(shownEvent);
+ $(previous).trigger(hiddenEvent);
+ $(_this._element).trigger(shownEvent);
};
if (target) {
@@ -34736,7 +35041,7 @@ var Tab = function ($$$1) {
};
_proto.dispose = function dispose() {
- $$$1.removeData(this._element, DATA_KEY);
+ $.removeData(this._element, DATA_KEY$9);
this._element = null;
}; // Private
@@ -34744,23 +35049,17 @@ var Tab = function ($$$1) {
_proto._activate = function _activate(element, container, callback) {
var _this2 = this;
- var activeElements;
-
- if (container.nodeName === 'UL') {
- activeElements = $$$1(container).find(Selector.ACTIVE_UL);
- } else {
- activeElements = $$$1(container).children(Selector.ACTIVE);
- }
-
+ var activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL') ? $(container).find(Selector$9.ACTIVE_UL) : $(container).children(Selector$9.ACTIVE);
var active = activeElements[0];
- var isTransitioning = callback && Util.supportsTransitionEnd() && active && $$$1(active).hasClass(ClassName.FADE);
+ var isTransitioning = callback && active && $(active).hasClass(ClassName$9.FADE);
var complete = function complete() {
return _this2._transitionComplete(element, active, callback);
};
if (active && isTransitioning) {
- $$$1(active).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
+ var transitionDuration = Util.getTransitionDurationFromElement(active);
+ $(active).removeClass(ClassName$9.SHOW).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
} else {
complete();
}
@@ -34768,11 +35067,11 @@ var Tab = function ($$$1) {
_proto._transitionComplete = function _transitionComplete(element, active, callback) {
if (active) {
- $$$1(active).removeClass(ClassName.SHOW + " " + ClassName.ACTIVE);
- var dropdownChild = $$$1(active.parentNode).find(Selector.DROPDOWN_ACTIVE_CHILD)[0];
+ $(active).removeClass(ClassName$9.ACTIVE);
+ var dropdownChild = $(active.parentNode).find(Selector$9.DROPDOWN_ACTIVE_CHILD)[0];
if (dropdownChild) {
- $$$1(dropdownChild).removeClass(ClassName.ACTIVE);
+ $(dropdownChild).removeClass(ClassName$9.ACTIVE);
}
if (active.getAttribute('role') === 'tab') {
@@ -34780,20 +35079,21 @@ var Tab = function ($$$1) {
}
}
- $$$1(element).addClass(ClassName.ACTIVE);
+ $(element).addClass(ClassName$9.ACTIVE);
if (element.getAttribute('role') === 'tab') {
element.setAttribute('aria-selected', true);
}
Util.reflow(element);
- $$$1(element).addClass(ClassName.SHOW);
+ $(element).addClass(ClassName$9.SHOW);
- if (element.parentNode && $$$1(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) {
- var dropdownElement = $$$1(element).closest(Selector.DROPDOWN)[0];
+ if (element.parentNode && $(element.parentNode).hasClass(ClassName$9.DROPDOWN_MENU)) {
+ var dropdownElement = $(element).closest(Selector$9.DROPDOWN)[0];
if (dropdownElement) {
- $$$1(dropdownElement).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
+ var dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(Selector$9.DROPDOWN_TOGGLE));
+ $(dropdownToggleList).addClass(ClassName$9.ACTIVE);
}
element.setAttribute('aria-expanded', true);
@@ -34807,12 +35107,12 @@ var Tab = function ($$$1) {
Tab._jQueryInterface = function _jQueryInterface(config) {
return this.each(function () {
- var $this = $$$1(this);
- var data = $this.data(DATA_KEY);
+ var $this = $(this);
+ var data = $this.data(DATA_KEY$9);
if (!data) {
data = new Tab(this);
- $this.data(DATA_KEY, data);
+ $this.data(DATA_KEY$9, data);
}
if (typeof config === 'string') {
@@ -34828,9 +35128,10 @@ var Tab = function ($$$1) {
_createClass(Tab, null, [{
key: "VERSION",
get: function get() {
- return VERSION;
+ return VERSION$9;
}
}]);
+
return Tab;
}();
/**
@@ -34840,10 +35141,10 @@ var Tab = function ($$$1) {
*/
- $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
+ $(document).on(Event$9.CLICK_DATA_API, Selector$9.DATA_TOGGLE, function (event) {
event.preventDefault();
- Tab._jQueryInterface.call($$$1(this), 'show');
+ Tab._jQueryInterface.call($(this), 'show');
});
/**
* ------------------------------------------------------------------------
@@ -34851,54 +35152,262 @@ var Tab = function ($$$1) {
* ------------------------------------------------------------------------
*/
- $$$1.fn[NAME] = Tab._jQueryInterface;
- $$$1.fn[NAME].Constructor = Tab;
+ $.fn[NAME$9] = Tab._jQueryInterface;
+ $.fn[NAME$9].Constructor = Tab;
- $$$1.fn[NAME].noConflict = function () {
- $$$1.fn[NAME] = JQUERY_NO_CONFLICT;
+ $.fn[NAME$9].noConflict = function () {
+ $.fn[NAME$9] = JQUERY_NO_CONFLICT$9;
return Tab._jQueryInterface;
};
- return Tab;
-}($);
+ /**
+ * ------------------------------------------------------------------------
+ * Constants
+ * ------------------------------------------------------------------------
+ */
-/**
- * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-alpha.6): index.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * --------------------------------------------------------------------------
- */
+ var NAME$a = 'toast';
+ var VERSION$a = '4.2.1';
+ var DATA_KEY$a = 'bs.toast';
+ var EVENT_KEY$a = "." + DATA_KEY$a;
+ var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
+ var Event$a = {
+ CLICK_DISMISS: "click.dismiss" + EVENT_KEY$a,
+ HIDE: "hide" + EVENT_KEY$a,
+ HIDDEN: "hidden" + EVENT_KEY$a,
+ SHOW: "show" + EVENT_KEY$a,
+ SHOWN: "shown" + EVENT_KEY$a
+ };
+ var ClassName$a = {
+ FADE: 'fade',
+ HIDE: 'hide',
+ SHOW: 'show',
+ SHOWING: 'showing'
+ };
+ var DefaultType$7 = {
+ animation: 'boolean',
+ autohide: 'boolean',
+ delay: 'number'
+ };
+ var Default$7 = {
+ animation: true,
+ autohide: true,
+ delay: 500
+ };
+ var Selector$a = {
+ DATA_DISMISS: '[data-dismiss="toast"]'
+ /**
+ * ------------------------------------------------------------------------
+ * Class Definition
+ * ------------------------------------------------------------------------
+ */
-(function ($$$1) {
- if (typeof $$$1 === 'undefined') {
- throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.');
- }
+ };
- var version = $$$1.fn.jquery.split(' ')[0].split('.');
- var minMajor = 1;
- var ltMajor = 2;
- var minMinor = 9;
- var minPatch = 1;
- var maxMajor = 4;
+ var Toast =
+ /*#__PURE__*/
+ function () {
+ function Toast(element, config) {
+ this._element = element;
+ this._config = this._getConfig(config);
+ this._timeout = null;
- if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
- throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0');
- }
-})($);
+ this._setListeners();
+ } // Getters
+
+
+ var _proto = Toast.prototype;
+
+ // Public
+ _proto.show = function show() {
+ var _this = this;
+
+ $(this._element).trigger(Event$a.SHOW);
+
+ if (this._config.animation) {
+ this._element.classList.add(ClassName$a.FADE);
+ }
+
+ var complete = function complete() {
+ _this._element.classList.remove(ClassName$a.SHOWING);
-exports.Util = Util;
-exports.Alert = Alert;
-exports.Button = Button;
-exports.Carousel = Carousel;
-exports.Collapse = Collapse;
-exports.Dropdown = Dropdown;
-exports.Modal = Modal;
-exports.Popover = Popover;
-exports.Scrollspy = ScrollSpy;
-exports.Tab = Tab;
-exports.Tooltip = Tooltip;
+ _this._element.classList.add(ClassName$a.SHOW);
+
+ $(_this._element).trigger(Event$a.SHOWN);
+
+ if (_this._config.autohide) {
+ _this.hide();
+ }
+ };
+
+ this._element.classList.remove(ClassName$a.HIDE);
+
+ this._element.classList.add(ClassName$a.SHOWING);
+
+ if (this._config.animation) {
+ var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+ $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+ } else {
+ complete();
+ }
+ };
+
+ _proto.hide = function hide(withoutTimeout) {
+ var _this2 = this;
+
+ if (!this._element.classList.contains(ClassName$a.SHOW)) {
+ return;
+ }
-Object.defineProperty(exports, '__esModule', { value: true });
+ $(this._element).trigger(Event$a.HIDE);
+
+ if (withoutTimeout) {
+ this._close();
+ } else {
+ this._timeout = setTimeout(function () {
+ _this2._close();
+ }, this._config.delay);
+ }
+ };
+
+ _proto.dispose = function dispose() {
+ clearTimeout(this._timeout);
+ this._timeout = null;
+
+ if (this._element.classList.contains(ClassName$a.SHOW)) {
+ this._element.classList.remove(ClassName$a.SHOW);
+ }
+
+ $(this._element).off(Event$a.CLICK_DISMISS);
+ $.removeData(this._element, DATA_KEY$a);
+ this._element = null;
+ this._config = null;
+ }; // Private
+
+
+ _proto._getConfig = function _getConfig(config) {
+ config = _objectSpread({}, Default$7, $(this._element).data(), typeof config === 'object' && config ? config : {});
+ Util.typeCheckConfig(NAME$a, config, this.constructor.DefaultType);
+ return config;
+ };
+
+ _proto._setListeners = function _setListeners() {
+ var _this3 = this;
+
+ $(this._element).on(Event$a.CLICK_DISMISS, Selector$a.DATA_DISMISS, function () {
+ return _this3.hide(true);
+ });
+ };
+
+ _proto._close = function _close() {
+ var _this4 = this;
+
+ var complete = function complete() {
+ _this4._element.classList.add(ClassName$a.HIDE);
+
+ $(_this4._element).trigger(Event$a.HIDDEN);
+ };
+
+ this._element.classList.remove(ClassName$a.SHOW);
+
+ if (this._config.animation) {
+ var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+ $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+ } else {
+ complete();
+ }
+ }; // Static
+
+
+ Toast._jQueryInterface = function _jQueryInterface(config) {
+ return this.each(function () {
+ var $element = $(this);
+ var data = $element.data(DATA_KEY$a);
+
+ var _config = typeof config === 'object' && config;
+
+ if (!data) {
+ data = new Toast(this, _config);
+ $element.data(DATA_KEY$a, data);
+ }
+
+ if (typeof config === 'string') {
+ if (typeof data[config] === 'undefined') {
+ throw new TypeError("No method named \"" + config + "\"");
+ }
+
+ data[config](this);
+ }
+ });
+ };
+
+ _createClass(Toast, null, [{
+ key: "VERSION",
+ get: function get() {
+ return VERSION$a;
+ }
+ }, {
+ key: "DefaultType",
+ get: function get() {
+ return DefaultType$7;
+ }
+ }]);
+
+ return Toast;
+ }();
+ /**
+ * ------------------------------------------------------------------------
+ * jQuery
+ * ------------------------------------------------------------------------
+ */
+
+
+ $.fn[NAME$a] = Toast._jQueryInterface;
+ $.fn[NAME$a].Constructor = Toast;
+
+ $.fn[NAME$a].noConflict = function () {
+ $.fn[NAME$a] = JQUERY_NO_CONFLICT$a;
+ return Toast._jQueryInterface;
+ };
+
+ /**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v4.2.1): index.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+
+ (function () {
+ if (typeof $ === 'undefined') {
+ throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.');
+ }
+
+ var version = $.fn.jquery.split(' ')[0].split('.');
+ var minMajor = 1;
+ var ltMajor = 2;
+ var minMinor = 9;
+ var minPatch = 1;
+ var maxMajor = 4;
+
+ if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
+ throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0');
+ }
+ })();
+
+ exports.Util = Util;
+ exports.Alert = Alert;
+ exports.Button = Button;
+ exports.Carousel = Carousel;
+ exports.Collapse = Collapse;
+ exports.Dropdown = Dropdown;
+ exports.Modal = Modal;
+ exports.Popover = Popover;
+ exports.Scrollspy = ScrollSpy;
+ exports.Tab = Tab;
+ exports.Toast = Toast;
+ exports.Tooltip = Tooltip;
+
+ Object.defineProperty(exports, '__esModule', { value: true });
})));
//# sourceMappingURL=bootstrap.js.map
@@ -35800,8 +36309,8 @@ module.exports = function spread(callback) {
"use strict";
/* WEBPACK VAR INJECTION */(function(global, setImmediate) {/*!
- * Vue.js v2.5.13
- * (c) 2014-2017 Evan You
+ * Vue.js v2.5.22
+ * (c) 2014-2019 Evan You
* Released under the MIT License.
*/
@@ -35810,8 +36319,8 @@ module.exports = function spread(callback) {
var emptyObject = Object.freeze({});
-// these helpers produces better vm code in JS engines due to their
-// explicitness and function inlining
+// These helpers produce better VM code in JS engines due to their
+// explicitness and function inlining.
function isUndef (v) {
return v === undefined || v === null
}
@@ -35829,7 +36338,7 @@ function isFalse (v) {
}
/**
- * Check if value is primitive
+ * Check if value is primitive.
*/
function isPrimitive (value) {
return (
@@ -35851,7 +36360,7 @@ function isObject (obj) {
}
/**
- * Get the raw type string of a value e.g. [object Object]
+ * Get the raw type string of a value, e.g., [object Object].
*/
var _toString = Object.prototype.toString;
@@ -35891,7 +36400,7 @@ function toString (val) {
}
/**
- * Convert a input value to a number for persistence.
+ * Convert an input value to a number for persistence.
* If the conversion fails, return original string.
*/
function toNumber (val) {
@@ -35923,12 +36432,12 @@ function makeMap (
var isBuiltInTag = makeMap('slot,component', true);
/**
- * Check if a attribute is a reserved attribute.
+ * Check if an attribute is a reserved attribute.
*/
var isReservedAttribute = makeMap('key,ref,slot,slot-scope,is');
/**
- * Remove an item from an array
+ * Remove an item from an array.
*/
function remove (arr, item) {
if (arr.length) {
@@ -35940,7 +36449,7 @@ function remove (arr, item) {
}
/**
- * Check whether the object has the property.
+ * Check whether an object has the property.
*/
var hasOwnProperty = Object.prototype.hasOwnProperty;
function hasOwn (obj, key) {
@@ -35982,9 +36491,15 @@ var hyphenate = cached(function (str) {
});
/**
- * Simple bind, faster than native
+ * Simple bind polyfill for environments that do not support it,
+ * e.g., PhantomJS 1.x. Technically, we don't need this anymore
+ * since native bind is now performant enough in most browsers.
+ * But removing it would mean breaking code that was able to run in
+ * PhantomJS 1.x, so this must be kept for backward compatibility.
*/
-function bind (fn, ctx) {
+
+/* istanbul ignore next */
+function polyfillBind (fn, ctx) {
function boundFn (a) {
var l = arguments.length;
return l
@@ -35993,11 +36508,19 @@ function bind (fn, ctx) {
: fn.call(ctx, a)
: fn.call(ctx)
}
- // record original fn length
+
boundFn._length = fn.length;
return boundFn
}
+function nativeBind (fn, ctx) {
+ return fn.bind(ctx)
+}
+
+var bind = Function.prototype.bind
+ ? nativeBind
+ : polyfillBind;
+
/**
* Convert an Array-like object to a real Array.
*/
@@ -36034,10 +36557,12 @@ function toObject (arr) {
return res
}
+/* eslint-disable no-unused-vars */
+
/**
* Perform no operation.
* Stubbing args to make Flow happy without leaving useless transpiled code
- * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/)
+ * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/).
*/
function noop (a, b, c) {}
@@ -36046,13 +36571,15 @@ function noop (a, b, c) {}
*/
var no = function (a, b, c) { return false; };
+/* eslint-enable no-unused-vars */
+
/**
- * Return same value
+ * Return the same value.
*/
var identity = function (_) { return _; };
/**
- * Generate a static keys string from compiler modules.
+ * Generate a string containing static keys from compiler modules.
*/
function genStaticKeys (modules) {
return modules.reduce(function (keys, m) {
@@ -36076,6 +36603,8 @@ function looseEqual (a, b) {
return a.length === b.length && a.every(function (e, i) {
return looseEqual(e, b[i])
})
+ } else if (a instanceof Date && b instanceof Date) {
+ return a.getTime() === b.getTime()
} else if (!isArrayA && !isArrayB) {
var keysA = Object.keys(a);
var keysB = Object.keys(b);
@@ -36097,6 +36626,11 @@ function looseEqual (a, b) {
}
}
+/**
+ * Return the first index at which a loosely equal value can be
+ * found in the array (if value is a plain object, the array must
+ * contain an object of the same shape), or -1 if it is not present.
+ */
function looseIndexOf (arr, val) {
for (var i = 0; i < arr.length; i++) {
if (looseEqual(arr[i], val)) { return i }
@@ -36141,6 +36675,8 @@ var LIFECYCLE_HOOKS = [
/* */
+
+
var config = ({
/**
* Option merge strategies (used in core/util/options)
@@ -36223,6 +36759,12 @@ var config = ({
*/
mustUseProp: no,
+ /**
+ * Perform updates asynchronously. Intended to be used by Vue Test Utils
+ * This will significantly reduce performance if set to false.
+ */
+ async: true,
+
/**
* Exposed for legacy reasons
*/
@@ -36271,7 +36813,6 @@ function parsePath (path) {
/* */
-
// can we use __proto__?
var hasProto = '__proto__' in {};
@@ -36310,10 +36851,10 @@ var _isServer;
var isServerRendering = function () {
if (_isServer === undefined) {
/* istanbul ignore if */
- if (!inBrowser && typeof global !== 'undefined') {
+ if (!inBrowser && !inWeex && typeof global !== 'undefined') {
// detect presence of vue-server-renderer and avoid
// Webpack shimming the process
- _isServer = global['process'].env.VUE_ENV === 'server';
+ _isServer = global['process'] && global['process'].env.VUE_ENV === 'server';
} else {
_isServer = false;
}
@@ -36340,7 +36881,7 @@ if (typeof Set !== 'undefined' && isNative(Set)) {
_Set = Set;
} else {
// a non-standard Set polyfill that only works with primitive keys.
- _Set = (function () {
+ _Set = /*@__PURE__*/(function () {
function Set () {
this.set = Object.create(null);
}
@@ -36398,7 +36939,7 @@ if (true) {
? vm.options
: vm._isVue
? vm.$options || vm.constructor.options
- : vm || {};
+ : vm;
var name = options.name || options._componentTag;
var file = options.__file;
if (!name && file) {
@@ -36454,7 +36995,6 @@ if (true) {
/* */
-
var uid = 0;
/**
@@ -36483,24 +37023,31 @@ Dep.prototype.depend = function depend () {
Dep.prototype.notify = function notify () {
// stabilize the subscriber list first
var subs = this.subs.slice();
+ if ("development" !== 'production' && !config.async) {
+ // subs aren't sorted in scheduler if not running async
+ // we need to sort them now to make sure they fire in correct
+ // order
+ subs.sort(function (a, b) { return a.id - b.id; });
+ }
for (var i = 0, l = subs.length; i < l; i++) {
subs[i].update();
}
};
-// the current target watcher being evaluated.
-// this is globally unique because there could be only one
-// watcher being evaluated at any time.
+// The current target watcher being evaluated.
+// This is globally unique because only one watcher
+// can be evaluated at a time.
Dep.target = null;
var targetStack = [];
-function pushTarget (_target) {
- if (Dep.target) { targetStack.push(Dep.target); }
- Dep.target = _target;
+function pushTarget (target) {
+ targetStack.push(target);
+ Dep.target = target;
}
function popTarget () {
- Dep.target = targetStack.pop();
+ targetStack.pop();
+ Dep.target = targetStack[targetStack.length - 1];
}
/* */
@@ -36567,16 +37114,18 @@ function createTextVNode (val) {
// used for static nodes and slot nodes because they may be reused across
// multiple renders, cloning them avoids errors when DOM manipulations rely
// on their elm reference.
-function cloneVNode (vnode, deep) {
- var componentOptions = vnode.componentOptions;
+function cloneVNode (vnode) {
var cloned = new VNode(
vnode.tag,
vnode.data,
- vnode.children,
+ // #7975
+ // clone children array to avoid mutating original in case of cloning
+ // a child.
+ vnode.children && vnode.children.slice(),
vnode.text,
vnode.elm,
vnode.context,
- componentOptions,
+ vnode.componentOptions,
vnode.asyncFactory
);
cloned.ns = vnode.ns;
@@ -36586,34 +37135,20 @@ function cloneVNode (vnode, deep) {
cloned.fnContext = vnode.fnContext;
cloned.fnOptions = vnode.fnOptions;
cloned.fnScopeId = vnode.fnScopeId;
+ cloned.asyncMeta = vnode.asyncMeta;
cloned.isCloned = true;
- if (deep) {
- if (vnode.children) {
- cloned.children = cloneVNodes(vnode.children, true);
- }
- if (componentOptions && componentOptions.children) {
- componentOptions.children = cloneVNodes(componentOptions.children, true);
- }
- }
return cloned
}
-function cloneVNodes (vnodes, deep) {
- var len = vnodes.length;
- var res = new Array(len);
- for (var i = 0; i < len; i++) {
- res[i] = cloneVNode(vnodes[i], deep);
- }
- return res
-}
-
/*
* not type checking this file because flow doesn't play well with
* dynamically accessing methods on Array prototype
*/
var arrayProto = Array.prototype;
-var arrayMethods = Object.create(arrayProto);[
+var arrayMethods = Object.create(arrayProto);
+
+var methodsToPatch = [
'push',
'pop',
'shift',
@@ -36621,7 +37156,12 @@ var arrayMethods = Object.create(arrayProto);[
'splice',
'sort',
'reverse'
-].forEach(function (method) {
+];
+
+/**
+ * Intercept mutating methods and emit events
+ */
+methodsToPatch.forEach(function (method) {
// cache original method
var original = arrayProto[method];
def(arrayMethods, method, function mutator () {
@@ -36652,20 +37192,20 @@ var arrayMethods = Object.create(arrayProto);[
var arrayKeys = Object.getOwnPropertyNames(arrayMethods);
/**
- * By default, when a reactive property is set, the new value is
- * also converted to become reactive. However when passing down props,
- * we don't want to force conversion because the value may be a nested value
- * under a frozen data structure. Converting it would defeat the optimization.
+ * In some cases we may want to disable observation inside a component's
+ * update computation.
*/
-var observerState = {
- shouldConvert: true
-};
+var shouldObserve = true;
+
+function toggleObserving (value) {
+ shouldObserve = value;
+}
/**
- * Observer class that are attached to each observed
- * object. Once attached, the observer converts target
+ * Observer class that is attached to each observed
+ * object. Once attached, the observer converts the target
* object's property keys into getter/setters that
- * collect dependencies and dispatches updates.
+ * collect dependencies and dispatch updates.
*/
var Observer = function Observer (value) {
this.value = value;
@@ -36673,10 +37213,11 @@ var Observer = function Observer (value) {
this.vmCount = 0;
def(value, '__ob__', this);
if (Array.isArray(value)) {
- var augment = hasProto
- ? protoAugment
- : copyAugment;
- augment(value, arrayMethods, arrayKeys);
+ if (hasProto) {
+ protoAugment(value, arrayMethods);
+ } else {
+ copyAugment(value, arrayMethods, arrayKeys);
+ }
this.observeArray(value);
} else {
this.walk(value);
@@ -36684,14 +37225,14 @@ var Observer = function Observer (value) {
};
/**
- * Walk through each property and convert them into
+ * Walk through all properties and convert them into
* getter/setters. This method should only be called when
* value type is Object.
*/
Observer.prototype.walk = function walk (obj) {
var keys = Object.keys(obj);
for (var i = 0; i < keys.length; i++) {
- defineReactive(obj, keys[i], obj[keys[i]]);
+ defineReactive$$1(obj, keys[i]);
}
};
@@ -36707,17 +37248,17 @@ Observer.prototype.observeArray = function observeArray (items) {
// helpers
/**
- * Augment an target Object or Array by intercepting
+ * Augment a target Object or Array by intercepting
* the prototype chain using __proto__
*/
-function protoAugment (target, src, keys) {
+function protoAugment (target, src) {
/* eslint-disable no-proto */
target.__proto__ = src;
/* eslint-enable no-proto */
}
/**
- * Augment an target Object or Array by defining
+ * Augment a target Object or Array by defining
* hidden properties.
*/
/* istanbul ignore next */
@@ -36741,7 +37282,7 @@ function observe (value, asRootData) {
if (hasOwn(value, '__ob__') && value.__ob__ instanceof Observer) {
ob = value.__ob__;
} else if (
- observerState.shouldConvert &&
+ shouldObserve &&
!isServerRendering() &&
(Array.isArray(value) || isPlainObject(value)) &&
Object.isExtensible(value) &&
@@ -36758,7 +37299,7 @@ function observe (value, asRootData) {
/**
* Define a reactive property on an Object.
*/
-function defineReactive (
+function defineReactive$$1 (
obj,
key,
val,
@@ -36775,6 +37316,9 @@ function defineReactive (
// cater for pre-defined getter/setters
var getter = property && property.get;
var setter = property && property.set;
+ if ((!getter || setter) && arguments.length === 2) {
+ val = obj[key];
+ }
var childOb = !shallow && observe(val);
Object.defineProperty(obj, key, {
@@ -36803,6 +37347,8 @@ function defineReactive (
if ("development" !== 'production' && customSetter) {
customSetter();
}
+ // #7981: for accessor properties without setter
+ if (getter && !setter) { return }
if (setter) {
setter.call(obj, newVal);
} else {
@@ -36820,6 +37366,11 @@ function defineReactive (
* already exist.
*/
function set (target, key, val) {
+ if ("development" !== 'production' &&
+ (isUndef(target) || isPrimitive(target))
+ ) {
+ warn(("Cannot set reactive property on undefined, null, or primitive value: " + ((target))));
+ }
if (Array.isArray(target) && isValidArrayIndex(key)) {
target.length = Math.max(target.length, key);
target.splice(key, 1, val);
@@ -36841,7 +37392,7 @@ function set (target, key, val) {
target[key] = val;
return val
}
- defineReactive(ob.value, key, val);
+ defineReactive$$1(ob.value, key, val);
ob.dep.notify();
return val
}
@@ -36850,6 +37401,11 @@ function set (target, key, val) {
* Delete a property and trigger change if necessary.
*/
function del (target, key) {
+ if ("development" !== 'production' &&
+ (isUndef(target) || isPrimitive(target))
+ ) {
+ warn(("Cannot delete reactive property on undefined, null, or primitive value: " + ((target))));
+ }
if (Array.isArray(target) && isValidArrayIndex(key)) {
target.splice(key, 1);
return
@@ -36923,7 +37479,11 @@ function mergeData (to, from) {
fromVal = from[key];
if (!hasOwn(to, key)) {
set(to, key, fromVal);
- } else if (isPlainObject(toVal) && isPlainObject(fromVal)) {
+ } else if (
+ toVal !== fromVal &&
+ isPlainObject(toVal) &&
+ isPlainObject(fromVal)
+ ) {
mergeData(toVal, fromVal);
}
}
@@ -37004,13 +37564,26 @@ function mergeHook (
parentVal,
childVal
) {
- return childVal
+ var res = childVal
? parentVal
? parentVal.concat(childVal)
: Array.isArray(childVal)
? childVal
: [childVal]
- : parentVal
+ : parentVal;
+ return res
+ ? dedupeHooks(res)
+ : res
+}
+
+function dedupeHooks (hooks) {
+ var res = [];
+ for (var i = 0; i < hooks.length; i++) {
+ if (res.indexOf(hooks[i]) === -1) {
+ res.push(hooks[i]);
+ }
+ }
+ return res
}
LIFECYCLE_HOOKS.forEach(function (hook) {
@@ -37246,15 +37819,22 @@ function mergeOptions (
normalizeProps(child, vm);
normalizeInject(child, vm);
normalizeDirectives(child);
- var extendsFrom = child.extends;
- if (extendsFrom) {
- parent = mergeOptions(parent, extendsFrom, vm);
- }
- if (child.mixins) {
- for (var i = 0, l = child.mixins.length; i < l; i++) {
- parent = mergeOptions(parent, child.mixins[i], vm);
+
+ // Apply extends and mixins on the child options,
+ // but only if it is a raw options object that isn't
+ // the result of another mergeOptions call.
+ // Only merged options has the _base property.
+ if (!child._base) {
+ if (child.extends) {
+ parent = mergeOptions(parent, child.extends, vm);
+ }
+ if (child.mixins) {
+ for (var i = 0, l = child.mixins.length; i < l; i++) {
+ parent = mergeOptions(parent, child.mixins[i], vm);
+ }
}
}
+
var options = {};
var key;
for (key in parent) {
@@ -37307,6 +37887,8 @@ function resolveAsset (
/* */
+
+
function validateProp (
key,
propOptions,
@@ -37316,12 +37898,18 @@ function validateProp (
var prop = propOptions[key];
var absent = !hasOwn(propsData, key);
var value = propsData[key];
- // handle boolean props
- if (isType(Boolean, prop.type)) {
+ // boolean casting
+ var booleanIndex = getTypeIndex(Boolean, prop.type);
+ if (booleanIndex > -1) {
if (absent && !hasOwn(prop, 'default')) {
value = false;
- } else if (!isType(String, prop.type) && (value === '' || value === hyphenate(key))) {
- value = true;
+ } else if (value === '' || value === hyphenate(key)) {
+ // only cast empty string / same name to boolean if
+ // boolean has higher priority
+ var stringIndex = getTypeIndex(String, prop.type);
+ if (stringIndex < 0 || booleanIndex < stringIndex) {
+ value = true;
+ }
}
}
// check default value
@@ -37329,10 +37917,10 @@ function validateProp (
value = getPropDefaultValue(vm, prop, key);
// since the default value is a fresh copy,
// make sure to observe it.
- var prevShouldConvert = observerState.shouldConvert;
- observerState.shouldConvert = true;
+ var prevShouldObserve = shouldObserve;
+ toggleObserving(true);
observe(value);
- observerState.shouldConvert = prevShouldConvert;
+ toggleObserving(prevShouldObserve);
}
if (
true
@@ -37408,11 +37996,10 @@ function assertProp (
valid = assertedType.valid;
}
}
+
if (!valid) {
warn(
- "Invalid prop: type check failed for prop \"" + name + "\"." +
- " Expected " + (expectedTypes.map(capitalize).join(', ')) +
- ", got " + (toRawType(value)) + ".",
+ getInvalidTypeMessage(name, value, expectedTypes),
vm
);
return
@@ -37463,17 +38050,63 @@ function getType (fn) {
return match ? match[1] : ''
}
-function isType (type, fn) {
- if (!Array.isArray(fn)) {
- return getType(fn) === getType(type)
+function isSameType (a, b) {
+ return getType(a) === getType(b)
+}
+
+function getTypeIndex (type, expectedTypes) {
+ if (!Array.isArray(expectedTypes)) {
+ return isSameType(expectedTypes, type) ? 0 : -1
}
- for (var i = 0, len = fn.length; i < len; i++) {
- if (getType(fn[i]) === getType(type)) {
- return true
+ for (var i = 0, len = expectedTypes.length; i < len; i++) {
+ if (isSameType(expectedTypes[i], type)) {
+ return i
}
}
- /* istanbul ignore next */
- return false
+ return -1
+}
+
+function getInvalidTypeMessage (name, value, expectedTypes) {
+ var message = "Invalid prop: type check failed for prop \"" + name + "\"." +
+ " Expected " + (expectedTypes.map(capitalize).join(', '));
+ var expectedType = expectedTypes[0];
+ var receivedType = toRawType(value);
+ var expectedValue = styleValue(value, expectedType);
+ var receivedValue = styleValue(value, receivedType);
+ // check if we need to specify expected value
+ if (expectedTypes.length === 1 &&
+ isExplicable(expectedType) &&
+ !isBoolean(expectedType, receivedType)) {
+ message += " with value " + expectedValue;
+ }
+ message += ", got " + receivedType + " ";
+ // check if we need to specify received value
+ if (isExplicable(receivedType)) {
+ message += "with value " + receivedValue + ".";
+ }
+ return message
+}
+
+function styleValue (value, type) {
+ if (type === 'String') {
+ return ("\"" + value + "\"")
+ } else if (type === 'Number') {
+ return ("" + (Number(value)))
+ } else {
+ return ("" + value)
+ }
+}
+
+function isExplicable (value) {
+ var explicitTypes = ['string', 'number', 'boolean'];
+ return explicitTypes.some(function (elem) { return value.toLowerCase() === elem; })
+}
+
+function isBoolean () {
+ var args = [], len = arguments.length;
+ while ( len-- ) args[ len ] = arguments[ len ];
+
+ return args.some(function (elem) { return elem.toLowerCase() === 'boolean'; })
}
/* */
@@ -37522,7 +38155,6 @@ function logError (err, vm, info) {
}
/* */
-/* globals MessageChannel */
var callbacks = [];
var pending = false;
@@ -37536,19 +38168,19 @@ function flushCallbacks () {
}
}
-// Here we have async deferring wrappers using both micro and macro tasks.
-// In < 2.4 we used micro tasks everywhere, but there are some scenarios where
-// micro tasks have too high a priority and fires in between supposedly
+// Here we have async deferring wrappers using both microtasks and (macro) tasks.
+// In < 2.4 we used microtasks everywhere, but there are some scenarios where
+// microtasks have too high a priority and fire in between supposedly
// sequential events (e.g. #4521, #6690) or even between bubbling of the same
-// event (#6566). However, using macro tasks everywhere also has subtle problems
+// event (#6566). However, using (macro) tasks everywhere also has subtle problems
// when state is changed right before repaint (e.g. #6813, out-in transitions).
-// Here we use micro task by default, but expose a way to force macro task when
+// Here we use microtask by default, but expose a way to force (macro) task when
// needed (e.g. in event handlers attached by v-on).
var microTimerFunc;
var macroTimerFunc;
var useMacroTask = false;
-// Determine (macro) Task defer implementation.
+// Determine (macro) task defer implementation.
// Technically setImmediate should be the ideal choice, but it's only available
// in IE. The only polyfill that consistently queues the callback after all DOM
// events triggered in the same loop is by using MessageChannel.
@@ -37575,7 +38207,7 @@ if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
};
}
-// Determine MicroTask defer implementation.
+// Determine microtask defer implementation.
/* istanbul ignore next, $flow-disable-line */
if (typeof Promise !== 'undefined' && isNative(Promise)) {
var p = Promise.resolve();
@@ -37595,14 +38227,16 @@ if (typeof Promise !== 'undefined' && isNative(Promise)) {
/**
* Wrap a function so that if any code inside triggers state change,
- * the changes are queued using a Task instead of a MicroTask.
+ * the changes are queued using a (macro) task instead of a microtask.
*/
function withMacroTask (fn) {
return fn._withTask || (fn._withTask = function () {
useMacroTask = true;
- var res = fn.apply(null, arguments);
- useMacroTask = false;
- return res
+ try {
+ return fn.apply(null, arguments)
+ } finally {
+ useMacroTask = false;
+ }
})
}
@@ -37683,9 +38317,18 @@ if (true) {
);
};
+ var warnReservedPrefix = function (target, key) {
+ warn(
+ "Property \"" + key + "\" must be accessed with \"$data." + key + "\" because " +
+ 'properties starting with "$" or "_" are not proxied in the Vue instance to ' +
+ 'prevent conflicts with Vue internals' +
+ 'See: https://vuejs.org/v2/api/#data',
+ target
+ );
+ };
+
var hasProxy =
- typeof Proxy !== 'undefined' &&
- Proxy.toString().match(/native code/);
+ typeof Proxy !== 'undefined' && isNative(Proxy);
if (hasProxy) {
var isBuiltInModifier = makeMap('stop,prevent,self,ctrl,shift,alt,meta,exact');
@@ -37705,9 +38348,11 @@ if (true) {
var hasHandler = {
has: function has (target, key) {
var has = key in target;
- var isAllowed = allowedGlobals(key) || key.charAt(0) === '_';
+ var isAllowed = allowedGlobals(key) ||
+ (typeof key === 'string' && key.charAt(0) === '_' && !(key in target.$data));
if (!has && !isAllowed) {
- warnNonPresent(target, key);
+ if (key in target.$data) { warnReservedPrefix(target, key); }
+ else { warnNonPresent(target, key); }
}
return has || !isAllowed
}
@@ -37716,7 +38361,8 @@ if (true) {
var getHandler = {
get: function get (target, key) {
if (typeof key === 'string' && !(key in target)) {
- warnNonPresent(target, key);
+ if (key in target.$data) { warnReservedPrefix(target, key); }
+ else { warnNonPresent(target, key); }
}
return target[key]
}
@@ -37753,7 +38399,7 @@ function traverse (val) {
function _traverse (val, seen) {
var i, keys;
var isA = Array.isArray(val);
- if ((!isA && !isObject(val)) || Object.isFrozen(val)) {
+ if ((!isA && !isObject(val)) || Object.isFrozen(val) || val instanceof VNode) {
return
}
if (val.__ob__) {
@@ -37814,14 +38460,14 @@ function updateListeners (
oldOn,
add,
remove$$1,
+ createOnceHandler,
vm
) {
- var name, def, cur, old, event;
+ var name, def$$1, cur, old, event;
for (name in on) {
- def = cur = on[name];
+ def$$1 = cur = on[name];
old = oldOn[name];
event = normalizeEvent(name);
- /* istanbul ignore if */
if (isUndef(cur)) {
"development" !== 'production' && warn(
"Invalid handler for event \"" + (event.name) + "\": got " + String(cur),
@@ -37831,7 +38477,10 @@ function updateListeners (
if (isUndef(cur.fns)) {
cur = on[name] = createFnInvoker(cur);
}
- add(event.name, cur, event.once, event.capture, event.passive, event.params);
+ if (isTrue(event.once)) {
+ cur = on[name] = createOnceHandler(event.name, cur, event.capture);
+ }
+ add(event.name, cur, event.capture, event.passive, event.params);
} else if (cur !== old) {
old.fns = cur;
on[name] = old;
@@ -38086,10 +38735,14 @@ function resolveAsyncComponent (
var contexts = factory.contexts = [context];
var sync = true;
- var forceRender = function () {
+ var forceRender = function (renderCompleted) {
for (var i = 0, l = contexts.length; i < l; i++) {
contexts[i].$forceUpdate();
}
+
+ if (renderCompleted) {
+ contexts.length = 0;
+ }
};
var resolve = once(function (res) {
@@ -38098,7 +38751,9 @@ function resolveAsyncComponent (
// invoke callbacks only if this is not a synchronous resolve
// (async resolves are shimmed as synchronous during SSR)
if (!sync) {
- forceRender();
+ forceRender(true);
+ } else {
+ contexts.length = 0;
}
});
@@ -38109,7 +38764,7 @@ function resolveAsyncComponent (
);
if (isDef(factory.errorComp)) {
factory.error = true;
- forceRender();
+ forceRender(true);
}
});
@@ -38136,7 +38791,7 @@ function resolveAsyncComponent (
setTimeout(function () {
if (isUndef(factory.resolved) && isUndef(factory.error)) {
factory.loading = true;
- forceRender();
+ forceRender(false);
}
}, res.delay || 200);
}
@@ -38199,37 +38854,41 @@ function initEvents (vm) {
var target;
-function add (event, fn, once) {
- if (once) {
- target.$once(event, fn);
- } else {
- target.$on(event, fn);
- }
+function add (event, fn) {
+ target.$on(event, fn);
}
function remove$1 (event, fn) {
target.$off(event, fn);
}
+function createOnceHandler (event, fn) {
+ var _target = target;
+ return function onceHandler () {
+ var res = fn.apply(null, arguments);
+ if (res !== null) {
+ _target.$off(event, onceHandler);
+ }
+ }
+}
+
function updateComponentListeners (
vm,
listeners,
oldListeners
) {
target = vm;
- updateListeners(listeners, oldListeners || {}, add, remove$1, vm);
+ updateListeners(listeners, oldListeners || {}, add, remove$1, createOnceHandler, vm);
target = undefined;
}
function eventsMixin (Vue) {
var hookRE = /^hook:/;
Vue.prototype.$on = function (event, fn) {
- var this$1 = this;
-
var vm = this;
if (Array.isArray(event)) {
for (var i = 0, l = event.length; i < l; i++) {
- this$1.$on(event[i], fn);
+ vm.$on(event[i], fn);
}
} else {
(vm._events[event] || (vm._events[event] = [])).push(fn);
@@ -38254,8 +38913,6 @@ function eventsMixin (Vue) {
};
Vue.prototype.$off = function (event, fn) {
- var this$1 = this;
-
var vm = this;
// all
if (!arguments.length) {
@@ -38264,8 +38921,8 @@ function eventsMixin (Vue) {
}
// array of events
if (Array.isArray(event)) {
- for (var i = 0, l = event.length; i < l; i++) {
- this$1.$off(event[i], fn);
+ for (var i$1 = 0, l = event.length; i$1 < l; i$1++) {
+ vm.$off(event[i$1], fn);
}
return vm
}
@@ -38278,16 +38935,14 @@ function eventsMixin (Vue) {
vm._events[event] = null;
return vm
}
- if (fn) {
- // specific handler
- var cb;
- var i$1 = cbs.length;
- while (i$1--) {
- cb = cbs[i$1];
- if (cb === fn || cb.fn === fn) {
- cbs.splice(i$1, 1);
- break
- }
+ // specific handler
+ var cb;
+ var i = cbs.length;
+ while (i--) {
+ cb = cbs[i];
+ if (cb === fn || cb.fn === fn) {
+ cbs.splice(i, 1);
+ break
}
}
return vm
@@ -38394,6 +39049,14 @@ function resolveScopedSlots (
var activeInstance = null;
var isUpdatingChildComponent = false;
+function setActiveInstance(vm) {
+ var prevActiveInstance = activeInstance;
+ activeInstance = vm;
+ return function () {
+ activeInstance = prevActiveInstance;
+ }
+}
+
function initLifecycle (vm) {
var options = vm.$options;
@@ -38423,31 +39086,20 @@ function initLifecycle (vm) {
function lifecycleMixin (Vue) {
Vue.prototype._update = function (vnode, hydrating) {
var vm = this;
- if (vm._isMounted) {
- callHook(vm, 'beforeUpdate');
- }
var prevEl = vm.$el;
var prevVnode = vm._vnode;
- var prevActiveInstance = activeInstance;
- activeInstance = vm;
+ var restoreActiveInstance = setActiveInstance(vm);
vm._vnode = vnode;
// Vue.prototype.__patch__ is injected in entry points
// based on the rendering backend used.
if (!prevVnode) {
// initial render
- vm.$el = vm.__patch__(
- vm.$el, vnode, hydrating, false /* removeOnly */,
- vm.$options._parentElm,
- vm.$options._refElm
- );
- // no need for the ref nodes after initial patch
- // this prevents keeping a detached DOM tree in memory (#5851)
- vm.$options._parentElm = vm.$options._refElm = null;
+ vm.$el = vm.__patch__(vm.$el, vnode, hydrating, false /* removeOnly */);
} else {
// updates
vm.$el = vm.__patch__(prevVnode, vnode);
}
- activeInstance = prevActiveInstance;
+ restoreActiveInstance();
// update __vue__ reference
if (prevEl) {
prevEl.__vue__ = null;
@@ -38570,7 +39222,13 @@ function mountComponent (
// we set this to vm._watcher inside the watcher's constructor
// since the watcher's initial patch may call $forceUpdate (e.g. inside child
// component's mounted hook), which relies on vm._watcher being already defined
- new Watcher(vm, updateComponent, noop, null, true /* isRenderWatcher */);
+ new Watcher(vm, updateComponent, noop, {
+ before: function before () {
+ if (vm._isMounted && !vm._isDestroyed) {
+ callHook(vm, 'beforeUpdate');
+ }
+ }
+ }, true /* isRenderWatcher */);
hydrating = false;
// manually mounted instance, call mounted on self
@@ -38613,29 +39271,30 @@ function updateChildComponent (
// update $attrs and $listeners hash
// these are also reactive so they may trigger child update if the child
// used them during render
- vm.$attrs = (parentVnode.data && parentVnode.data.attrs) || emptyObject;
+ vm.$attrs = parentVnode.data.attrs || emptyObject;
vm.$listeners = listeners || emptyObject;
// update props
if (propsData && vm.$options.props) {
- observerState.shouldConvert = false;
+ toggleObserving(false);
var props = vm._props;
var propKeys = vm.$options._propKeys || [];
for (var i = 0; i < propKeys.length; i++) {
var key = propKeys[i];
- props[key] = validateProp(key, vm.$options.props, propsData, vm);
+ var propOptions = vm.$options.props; // wtf flow?
+ props[key] = validateProp(key, propOptions, propsData, vm);
}
- observerState.shouldConvert = true;
+ toggleObserving(true);
// keep a copy of raw propsData
vm.$options.propsData = propsData;
}
// update listeners
- if (listeners) {
- var oldListeners = vm.$options._parentListeners;
- vm.$options._parentListeners = listeners;
- updateComponentListeners(vm, listeners, oldListeners);
- }
+ listeners = listeners || emptyObject;
+ var oldListeners = vm.$options._parentListeners;
+ vm.$options._parentListeners = listeners;
+ updateComponentListeners(vm, listeners, oldListeners);
+
// resolve slots + force update if has children
if (hasChildren) {
vm.$slots = resolveSlots(renderChildren, parentVnode.context);
@@ -38689,6 +39348,8 @@ function deactivateChildComponent (vm, direct) {
}
function callHook (vm, hook) {
+ // #7573 disable dep collection when invoking lifecycle hooks
+ pushTarget();
var handlers = vm.$options[hook];
if (handlers) {
for (var i = 0, j = handlers.length; i < j; i++) {
@@ -38702,11 +39363,11 @@ function callHook (vm, hook) {
if (vm._hasHookEvent) {
vm.$emit('hook:' + hook);
}
+ popTarget();
}
/* */
-
var MAX_UPDATE_COUNT = 100;
var queue = [];
@@ -38750,6 +39411,9 @@ function flushSchedulerQueue () {
// as we run existing watchers
for (index = 0; index < queue.length; index++) {
watcher = queue[index];
+ if (watcher.before) {
+ watcher.before();
+ }
id = watcher.id;
has[id] = null;
watcher.run();
@@ -38792,7 +39456,7 @@ function callUpdatedHooks (queue) {
while (i--) {
var watcher = queue[i];
var vm = watcher.vm;
- if (vm._watcher === watcher && vm._isMounted) {
+ if (vm._watcher === watcher && vm._isMounted && !vm._isDestroyed) {
callHook(vm, 'updated');
}
}
@@ -38839,6 +39503,11 @@ function queueWatcher (watcher) {
// queue the flush
if (!waiting) {
waiting = true;
+
+ if ("development" !== 'production' && !config.async) {
+ flushSchedulerQueue();
+ return
+ }
nextTick(flushSchedulerQueue);
}
}
@@ -38846,7 +39515,9 @@ function queueWatcher (watcher) {
/* */
-var uid$2 = 0;
+
+
+var uid$1 = 0;
/**
* A watcher parses an expression, collects dependencies,
@@ -38871,11 +39542,12 @@ var Watcher = function Watcher (
this.user = !!options.user;
this.lazy = !!options.lazy;
this.sync = !!options.sync;
+ this.before = options.before;
} else {
this.deep = this.user = this.lazy = this.sync = false;
}
this.cb = cb;
- this.id = ++uid$2; // uid for batching
+ this.id = ++uid$1; // uid for batching
this.active = true;
this.dirty = this.lazy; // for lazy watchers
this.deps = [];
@@ -38891,7 +39563,7 @@ var Watcher = function Watcher (
} else {
this.getter = parsePath(expOrFn);
if (!this.getter) {
- this.getter = function () {};
+ this.getter = noop;
"development" !== 'production' && warn(
"Failed watching path: \"" + expOrFn + "\" " +
'Watcher only accepts simple dot-delimited paths. ' +
@@ -38950,13 +39622,11 @@ Watcher.prototype.addDep = function addDep (dep) {
* Clean up for dependency collection.
*/
Watcher.prototype.cleanupDeps = function cleanupDeps () {
- var this$1 = this;
-
var i = this.deps.length;
while (i--) {
- var dep = this$1.deps[i];
- if (!this$1.newDepIds.has(dep.id)) {
- dep.removeSub(this$1);
+ var dep = this.deps[i];
+ if (!this.newDepIds.has(dep.id)) {
+ dep.removeSub(this);
}
}
var tmp = this.depIds;
@@ -39028,11 +39698,9 @@ Watcher.prototype.evaluate = function evaluate () {
* Depend on all deps collected by this watcher.
*/
Watcher.prototype.depend = function depend () {
- var this$1 = this;
-
var i = this.deps.length;
while (i--) {
- this$1.deps[i].depend();
+ this.deps[i].depend();
}
};
@@ -39040,8 +39708,6 @@ Watcher.prototype.depend = function depend () {
* Remove self from all dependencies' subscriber list.
*/
Watcher.prototype.teardown = function teardown () {
- var this$1 = this;
-
if (this.active) {
// remove self from vm's watcher list
// this is a somewhat expensive operation so we skip it
@@ -39051,7 +39717,7 @@ Watcher.prototype.teardown = function teardown () {
}
var i = this.deps.length;
while (i--) {
- this$1.deps[i].removeSub(this$1);
+ this.deps[i].removeSub(this);
}
this.active = false;
}
@@ -39100,7 +39766,9 @@ function initProps (vm, propsOptions) {
var keys = vm.$options._propKeys = [];
var isRoot = !vm.$parent;
// root instance props should be converted
- observerState.shouldConvert = isRoot;
+ if (!isRoot) {
+ toggleObserving(false);
+ }
var loop = function ( key ) {
keys.push(key);
var value = validateProp(key, propsOptions, propsData, vm);
@@ -39114,8 +39782,8 @@ function initProps (vm, propsOptions) {
vm
);
}
- defineReactive(props, key, value, function () {
- if (vm.$parent && !isUpdatingChildComponent) {
+ defineReactive$$1(props, key, value, function () {
+ if (!isRoot && !isUpdatingChildComponent) {
warn(
"Avoid mutating a prop directly since the value will be " +
"overwritten whenever the parent component re-renders. " +
@@ -39126,7 +39794,7 @@ function initProps (vm, propsOptions) {
}
});
} else {
- defineReactive(props, key, value);
+ defineReactive$$1(props, key, value);
}
// static props are already proxied on the component's prototype
// during Vue.extend(). We only need to proxy props defined at
@@ -39137,7 +39805,7 @@ function initProps (vm, propsOptions) {
};
for (var key in propsOptions) loop( key );
- observerState.shouldConvert = true;
+ toggleObserving(true);
}
function initData (vm) {
@@ -39183,11 +39851,15 @@ function initData (vm) {
}
function getData (data, vm) {
+ // #7573 disable dep collection when invoking data getters
+ pushTarget();
try {
return data.call(vm, vm)
} catch (e) {
handleError(e, vm, "data()");
return {}
+ } finally {
+ popTarget();
}
}
@@ -39243,17 +39915,15 @@ function defineComputed (
if (typeof userDef === 'function') {
sharedPropertyDefinition.get = shouldCache
? createComputedGetter(key)
- : userDef;
+ : createGetterInvoker(userDef);
sharedPropertyDefinition.set = noop;
} else {
sharedPropertyDefinition.get = userDef.get
? shouldCache && userDef.cache !== false
? createComputedGetter(key)
- : userDef.get
- : noop;
- sharedPropertyDefinition.set = userDef.set
- ? userDef.set
+ : createGetterInvoker(userDef.get)
: noop;
+ sharedPropertyDefinition.set = userDef.set || noop;
}
if ("development" !== 'production' &&
sharedPropertyDefinition.set === noop) {
@@ -39282,13 +39952,19 @@ function createComputedGetter (key) {
}
}
+function createGetterInvoker(fn) {
+ return function computedGetter () {
+ return fn.call(this, this)
+ }
+}
+
function initMethods (vm, methods) {
var props = vm.$options.props;
for (var key in methods) {
if (true) {
- if (methods[key] == null) {
+ if (typeof methods[key] !== 'function') {
warn(
- "Method \"" + key + "\" has an undefined value in the component definition. " +
+ "Method \"" + key + "\" has type \"" + (typeof methods[key]) + "\" in the component definition. " +
"Did you reference the function correctly?",
vm
);
@@ -39306,7 +39982,7 @@ function initMethods (vm, methods) {
);
}
}
- vm[key] = methods[key] == null ? noop : bind(methods[key], vm);
+ vm[key] = typeof methods[key] !== 'function' ? noop : bind(methods[key], vm);
}
}
@@ -39325,7 +40001,7 @@ function initWatch (vm, watch) {
function createWatcher (
vm,
- keyOrFn,
+ expOrFn,
handler,
options
) {
@@ -39336,7 +40012,7 @@ function createWatcher (
if (typeof handler === 'string') {
handler = vm[handler];
}
- return vm.$watch(keyOrFn, handler, options)
+ return vm.$watch(expOrFn, handler, options)
}
function stateMixin (Vue) {
@@ -39348,7 +40024,7 @@ function stateMixin (Vue) {
var propsDef = {};
propsDef.get = function () { return this._props };
if (true) {
- dataDef.set = function (newData) {
+ dataDef.set = function () {
warn(
'Avoid replacing instance root $data. ' +
'Use nested data properties instead.',
@@ -39378,7 +40054,11 @@ function stateMixin (Vue) {
options.user = true;
var watcher = new Watcher(vm, expOrFn, cb, options);
if (options.immediate) {
- cb.call(vm, watcher.value);
+ try {
+ cb.call(vm, watcher.value);
+ } catch (error) {
+ handleError(error, vm, ("callback for immediate watcher \"" + (watcher.expression) + "\""));
+ }
}
return function unwatchFn () {
watcher.teardown();
@@ -39400,11 +40080,11 @@ function initProvide (vm) {
function initInjections (vm) {
var result = resolveInject(vm.$options.inject, vm);
if (result) {
- observerState.shouldConvert = false;
+ toggleObserving(false);
Object.keys(result).forEach(function (key) {
/* istanbul ignore else */
if (true) {
- defineReactive(vm, key, result[key], function () {
+ defineReactive$$1(vm, key, result[key], function () {
warn(
"Avoid mutating an injected value directly since the changes will be " +
"overwritten whenever the provided component re-renders. " +
@@ -39413,10 +40093,10 @@ function initInjections (vm) {
);
});
} else {
- defineReactive(vm, key, result[key]);
+ defineReactive$$1(vm, key, result[key]);
}
});
- observerState.shouldConvert = true;
+ toggleObserving(true);
}
}
@@ -39436,7 +40116,7 @@ function resolveInject (inject, vm) {
var provideKey = inject[key].from;
var source = vm;
while (source) {
- if (source._provided && provideKey in source._provided) {
+ if (source._provided && hasOwn(source._provided, provideKey)) {
result[key] = source._provided[provideKey];
break
}
@@ -39485,9 +40165,10 @@ function renderList (
ret[i] = render(val[key], key, i);
}
}
- if (isDef(ret)) {
- (ret)._isVList = true;
+ if (!isDef(ret)) {
+ ret = [];
}
+ (ret)._isVList = true;
return ret
}
@@ -39517,19 +40198,7 @@ function renderSlot (
}
nodes = scopedSlotFn(props) || fallback;
} else {
- var slotNodes = this.$slots[name];
- // warn duplicate slot usage
- if (slotNodes) {
- if ("development" !== 'production' && slotNodes._rendered) {
- warn(
- "Duplicate presence of slot \"" + name + "\" found in the same render tree " +
- "- this will likely cause render errors.",
- this
- );
- }
- slotNodes._rendered = true;
- }
- nodes = slotNodes || fallback;
+ nodes = this.$slots[name] || fallback;
}
var target = props && props.slot;
@@ -39551,6 +40220,14 @@ function resolveFilter (id) {
/* */
+function isKeyNotMatch (expect, actual) {
+ if (Array.isArray(expect)) {
+ return expect.indexOf(actual) === -1
+ } else {
+ return expect !== actual
+ }
+}
+
/**
* Runtime helper for checking keyCodes from config.
* exposed as Vue.prototype._k
@@ -39559,16 +40236,15 @@ function resolveFilter (id) {
function checkKeyCodes (
eventKeyCode,
key,
- builtInAlias,
- eventKeyName
+ builtInKeyCode,
+ eventKeyName,
+ builtInKeyName
) {
- var keyCodes = config.keyCodes[key] || builtInAlias;
- if (keyCodes) {
- if (Array.isArray(keyCodes)) {
- return keyCodes.indexOf(eventKeyCode) === -1
- } else {
- return keyCodes !== eventKeyCode
- }
+ var mappedKeyCode = config.keyCodes[key] || builtInKeyCode;
+ if (builtInKeyName && eventKeyName && !config.keyCodes[key]) {
+ return isKeyNotMatch(builtInKeyName, eventKeyName)
+ } else if (mappedKeyCode) {
+ return isKeyNotMatch(mappedKeyCode, eventKeyCode)
} else if (eventKeyName) {
return hyphenate(eventKeyName) !== key
}
@@ -39610,12 +40286,13 @@ function bindObjectProps (
? data.domProps || (data.domProps = {})
: data.attrs || (data.attrs = {});
}
- if (!(key in hash)) {
+ var camelizedKey = camelize(key);
+ if (!(key in hash) && !(camelizedKey in hash)) {
hash[key] = value[key];
if (isSync) {
var on = data.on || (data.on = {});
- on[("update:" + key)] = function ($event) {
+ on[("update:" + camelizedKey)] = function ($event) {
value[key] = $event;
};
}
@@ -39640,11 +40317,9 @@ function renderStatic (
var cached = this._staticTrees || (this._staticTrees = []);
var tree = cached[index];
// if has already-rendered static tree and not inside v-for,
- // we can reuse the same tree by doing a shallow clone.
+ // we can reuse the same tree.
if (tree && !isInFor) {
- return Array.isArray(tree)
- ? cloneVNodes(tree)
- : cloneVNode(tree)
+ return tree
}
// otherwise, render a fresh tree.
tree = cached[index] = this.$options.staticRenderFns[index].call(
@@ -39742,6 +40417,24 @@ function FunctionalRenderContext (
Ctor
) {
var options = Ctor.options;
+ // ensure the createElement function in functional components
+ // gets a unique context - this is necessary for correct named slot check
+ var contextVm;
+ if (hasOwn(parent, '_uid')) {
+ contextVm = Object.create(parent);
+ // $flow-disable-line
+ contextVm._original = parent;
+ } else {
+ // the context vm passed in is a functional context as well.
+ // in this case we want to make sure we are able to get a hold to the
+ // real context instance.
+ contextVm = parent;
+ // $flow-disable-line
+ parent = parent._original;
+ }
+ var isCompiled = isTrue(options._compiled);
+ var needNormalization = !isCompiled;
+
this.data = data;
this.props = props;
this.children = children;
@@ -39750,12 +40443,6 @@ function FunctionalRenderContext (
this.injections = resolveInject(options.inject, parent);
this.slots = function () { return resolveSlots(children, parent); };
- // ensure the createElement function in functional components
- // gets a unique context - this is necessary for correct named slot check
- var contextVm = Object.create(parent);
- var isCompiled = isTrue(options._compiled);
- var needNormalization = !isCompiled;
-
// support for compiled functional template
if (isCompiled) {
// exposing $options for renderStatic()
@@ -39768,7 +40455,7 @@ function FunctionalRenderContext (
if (options._scopeId) {
this._c = function (a, b, c, d) {
var vnode = createElement(contextVm, a, b, c, d, needNormalization);
- if (vnode) {
+ if (vnode && !Array.isArray(vnode)) {
vnode.fnScopeId = options._scopeId;
vnode.fnContext = parent;
}
@@ -39811,14 +40498,31 @@ function createFunctionalComponent (
var vnode = options.render.call(null, renderContext._c, renderContext);
if (vnode instanceof VNode) {
- vnode.fnContext = contextVm;
- vnode.fnOptions = options;
- if (data.slot) {
- (vnode.data || (vnode.data = {})).slot = data.slot;
+ return cloneAndMarkFunctionalResult(vnode, data, renderContext.parent, options, renderContext)
+ } else if (Array.isArray(vnode)) {
+ var vnodes = normalizeChildren(vnode) || [];
+ var res = new Array(vnodes.length);
+ for (var i = 0; i < vnodes.length; i++) {
+ res[i] = cloneAndMarkFunctionalResult(vnodes[i], data, renderContext.parent, options, renderContext);
}
+ return res
}
+}
- return vnode
+function cloneAndMarkFunctionalResult (vnode, data, contextVm, options, renderContext) {
+ // #7817 clone node before setting fnContext, otherwise if the node is reused
+ // (e.g. it was from a cached normal slot) the fnContext causes named slots
+ // that should not be matched to match.
+ var clone = cloneVNode(vnode);
+ clone.fnContext = contextVm;
+ clone.fnOptions = options;
+ if (true) {
+ (clone.devtoolsMeta = clone.devtoolsMeta || {}).renderContext = renderContext;
+ }
+ if (data.slot) {
+ (clone.data || (clone.data = {})).slot = data.slot;
+ }
+ return clone
}
function mergeProps (to, from) {
@@ -39829,45 +40533,29 @@ function mergeProps (to, from) {
/* */
-
-
-
-// Register the component hook to weex native render engine.
-// The hook will be triggered by native, not javascript.
-
-
-// Updates the state of the component to weex native render engine.
-
/* */
-// https://github.com/Hanks10100/weex-native-directive/tree/master/component
-
-// listening on native callback
-
/* */
/* */
-// hooks to be invoked on component VNodes during patch
+// inline hooks to be invoked on component VNodes during patch
var componentVNodeHooks = {
- init: function init (
- vnode,
- hydrating,
- parentElm,
- refElm
- ) {
- if (!vnode.componentInstance || vnode.componentInstance._isDestroyed) {
+ init: function init (vnode, hydrating) {
+ if (
+ vnode.componentInstance &&
+ !vnode.componentInstance._isDestroyed &&
+ vnode.data.keepAlive
+ ) {
+ // kept-alive components, treat as a patch
+ var mountedNode = vnode; // work around flow
+ componentVNodeHooks.prepatch(mountedNode, mountedNode);
+ } else {
var child = vnode.componentInstance = createComponentInstanceForVnode(
vnode,
- activeInstance,
- parentElm,
- refElm
+ activeInstance
);
child.$mount(hydrating ? vnode.elm : undefined, hydrating);
- } else if (vnode.data.keepAlive) {
- // kept-alive components, treat as a patch
- var mountedNode = vnode; // work around flow
- componentVNodeHooks.prepatch(mountedNode, mountedNode);
}
},
@@ -40002,8 +40690,8 @@ function createComponent (
}
}
- // merge component management hooks onto the placeholder node
- mergeHooks(data);
+ // install component management hooks onto the placeholder node
+ installComponentHooks(data);
// return a placeholder vnode
var name = Ctor.options.name || tag;
@@ -40014,25 +40702,17 @@ function createComponent (
asyncFactory
);
- // Weex specific: invoke recycle-list optimized @render function for
- // extracting cell-slot template.
- // https://github.com/Hanks10100/weex-native-directive/tree/master/component
- /* istanbul ignore if */
return vnode
}
function createComponentInstanceForVnode (
vnode, // we know it's MountedComponentVNode but flow doesn't
- parent, // activeInstance in lifecycle state
- parentElm,
- refElm
+ parent // activeInstance in lifecycle state
) {
var options = {
_isComponent: true,
- parent: parent,
_parentVnode: vnode,
- _parentElm: parentElm || null,
- _refElm: refElm || null
+ parent: parent
};
// check inline-template render functions
var inlineTemplate = vnode.data.inlineTemplate;
@@ -40043,35 +40723,47 @@ function createComponentInstanceForVnode (
return new vnode.componentOptions.Ctor(options)
}
-function mergeHooks (data) {
- if (!data.hook) {
- data.hook = {};
- }
+function installComponentHooks (data) {
+ var hooks = data.hook || (data.hook = {});
for (var i = 0; i < hooksToMerge.length; i++) {
var key = hooksToMerge[i];
- var fromParent = data.hook[key];
- var ours = componentVNodeHooks[key];
- data.hook[key] = fromParent ? mergeHook$1(ours, fromParent) : ours;
+ var existing = hooks[key];
+ var toMerge = componentVNodeHooks[key];
+ if (existing !== toMerge && !(existing && existing._merged)) {
+ hooks[key] = existing ? mergeHook$1(toMerge, existing) : toMerge;
+ }
}
}
-function mergeHook$1 (one, two) {
- return function (a, b, c, d) {
- one(a, b, c, d);
- two(a, b, c, d);
- }
+function mergeHook$1 (f1, f2) {
+ var merged = function (a, b) {
+ // flow complains about extra args which is why we use any
+ f1(a, b);
+ f2(a, b);
+ };
+ merged._merged = true;
+ return merged
}
// transform component v-model info (value and callback) into
// prop and event handler respectively.
function transformModel (options, data) {
var prop = (options.model && options.model.prop) || 'value';
- var event = (options.model && options.model.event) || 'input';(data.props || (data.props = {}))[prop] = data.model.value;
+ var event = (options.model && options.model.event) || 'input'
+ ;(data.props || (data.props = {}))[prop] = data.model.value;
var on = data.on || (data.on = {});
- if (isDef(on[event])) {
- on[event] = [data.model.callback].concat(on[event]);
+ var existing = on[event];
+ var callback = data.model.callback;
+ if (isDef(existing)) {
+ if (
+ Array.isArray(existing)
+ ? existing.indexOf(callback) === -1
+ : existing !== callback
+ ) {
+ on[event] = [callback].concat(existing);
+ }
} else {
- on[event] = data.model.callback;
+ on[event] = callback;
}
}
@@ -40159,7 +40851,7 @@ function _createElement (
config.parsePlatformTagName(tag), data, children,
undefined, undefined, context
);
- } else if (isDef(Ctor = resolveAsset(context.$options, 'components', tag))) {
+ } else if ((!data || !data.pre) && isDef(Ctor = resolveAsset(context.$options, 'components', tag))) {
// component
vnode = createComponent(Ctor, data, context, children, tag);
} else {
@@ -40175,8 +40867,11 @@ function _createElement (
// direct component options / constructor
vnode = createComponent(tag, data, context, children);
}
- if (isDef(vnode)) {
- if (ns) { applyNS(vnode, ns); }
+ if (Array.isArray(vnode)) {
+ return vnode
+ } else if (isDef(vnode)) {
+ if (isDef(ns)) { applyNS(vnode, ns); }
+ if (isDef(data)) { registerDeepBindings(data); }
return vnode
} else {
return createEmptyVNode()
@@ -40193,13 +40888,26 @@ function applyNS (vnode, ns, force) {
if (isDef(vnode.children)) {
for (var i = 0, l = vnode.children.length; i < l; i++) {
var child = vnode.children[i];
- if (isDef(child.tag) && (isUndef(child.ns) || isTrue(force))) {
+ if (isDef(child.tag) && (
+ isUndef(child.ns) || (isTrue(force) && child.tag !== 'svg'))) {
applyNS(child, ns, force);
}
}
}
}
+// ref #5318
+// necessary to ensure parent re-render when deep bindings like :style and
+// :class are used on slot nodes
+function registerDeepBindings (data) {
+ if (isObject(data.style)) {
+ traverse(data.style);
+ }
+ if (isObject(data.class)) {
+ traverse(data.class);
+ }
+}
+
/* */
function initRender (vm) {
@@ -40225,15 +40933,15 @@ function initRender (vm) {
/* istanbul ignore else */
if (true) {
- defineReactive(vm, '$attrs', parentData && parentData.attrs || emptyObject, function () {
+ defineReactive$$1(vm, '$attrs', parentData && parentData.attrs || emptyObject, function () {
!isUpdatingChildComponent && warn("$attrs is readonly.", vm);
}, true);
- defineReactive(vm, '$listeners', options._parentListeners || emptyObject, function () {
+ defineReactive$$1(vm, '$listeners', options._parentListeners || emptyObject, function () {
!isUpdatingChildComponent && warn("$listeners is readonly.", vm);
}, true);
} else {
- defineReactive(vm, '$attrs', parentData && parentData.attrs || emptyObject, null, true);
- defineReactive(vm, '$listeners', options._parentListeners || emptyObject, null, true);
+ defineReactive$$1(vm, '$attrs', parentData && parentData.attrs || emptyObject, null, true);
+ defineReactive$$1(vm, '$listeners', options._parentListeners || emptyObject, null, true);
}
}
@@ -40251,21 +40959,10 @@ function renderMixin (Vue) {
var render = ref.render;
var _parentVnode = ref._parentVnode;
- if (vm._isMounted) {
- // if the parent didn't update, the slot nodes will be the ones from
- // last render. They need to be cloned to ensure "freshness" for this render.
- for (var key in vm.$slots) {
- var slot = vm.$slots[key];
- // _rendered is a flag added by renderSlot, but may not be present
- // if the slot is passed from manually written render functions
- if (slot._rendered || (slot[0] && slot[0].elm)) {
- vm.$slots[key] = cloneVNodes(slot, true /* deep */);
- }
- }
+ if (_parentVnode) {
+ vm.$scopedSlots = _parentVnode.data.scopedSlots || emptyObject;
}
- vm.$scopedSlots = (_parentVnode && _parentVnode.data.scopedSlots) || emptyObject;
-
// set parent vnode. this allows render functions to have access
// to the data on the placeholder node.
vm.$vnode = _parentVnode;
@@ -40278,15 +40975,11 @@ function renderMixin (Vue) {
// return error render result,
// or previous vnode to prevent render error causing blank component
/* istanbul ignore else */
- if (true) {
- if (vm.$options.renderError) {
- try {
- vnode = vm.$options.renderError.call(vm._renderProxy, vm.$createElement, e);
- } catch (e) {
- handleError(e, vm, "renderError");
- vnode = vm._vnode;
- }
- } else {
+ if ("development" !== 'production' && vm.$options.renderError) {
+ try {
+ vnode = vm.$options.renderError.call(vm._renderProxy, vm.$createElement, e);
+ } catch (e) {
+ handleError(e, vm, "renderError");
vnode = vm._vnode;
}
} else {
@@ -40312,13 +41005,13 @@ function renderMixin (Vue) {
/* */
-var uid$1 = 0;
+var uid$3 = 0;
function initMixin (Vue) {
Vue.prototype._init = function (options) {
var vm = this;
// a uid
- vm._uid = uid$1++;
+ vm._uid = uid$3++;
var startTag, endTag;
/* istanbul ignore if */
@@ -40379,8 +41072,6 @@ function initInternalComponent (vm, options) {
var parentVnode = options._parentVnode;
opts.parent = options.parent;
opts._parentVnode = parentVnode;
- opts._parentElm = options._parentElm;
- opts._refElm = options._refElm;
var vnodeComponentOptions = parentVnode.componentOptions;
opts.propsData = vnodeComponentOptions.propsData;
@@ -40421,50 +41112,30 @@ function resolveConstructorOptions (Ctor) {
function resolveModifiedOptions (Ctor) {
var modified;
var latest = Ctor.options;
- var extended = Ctor.extendOptions;
var sealed = Ctor.sealedOptions;
for (var key in latest) {
if (latest[key] !== sealed[key]) {
if (!modified) { modified = {}; }
- modified[key] = dedupe(latest[key], extended[key], sealed[key]);
+ modified[key] = latest[key];
}
}
return modified
}
-function dedupe (latest, extended, sealed) {
- // compare latest and sealed to ensure lifecycle hooks won't be duplicated
- // between merges
- if (Array.isArray(latest)) {
- var res = [];
- sealed = Array.isArray(sealed) ? sealed : [sealed];
- extended = Array.isArray(extended) ? extended : [extended];
- for (var i = 0; i < latest.length; i++) {
- // push original options and not sealed options to exclude duplicated options
- if (extended.indexOf(latest[i]) >= 0 || sealed.indexOf(latest[i]) < 0) {
- res.push(latest[i]);
- }
- }
- return res
- } else {
- return latest
- }
-}
-
-function Vue$3 (options) {
+function Vue (options) {
if ("development" !== 'production' &&
- !(this instanceof Vue$3)
+ !(this instanceof Vue)
) {
warn('Vue is a constructor and should be called with the `new` keyword');
}
this._init(options);
}
-initMixin(Vue$3);
-stateMixin(Vue$3);
-eventsMixin(Vue$3);
-lifecycleMixin(Vue$3);
-renderMixin(Vue$3);
+initMixin(Vue);
+stateMixin(Vue);
+eventsMixin(Vue);
+lifecycleMixin(Vue);
+renderMixin(Vue);
/* */
@@ -40623,6 +41294,8 @@ function initAssetRegisters (Vue) {
/* */
+
+
function getComponentName (opts) {
return opts && (opts.Ctor.options.name || opts.tag)
}
@@ -40686,20 +41359,20 @@ var KeepAlive = {
},
destroyed: function destroyed () {
- var this$1 = this;
-
- for (var key in this$1.cache) {
- pruneCacheEntry(this$1.cache, key, this$1.keys);
+ for (var key in this.cache) {
+ pruneCacheEntry(this.cache, key, this.keys);
}
},
- watch: {
- include: function include (val) {
- pruneCache(this, function (name) { return matches(val, name); });
- },
- exclude: function exclude (val) {
- pruneCache(this, function (name) { return !matches(val, name); });
- }
+ mounted: function mounted () {
+ var this$1 = this;
+
+ this.$watch('include', function (val) {
+ pruneCache(this$1, function (name) { return matches(val, name); });
+ });
+ this.$watch('exclude', function (val) {
+ pruneCache(this$1, function (name) { return !matches(val, name); });
+ });
},
render: function render () {
@@ -40775,7 +41448,7 @@ function initGlobalAPI (Vue) {
warn: warn,
extend: extend,
mergeOptions: mergeOptions,
- defineReactive: defineReactive
+ defineReactive: defineReactive$$1
};
Vue.set = set;
@@ -40799,20 +41472,25 @@ function initGlobalAPI (Vue) {
initAssetRegisters(Vue);
}
-initGlobalAPI(Vue$3);
+initGlobalAPI(Vue);
-Object.defineProperty(Vue$3.prototype, '$isServer', {
+Object.defineProperty(Vue.prototype, '$isServer', {
get: isServerRendering
});
-Object.defineProperty(Vue$3.prototype, '$ssrContext', {
+Object.defineProperty(Vue.prototype, '$ssrContext', {
get: function get () {
/* istanbul ignore next */
return this.$vnode && this.$vnode.ssrContext
}
});
-Vue$3.version = '2.5.13';
+// expose FunctionalRenderContext for ssr runtime helper installation
+Object.defineProperty(Vue, 'FunctionalRenderContext', {
+ value: FunctionalRenderContext
+});
+
+Vue.version = '2.5.22';
/* */
@@ -41086,24 +41764,23 @@ function setTextContent (node, text) {
node.textContent = text;
}
-function setAttribute (node, key, val) {
- node.setAttribute(key, val);
+function setStyleScope (node, scopeId) {
+ node.setAttribute(scopeId, '');
}
-
-var nodeOps = Object.freeze({
- createElement: createElement$1,
- createElementNS: createElementNS,
- createTextNode: createTextNode,
- createComment: createComment,
- insertBefore: insertBefore,
- removeChild: removeChild,
- appendChild: appendChild,
- parentNode: parentNode,
- nextSibling: nextSibling,
- tagName: tagName,
- setTextContent: setTextContent,
- setAttribute: setAttribute
+var nodeOps = /*#__PURE__*/Object.freeze({
+ createElement: createElement$1,
+ createElementNS: createElementNS,
+ createTextNode: createTextNode,
+ createComment: createComment,
+ insertBefore: insertBefore,
+ removeChild: removeChild,
+ appendChild: appendChild,
+ parentNode: parentNode,
+ nextSibling: nextSibling,
+ tagName: tagName,
+ setTextContent: setTextContent,
+ setStyleScope: setStyleScope
});
/* */
@@ -41125,7 +41802,7 @@ var ref = {
function registerRef (vnode, isRemoval) {
var key = vnode.data.ref;
- if (!key) { return }
+ if (!isDef(key)) { return }
var vm = vnode.context;
var ref = vnode.componentInstance || vnode.elm;
@@ -41222,13 +41899,13 @@ function createPatchFunction (backend) {
}
function createRmCb (childElm, listeners) {
- function remove () {
- if (--remove.listeners === 0) {
+ function remove$$1 () {
+ if (--remove$$1.listeners === 0) {
removeNode(childElm);
}
}
- remove.listeners = listeners;
- return remove
+ remove$$1.listeners = listeners;
+ return remove$$1
}
function removeNode (el) {
@@ -41256,7 +41933,25 @@ function createPatchFunction (backend) {
}
var creatingElmInVPre = 0;
- function createElm (vnode, insertedVnodeQueue, parentElm, refElm, nested) {
+
+ function createElm (
+ vnode,
+ insertedVnodeQueue,
+ parentElm,
+ refElm,
+ nested,
+ ownerArray,
+ index
+ ) {
+ if (isDef(vnode.elm) && isDef(ownerArray)) {
+ // This vnode was used in a previous render!
+ // now it's used as a new node, overwriting its elm would cause
+ // potential patch errors down the road when it's used as an insertion
+ // reference node. Instead, we clone the node on-demand before creating
+ // associated DOM element for it.
+ vnode = ownerArray[index] = cloneVNode(vnode);
+ }
+
vnode.isRootInsert = !nested; // for transition enter check
if (createComponent(vnode, insertedVnodeQueue, parentElm, refElm)) {
return
@@ -41279,6 +41974,7 @@ function createPatchFunction (backend) {
);
}
}
+
vnode.elm = vnode.ns
? nodeOps.createElementNS(vnode.ns, tag)
: nodeOps.createElement(tag, vnode);
@@ -41310,7 +42006,7 @@ function createPatchFunction (backend) {
if (isDef(i)) {
var isReactivated = isDef(vnode.componentInstance) && i.keepAlive;
if (isDef(i = i.hook) && isDef(i = i.init)) {
- i(vnode, false /* hydrating */, parentElm, refElm);
+ i(vnode, false /* hydrating */);
}
// after calling the init hook, if the vnode is a child component
// it should've created a child instance and mounted it. the child
@@ -41318,6 +42014,7 @@ function createPatchFunction (backend) {
// in that case we can just return the element and be done.
if (isDef(vnode.componentInstance)) {
initComponent(vnode, insertedVnodeQueue);
+ insert(parentElm, vnode.elm, refElm);
if (isTrue(isReactivated)) {
reactivateComponent(vnode, insertedVnodeQueue, parentElm, refElm);
}
@@ -41369,7 +42066,7 @@ function createPatchFunction (backend) {
function insert (parent, elm, ref$$1) {
if (isDef(parent)) {
if (isDef(ref$$1)) {
- if (ref$$1.parentNode === parent) {
+ if (nodeOps.parentNode(ref$$1) === parent) {
nodeOps.insertBefore(parent, elm, ref$$1);
}
} else {
@@ -41384,7 +42081,7 @@ function createPatchFunction (backend) {
checkDuplicateKeys(children);
}
for (var i = 0; i < children.length; ++i) {
- createElm(children[i], insertedVnodeQueue, vnode.elm, null, true);
+ createElm(children[i], insertedVnodeQueue, vnode.elm, null, true, children, i);
}
} else if (isPrimitive(vnode.text)) {
nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(String(vnode.text)));
@@ -41415,12 +42112,12 @@ function createPatchFunction (backend) {
function setScope (vnode) {
var i;
if (isDef(i = vnode.fnScopeId)) {
- nodeOps.setAttribute(vnode.elm, i, '');
+ nodeOps.setStyleScope(vnode.elm, i);
} else {
var ancestor = vnode;
while (ancestor) {
if (isDef(i = ancestor.context) && isDef(i = i.$options._scopeId)) {
- nodeOps.setAttribute(vnode.elm, i, '');
+ nodeOps.setStyleScope(vnode.elm, i);
}
ancestor = ancestor.parent;
}
@@ -41431,13 +42128,13 @@ function createPatchFunction (backend) {
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
) {
- nodeOps.setAttribute(vnode.elm, i, '');
+ nodeOps.setStyleScope(vnode.elm, i);
}
}
function addVnodes (parentElm, refElm, vnodes, startIdx, endIdx, insertedVnodeQueue) {
for (; startIdx <= endIdx; ++startIdx) {
- createElm(vnodes[startIdx], insertedVnodeQueue, parentElm, refElm);
+ createElm(vnodes[startIdx], insertedVnodeQueue, parentElm, refElm, false, vnodes, startIdx);
}
}
@@ -41524,20 +42221,20 @@ function createPatchFunction (backend) {
} else if (isUndef(oldEndVnode)) {
oldEndVnode = oldCh[--oldEndIdx];
} else if (sameVnode(oldStartVnode, newStartVnode)) {
- patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue);
+ patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
oldStartVnode = oldCh[++oldStartIdx];
newStartVnode = newCh[++newStartIdx];
} else if (sameVnode(oldEndVnode, newEndVnode)) {
- patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue);
+ patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
oldEndVnode = oldCh[--oldEndIdx];
newEndVnode = newCh[--newEndIdx];
} else if (sameVnode(oldStartVnode, newEndVnode)) { // Vnode moved right
- patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue);
+ patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
canMove && nodeOps.insertBefore(parentElm, oldStartVnode.elm, nodeOps.nextSibling(oldEndVnode.elm));
oldStartVnode = oldCh[++oldStartIdx];
newEndVnode = newCh[--newEndIdx];
} else if (sameVnode(oldEndVnode, newStartVnode)) { // Vnode moved left
- patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue);
+ patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
canMove && nodeOps.insertBefore(parentElm, oldEndVnode.elm, oldStartVnode.elm);
oldEndVnode = oldCh[--oldEndIdx];
newStartVnode = newCh[++newStartIdx];
@@ -41547,16 +42244,16 @@ function createPatchFunction (backend) {
? oldKeyToIdx[newStartVnode.key]
: findIdxInOld(newStartVnode, oldCh, oldStartIdx, oldEndIdx);
if (isUndef(idxInOld)) { // New element
- createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm);
+ createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
} else {
vnodeToMove = oldCh[idxInOld];
if (sameVnode(vnodeToMove, newStartVnode)) {
- patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue);
+ patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
oldCh[idxInOld] = undefined;
canMove && nodeOps.insertBefore(parentElm, vnodeToMove.elm, oldStartVnode.elm);
} else {
// same key but different element. treat as new element
- createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm);
+ createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
}
}
newStartVnode = newCh[++newStartIdx];
@@ -41595,11 +42292,23 @@ function createPatchFunction (backend) {
}
}
- function patchVnode (oldVnode, vnode, insertedVnodeQueue, removeOnly) {
+ function patchVnode (
+ oldVnode,
+ vnode,
+ insertedVnodeQueue,
+ ownerArray,
+ index,
+ removeOnly
+ ) {
if (oldVnode === vnode) {
return
}
+ if (isDef(vnode.elm) && isDef(ownerArray)) {
+ // clone reused vnode
+ vnode = ownerArray[index] = cloneVNode(vnode);
+ }
+
var elm = vnode.elm = oldVnode.elm;
if (isTrue(oldVnode.isAsyncPlaceholder)) {
@@ -41640,6 +42349,9 @@ function createPatchFunction (backend) {
if (isDef(oldCh) && isDef(ch)) {
if (oldCh !== ch) { updateChildren(elm, oldCh, ch, insertedVnodeQueue, removeOnly); }
} else if (isDef(ch)) {
+ if (true) {
+ checkDuplicateKeys(ch);
+ }
if (isDef(oldVnode.text)) { nodeOps.setTextContent(elm, ''); }
addVnodes(elm, null, ch, 0, ch.length - 1, insertedVnodeQueue);
} else if (isDef(oldCh)) {
@@ -41781,7 +42493,7 @@ function createPatchFunction (backend) {
}
}
- return function patch (oldVnode, vnode, hydrating, removeOnly, parentElm, refElm) {
+ return function patch (oldVnode, vnode, hydrating, removeOnly) {
if (isUndef(vnode)) {
if (isDef(oldVnode)) { invokeDestroyHook(oldVnode); }
return
@@ -41793,12 +42505,12 @@ function createPatchFunction (backend) {
if (isUndef(oldVnode)) {
// empty mount (likely as component), create new root element
isInitialPatch = true;
- createElm(vnode, insertedVnodeQueue, parentElm, refElm);
+ createElm(vnode, insertedVnodeQueue);
} else {
var isRealElement = isDef(oldVnode.nodeType);
if (!isRealElement && sameVnode(oldVnode, vnode)) {
// patch existing root node
- patchVnode(oldVnode, vnode, insertedVnodeQueue, removeOnly);
+ patchVnode(oldVnode, vnode, insertedVnodeQueue, null, null, removeOnly);
} else {
if (isRealElement) {
// mounting to a real element
@@ -41829,7 +42541,7 @@ function createPatchFunction (backend) {
// replacing existing element
var oldElm = oldVnode.elm;
- var parentElm$1 = nodeOps.parentNode(oldElm);
+ var parentElm = nodeOps.parentNode(oldElm);
// create new node
createElm(
@@ -41838,7 +42550,7 @@ function createPatchFunction (backend) {
// extremely rare edge case: do not insert if old element is in a
// leaving transition. Only happens when combining transition +
// keep-alive + HOCs. (#4590)
- oldElm._leaveCb ? null : parentElm$1,
+ oldElm._leaveCb ? null : parentElm,
nodeOps.nextSibling(oldElm)
);
@@ -41873,8 +42585,8 @@ function createPatchFunction (backend) {
}
// destroy old node
- if (isDef(parentElm$1)) {
- removeVnodes(parentElm$1, [oldVnode], 0, 0);
+ if (isDef(parentElm)) {
+ removeVnodes(parentElm, [oldVnode], 0, 0);
} else if (isDef(oldVnode.tag)) {
invokeDestroyHook(oldVnode);
}
@@ -42051,7 +42763,9 @@ function updateAttrs (oldVnode, vnode) {
}
function setAttr (el, key, value) {
- if (isBooleanAttr(key)) {
+ if (el.tagName.indexOf('-') > -1) {
+ baseSetAttr(el, key, value);
+ } else if (isBooleanAttr(key)) {
// set attribute for blank value
// e.g. <option disabled>Select one</option>
if (isFalsyAttrValue(value)) {
@@ -42073,28 +42787,32 @@ function setAttr (el, key, value) {
el.setAttributeNS(xlinkNS, key, value);
}
} else {
- if (isFalsyAttrValue(value)) {
- el.removeAttribute(key);
- } else {
- // #7138: IE10 & 11 fires input event when setting placeholder on
- // <textarea>... block the first input event and remove the blocker
- // immediately.
- /* istanbul ignore if */
- if (
- isIE && !isIE9 &&
- el.tagName === 'TEXTAREA' &&
- key === 'placeholder' && !el.__ieph
- ) {
- var blocker = function (e) {
- e.stopImmediatePropagation();
- el.removeEventListener('input', blocker);
- };
- el.addEventListener('input', blocker);
- // $flow-disable-line
- el.__ieph = true; /* IE placeholder patched */
- }
- el.setAttribute(key, value);
+ baseSetAttr(el, key, value);
+ }
+}
+
+function baseSetAttr (el, key, value) {
+ if (isFalsyAttrValue(value)) {
+ el.removeAttribute(key);
+ } else {
+ // #7138: IE10 & 11 fires input event when setting placeholder on
+ // <textarea>... block the first input event and remove the blocker
+ // immediately.
+ /* istanbul ignore if */
+ if (
+ isIE && !isIE9 &&
+ (el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
+ key === 'placeholder' && !el.__ieph
+ ) {
+ var blocker = function (e) {
+ e.stopImmediatePropagation();
+ el.removeEventListener('input', blocker);
+ };
+ el.addEventListener('input', blocker);
+ // $flow-disable-line
+ el.__ieph = true; /* IE placeholder patched */
}
+ el.setAttribute(key, value);
}
}
@@ -42235,7 +42953,7 @@ function wrapFilter (exp, filter) {
} else {
var name = filter.slice(0, i);
var args = filter.slice(i + 1);
- return ("_f(\"" + name + "\")(" + exp + "," + args)
+ return ("_f(\"" + name + "\")(" + exp + (args !== ')' ? ',' + args : args))
}
}
@@ -42303,6 +43021,18 @@ function addHandler (
);
}
+ // normalize click.right and click.middle since they don't actually fire
+ // this is technically browser-specific, but at least for now browsers are
+ // the only target envs that have right/middle clicks.
+ if (name === 'click') {
+ if (modifiers.right) {
+ name = 'contextmenu';
+ delete modifiers.right;
+ } else if (modifiers.middle) {
+ name = 'mouseup';
+ }
+ }
+
// check capture modifier
if (modifiers.capture) {
delete modifiers.capture;
@@ -42318,18 +43048,6 @@ function addHandler (
name = '&' + name; // mark the event as passive
}
- // normalize click.right and click.middle since they don't actually fire
- // this is technically browser-specific, but at least for now browsers are
- // the only target envs that have right/middle clicks.
- if (name === 'click') {
- if (modifiers.right) {
- name = 'contextmenu';
- delete modifiers.right;
- } else if (modifiers.middle) {
- name = 'mouseup';
- }
- }
-
var events;
if (modifiers.native) {
delete modifiers.native;
@@ -42338,7 +43056,9 @@ function addHandler (
events = el.events || (el.events = {});
}
- var newHandler = { value: value };
+ var newHandler = {
+ value: value.trim()
+ };
if (modifiers !== emptyObject) {
newHandler.modifiers = modifiers;
}
@@ -42418,8 +43138,8 @@ function genComponentModel (
if (trim) {
valueExpression =
"(typeof " + baseValueExpression + " === 'string'" +
- "? " + baseValueExpression + ".trim()" +
- ": " + baseValueExpression + ")";
+ "? " + baseValueExpression + ".trim()" +
+ ": " + baseValueExpression + ")";
}
if (number) {
valueExpression = "_n(" + valueExpression + ")";
@@ -42428,7 +43148,7 @@ function genComponentModel (
el.model = {
value: ("(" + value + ")"),
- expression: ("\"" + value + "\""),
+ expression: JSON.stringify(value),
callback: ("function (" + baseValueExpression + ") {" + assignment + "}")
};
}
@@ -42463,16 +43183,14 @@ function genAssignmentCode (
*
*/
-var len;
-var str;
-var chr;
-var index$1;
-var expressionPos;
-var expressionEndPos;
+var len, str, chr, index$1, expressionPos, expressionEndPos;
function parseModel (val) {
+ // Fix https://github.com/vuejs/vue/pull/7730
+ // allow v-model="obj.val " (trailing whitespace)
+ val = val.trim();
len = val.length;
if (val.indexOf('[') < 0 || val.lastIndexOf(']') < len - 1) {
@@ -42633,8 +43351,8 @@ function genCheckboxModel (
'if(Array.isArray($$a)){' +
"var $$v=" + (number ? '_n(' + valueBinding + ')' : valueBinding) + "," +
'$$i=_i($$a,$$v);' +
- "if($$el.checked){$$i<0&&(" + value + "=$$a.concat([$$v]))}" +
- "else{$$i>-1&&(" + value + "=$$a.slice(0,$$i).concat($$a.slice($$i+1)))}" +
+ "if($$el.checked){$$i<0&&(" + (genAssignmentCode(value, '$$a.concat([$$v])')) + ")}" +
+ "else{$$i>-1&&(" + (genAssignmentCode(value, '$$a.slice(0,$$i).concat($$a.slice($$i+1))')) + ")}" +
"}else{" + (genAssignmentCode(value, '$$c')) + "}",
null, true
);
@@ -42677,9 +43395,11 @@ function genDefaultModel (
var type = el.attrsMap.type;
// warn if v-bind:value conflicts with v-model
+ // except for inputs with v-bind:type
if (true) {
var value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
- if (value$1) {
+ var typeBinding = el.attrsMap['v-bind:type'] || el.attrsMap[':type'];
+ if (value$1 && !typeBinding) {
var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
warn$1(
binding + "=\"" + value$1 + "\" conflicts with v-model on the same element " +
@@ -42744,7 +43464,7 @@ function normalizeEvents (on) {
var target$1;
-function createOnceHandler (handler, event, capture) {
+function createOnceHandler$1 (event, handler, capture) {
var _target = target$1; // save current target element in closure
return function onceHandler () {
var res = handler.apply(null, arguments);
@@ -42757,12 +43477,10 @@ function createOnceHandler (handler, event, capture) {
function add$1 (
event,
handler,
- once$$1,
capture,
passive
) {
handler = withMacroTask(handler);
- if (once$$1) { handler = createOnceHandler(handler, event, capture); }
target$1.addEventListener(
event,
handler,
@@ -42793,7 +43511,7 @@ function updateDOMListeners (oldVnode, vnode) {
var oldOn = oldVnode.data.on || {};
target$1 = vnode.elm;
normalizeEvents(on);
- updateListeners(on, oldOn, add$1, remove$2, vnode.context);
+ updateListeners(on, oldOn, add$1, remove$2, createOnceHandler$1, vnode.context);
target$1 = undefined;
}
@@ -43059,6 +43777,8 @@ var style = {
/* */
+var whitespaceRE = /\s+/;
+
/**
* Add class with compatibility for SVG since classList is not supported on
* SVG elements in IE
@@ -43072,7 +43792,7 @@ function addClass (el, cls) {
/* istanbul ignore else */
if (el.classList) {
if (cls.indexOf(' ') > -1) {
- cls.split(/\s+/).forEach(function (c) { return el.classList.add(c); });
+ cls.split(whitespaceRE).forEach(function (c) { return el.classList.add(c); });
} else {
el.classList.add(cls);
}
@@ -43097,7 +43817,7 @@ function removeClass (el, cls) {
/* istanbul ignore else */
if (el.classList) {
if (cls.indexOf(' ') > -1) {
- cls.split(/\s+/).forEach(function (c) { return el.classList.remove(c); });
+ cls.split(whitespaceRE).forEach(function (c) { return el.classList.remove(c); });
} else {
el.classList.remove(cls);
}
@@ -43121,20 +43841,20 @@ function removeClass (el, cls) {
/* */
-function resolveTransition (def) {
- if (!def) {
+function resolveTransition (def$$1) {
+ if (!def$$1) {
return
}
/* istanbul ignore else */
- if (typeof def === 'object') {
+ if (typeof def$$1 === 'object') {
var res = {};
- if (def.css !== false) {
- extend(res, autoCssTransition(def.name || 'v'));
+ if (def$$1.css !== false) {
+ extend(res, autoCssTransition(def$$1.name || 'v'));
}
- extend(res, def);
+ extend(res, def$$1);
return res
- } else if (typeof def === 'string') {
- return autoCssTransition(def)
+ } else if (typeof def$$1 === 'string') {
+ return autoCssTransition(def$$1)
}
}
@@ -43237,11 +43957,12 @@ var transformRE = /\b(transform|all)(,|$)/;
function getTransitionInfo (el, expectedType) {
var styles = window.getComputedStyle(el);
- var transitionDelays = styles[transitionProp + 'Delay'].split(', ');
- var transitionDurations = styles[transitionProp + 'Duration'].split(', ');
+ // JSDOM may return undefined for transition properties
+ var transitionDelays = (styles[transitionProp + 'Delay'] || '').split(', ');
+ var transitionDurations = (styles[transitionProp + 'Duration'] || '').split(', ');
var transitionTimeout = getTimeout(transitionDelays, transitionDurations);
- var animationDelays = styles[animationProp + 'Delay'].split(', ');
- var animationDurations = styles[animationProp + 'Duration'].split(', ');
+ var animationDelays = (styles[animationProp + 'Delay'] || '').split(', ');
+ var animationDurations = (styles[animationProp + 'Duration'] || '').split(', ');
var animationTimeout = getTimeout(animationDelays, animationDurations);
var type;
@@ -43295,8 +44016,12 @@ function getTimeout (delays, durations) {
}))
}
+// Old versions of Chromium (below 61.0.3163.100) formats floating pointer numbers
+// in a locale-dependent way, using a comma instead of a dot.
+// If comma is not replaced with a dot, the input will be rounded down (i.e. acting
+// as a floor function) causing unexpected behaviors
function toMs (s) {
- return Number(s.slice(0, -1)) * 1000
+ return Number(s.slice(0, -1).replace(',', '.')) * 1000
}
/* */
@@ -43428,13 +44153,15 @@ function enter (vnode, toggleDisplay) {
addTransitionClass(el, startClass);
addTransitionClass(el, activeClass);
nextFrame(function () {
- addTransitionClass(el, toClass);
removeTransitionClass(el, startClass);
- if (!cb.cancelled && !userWantsControl) {
- if (isValidDuration(explicitEnterDuration)) {
- setTimeout(cb, explicitEnterDuration);
- } else {
- whenTransitionEnds(el, type, cb);
+ if (!cb.cancelled) {
+ addTransitionClass(el, toClass);
+ if (!userWantsControl) {
+ if (isValidDuration(explicitEnterDuration)) {
+ setTimeout(cb, explicitEnterDuration);
+ } else {
+ whenTransitionEnds(el, type, cb);
+ }
}
}
});
@@ -43526,7 +44253,7 @@ function leave (vnode, rm) {
return
}
// record leaving element
- if (!vnode.data.show) {
+ if (!vnode.data.show && el.parentNode) {
(el.parentNode._pending || (el.parentNode._pending = {}))[(vnode.key)] = vnode;
}
beforeLeave && beforeLeave(el);
@@ -43534,13 +44261,15 @@ function leave (vnode, rm) {
addTransitionClass(el, leaveClass);
addTransitionClass(el, leaveActiveClass);
nextFrame(function () {
- addTransitionClass(el, leaveToClass);
removeTransitionClass(el, leaveClass);
- if (!cb.cancelled && !userWantsControl) {
- if (isValidDuration(explicitLeaveDuration)) {
- setTimeout(cb, explicitLeaveDuration);
- } else {
- whenTransitionEnds(el, type, cb);
+ if (!cb.cancelled) {
+ addTransitionClass(el, leaveToClass);
+ if (!userWantsControl) {
+ if (isValidDuration(explicitLeaveDuration)) {
+ setTimeout(cb, explicitLeaveDuration);
+ } else {
+ whenTransitionEnds(el, type, cb);
+ }
}
}
});
@@ -43663,15 +44392,13 @@ var directive = {
} else if (vnode.tag === 'textarea' || isTextInputType(el.type)) {
el._vModifiers = binding.modifiers;
if (!binding.modifiers.lazy) {
+ el.addEventListener('compositionstart', onCompositionStart);
+ el.addEventListener('compositionend', onCompositionEnd);
// Safari < 10.2 & UIWebView doesn't fire compositionend when
// switching focus before confirming composition choice
// this also fixes the issue where some browsers e.g. iOS Chrome
// fires "change" instead of "input" on autocomplete.
el.addEventListener('change', onCompositionEnd);
- if (!isAndroid) {
- el.addEventListener('compositionstart', onCompositionStart);
- el.addEventListener('compositionend', onCompositionEnd);
- }
/* istanbul ignore if */
if (isIE9) {
el.vmodel = true;
@@ -43805,7 +44532,7 @@ var show = {
var oldValue = ref.oldValue;
/* istanbul ignore if */
- if (value === oldValue) { return }
+ if (!value === !oldValue) { return }
vnode = locateNode(vnode);
var transition$$1 = vnode.data && vnode.data.transition;
if (transition$$1) {
@@ -43844,9 +44571,6 @@ var platformDirectives = {
/* */
-// Provides transition support for a single element/component.
-// supports transition mode (out-in / in-out)
-
var transitionProps = {
name: String,
appear: Boolean,
@@ -43912,6 +44636,10 @@ function isSameChild (child, oldChild) {
return oldChild.key === child.key && oldChild.tag === child.tag
}
+var isNotTextNode = function (c) { return c.tag || isAsyncPlaceholder(c); };
+
+var isVShowDirective = function (d) { return d.name === 'show'; };
+
var Transition = {
name: 'transition',
props: transitionProps,
@@ -43926,7 +44654,7 @@ var Transition = {
}
// filter out text nodes (possible whitespaces)
- children = children.filter(function (c) { return c.tag || isAsyncPlaceholder(c); });
+ children = children.filter(isNotTextNode);
/* istanbul ignore if */
if (!children.length) {
return
@@ -43991,7 +44719,7 @@ var Transition = {
// mark v-show
// so that the transition module can hand over the control to the directive
- if (child.data.directives && child.data.directives.some(function (d) { return d.name === 'show'; })) {
+ if (child.data.directives && child.data.directives.some(isVShowDirective)) {
child.data.show = true;
}
@@ -44033,17 +44761,6 @@ var Transition = {
/* */
-// Provides transition support for list items.
-// supports move transitions using the FLIP technique.
-
-// Because the vdom's children update algorithm is "unstable" - i.e.
-// it doesn't guarantee the relative positioning of removed elements,
-// we force transition-group to update its children into two passes:
-// in the first pass, we remove all nodes that need to be removed,
-// triggering their leaving transition; in the second pass, we insert/move
-// into the final desired state. This way in the second pass removed
-// nodes will remain where they should be.
-
var props = extend({
tag: String,
moveClass: String
@@ -44054,6 +44771,25 @@ delete props.mode;
var TransitionGroup = {
props: props,
+ beforeMount: function beforeMount () {
+ var this$1 = this;
+
+ var update = this._update;
+ this._update = function (vnode, hydrating) {
+ var restoreActiveInstance = setActiveInstance(this$1);
+ // force removing pass
+ this$1.__patch__(
+ this$1._vnode,
+ this$1.kept,
+ false, // hydrating
+ true // removeOnly (!important, avoids unnecessary moves)
+ );
+ this$1._vnode = this$1.kept;
+ restoreActiveInstance();
+ update.call(this$1, vnode, hydrating);
+ };
+ },
+
render: function render (h) {
var tag = this.tag || this.$vnode.data.tag || 'span';
var map = Object.create(null);
@@ -44097,17 +44833,6 @@ var TransitionGroup = {
return h(tag, null, children)
},
- beforeUpdate: function beforeUpdate () {
- // force removing pass
- this.__patch__(
- this._vnode,
- this.kept,
- false, // hydrating
- true // removeOnly (!important avoids unnecessary moves)
- );
- this._vnode = this.kept;
- },
-
updated: function updated () {
var children = this.prevChildren;
var moveClass = this.moveClass || ((this.name || 'v') + '-move');
@@ -44133,6 +44858,9 @@ var TransitionGroup = {
addTransitionClass(el, moveClass);
s.transform = s.WebkitTransform = s.transitionDuration = '';
el.addEventListener(transitionEndEvent, el._moveCb = function cb (e) {
+ if (e && e.target !== el) {
+ return
+ }
if (!e || /transform$/.test(e.propertyName)) {
el.removeEventListener(transitionEndEvent, cb);
el._moveCb = null;
@@ -44208,21 +44936,21 @@ var platformComponents = {
/* */
// install platform specific utils
-Vue$3.config.mustUseProp = mustUseProp;
-Vue$3.config.isReservedTag = isReservedTag;
-Vue$3.config.isReservedAttr = isReservedAttr;
-Vue$3.config.getTagNamespace = getTagNamespace;
-Vue$3.config.isUnknownElement = isUnknownElement;
+Vue.config.mustUseProp = mustUseProp;
+Vue.config.isReservedTag = isReservedTag;
+Vue.config.isReservedAttr = isReservedAttr;
+Vue.config.getTagNamespace = getTagNamespace;
+Vue.config.isUnknownElement = isUnknownElement;
// install platform runtime directives & components
-extend(Vue$3.options.directives, platformDirectives);
-extend(Vue$3.options.components, platformComponents);
+extend(Vue.options.directives, platformDirectives);
+extend(Vue.options.components, platformComponents);
// install platform patch function
-Vue$3.prototype.__patch__ = inBrowser ? patch : noop;
+Vue.prototype.__patch__ = inBrowser ? patch : noop;
// public mount method
-Vue$3.prototype.$mount = function (
+Vue.prototype.$mount = function (
el,
hydrating
) {
@@ -44232,32 +44960,39 @@ Vue$3.prototype.$mount = function (
// devtools global hook
/* istanbul ignore next */
-Vue$3.nextTick(function () {
- if (config.devtools) {
- if (devtools) {
- devtools.emit('init', Vue$3);
- } else if ("development" !== 'production' && isChrome) {
+if (inBrowser) {
+ setTimeout(function () {
+ if (config.devtools) {
+ if (devtools) {
+ devtools.emit('init', Vue);
+ } else if (
+ "development" !== 'production' &&
+ "development" !== 'test' &&
+ isChrome
+ ) {
+ console[console.info ? 'info' : 'log'](
+ 'Download the Vue Devtools extension for a better development experience:\n' +
+ 'https://github.com/vuejs/vue-devtools'
+ );
+ }
+ }
+ if ("development" !== 'production' &&
+ "development" !== 'test' &&
+ config.productionTip !== false &&
+ typeof console !== 'undefined'
+ ) {
console[console.info ? 'info' : 'log'](
- 'Download the Vue Devtools extension for a better development experience:\n' +
- 'https://github.com/vuejs/vue-devtools'
+ "You are running Vue in development mode.\n" +
+ "Make sure to turn on production mode when deploying for production.\n" +
+ "See more tips at https://vuejs.org/guide/deployment.html"
);
}
- }
- if ("development" !== 'production' &&
- config.productionTip !== false &&
- inBrowser && typeof console !== 'undefined'
- ) {
- console[console.info ? 'info' : 'log'](
- "You are running Vue in development mode.\n" +
- "Make sure to turn on production mode when deploying for production.\n" +
- "See more tips at https://vuejs.org/guide/deployment.html"
- );
- }
-}, 0);
+ }, 0);
+}
/* */
-var defaultTagRE = /\{\{((?:.|\n)+?)\}\}/g;
+var defaultTagRE = /\{\{((?:.|\r?\n)+?)\}\}/g;
var regexEscapeRE = /[-.*+?^${}()|[\]\/\\]/g;
var buildRegex = cached(function (delimiters) {
@@ -44428,13 +45163,6 @@ var isNonPhrasingTag = makeMap(
* Not type-checking this file because it's mostly vendor code.
*/
-/*!
- * HTML Parser By John Resig (ejohn.org)
- * Modified by Juriy "kangax" Zaytsev
- * Original code by Erik Arvidsson, Mozilla Public License
- * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
- */
-
// Regular Expressions for parsing tags and attributes
var attribute = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/;
// could use https://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-QName
@@ -44445,14 +45173,10 @@ var startTagOpen = new RegExp(("^<" + qnameCapture));
var startTagClose = /^\s*(\/?)>/;
var endTag = new RegExp(("^<\\/" + qnameCapture + "[^>]*>"));
var doctype = /^<!DOCTYPE [^>]+>/i;
-var comment = /^<!--/;
+// #7298: escape - to avoid being pased as HTML comment when inlined in page
+var comment = /^<!\--/;
var conditionalComment = /^<!\[/;
-var IS_REGEX_CAPTURING_BROKEN = false;
-'x'.replace(/x(.)?/g, function (m, g) {
- IS_REGEX_CAPTURING_BROKEN = g === '';
-});
-
// Special Elements (can contain anything)
var isPlainTextElement = makeMap('script,style,textarea', true);
var reCache = {};
@@ -44533,7 +45257,7 @@ function parseHTML (html, options) {
var startTagMatch = parseStartTag();
if (startTagMatch) {
handleStartTag(startTagMatch);
- if (shouldIgnoreFirstNewline(lastTag, html)) {
+ if (shouldIgnoreFirstNewline(startTagMatch.tagName, html)) {
advance(1);
}
continue
@@ -44575,7 +45299,7 @@ function parseHTML (html, options) {
endTagLength = endTag.length;
if (!isPlainTextElement(stackedTag) && stackedTag !== 'noscript') {
text = text
- .replace(/<!--([\s\S]*?)-->/g, '$1')
+ .replace(/<!\--([\s\S]*?)-->/g, '$1') // #7298
.replace(/<!\[CDATA\[([\s\S]*?)]]>/g, '$1');
}
if (shouldIgnoreFirstNewline(stackedTag, text)) {
@@ -44650,12 +45374,6 @@ function parseHTML (html, options) {
var attrs = new Array(l);
for (var i = 0; i < l; i++) {
var args = match.attrs[i];
- // hackish work around FF bug https://bugzilla.mozilla.org/show_bug.cgi?id=369778
- if (IS_REGEX_CAPTURING_BROKEN && args[0].indexOf('""') === -1) {
- if (args[3] === '') { delete args[3]; }
- if (args[4] === '') { delete args[4]; }
- if (args[5] === '') { delete args[5]; }
- }
var value = args[3] || args[4] || args[5] || '';
var shouldDecodeNewlines = tagName === 'a' && args[1] === 'href'
? options.shouldDecodeNewlinesForHref
@@ -44681,12 +45399,9 @@ function parseHTML (html, options) {
if (start == null) { start = index; }
if (end == null) { end = index; }
- if (tagName) {
- lowerCasedTagName = tagName.toLowerCase();
- }
-
// Find the closest opened tag of the same type
if (tagName) {
+ lowerCasedTagName = tagName.toLowerCase();
for (pos = stack.length - 1; pos >= 0; pos--) {
if (stack[pos].lowerCasedTag === lowerCasedTagName) {
break
@@ -44735,7 +45450,7 @@ function parseHTML (html, options) {
var onRE = /^@|^v-on:/;
var dirRE = /^v-|^@|^:/;
-var forAliasRE = /(.*?)\s+(?:in|of)\s+(.*)/;
+var forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
var forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/;
var stripParensRE = /^\(|\)$/g;
@@ -44920,7 +45635,8 @@ function parse (
processIfConditions(element, currentParent);
} else if (element.slotScope) { // scoped slot
currentParent.plain = false;
- var name = element.slotTarget || '"default"';(currentParent.scopedSlots || (currentParent.scopedSlots = {}))[name] = element;
+ var name = element.slotTarget || '"default"'
+ ;(currentParent.scopedSlots || (currentParent.scopedSlots = {}))[name] = element;
} else {
currentParent.children.push(element);
element.parent = currentParent;
@@ -45044,8 +45760,20 @@ function processElement (element, options) {
function processKey (el) {
var exp = getBindingAttr(el, 'key');
if (exp) {
- if ("development" !== 'production' && el.tag === 'template') {
- warn$2("<template> cannot be keyed. Place the key on real elements instead.");
+ if (true) {
+ if (el.tag === 'template') {
+ warn$2("<template> cannot be keyed. Place the key on real elements instead.");
+ }
+ if (el.for) {
+ var iterator = el.iterator2 || el.iterator1;
+ var parent = el.parent;
+ if (iterator && iterator === exp && parent && parent.tag === 'transition-group') {
+ warn$2(
+ "Do not use v-for index as key on <transition-group> children, " +
+ "this is the same as not using keys."
+ );
+ }
+ }
}
el.key = exp;
}
@@ -45073,6 +45801,8 @@ function processFor (el) {
}
}
+
+
function parseFor (exp) {
var inMatch = exp.match(forAliasRE);
if (!inMatch) { return }
@@ -45081,7 +45811,7 @@ function parseFor (exp) {
var alias = inMatch[1].trim().replace(stripParensRE, '');
var iteratorMatch = alias.match(forIteratorRE);
if (iteratorMatch) {
- res.alias = alias.replace(forIteratorRE, '');
+ res.alias = alias.replace(forIteratorRE, '').trim();
res.iterator1 = iteratorMatch[1].trim();
if (iteratorMatch[2]) {
res.iterator2 = iteratorMatch[2].trim();
@@ -45234,6 +45964,14 @@ function processAttrs (el) {
name = name.replace(bindRE, '');
value = parseFilters(value);
isProp = false;
+ if (
+ "development" !== 'production' &&
+ value.trim().length === 0
+ ) {
+ warn$2(
+ ("The value for a v-bind expression cannot be empty. Found in \"v-bind:" + name + "\"")
+ );
+ }
if (modifiers) {
if (modifiers.prop) {
isProp = true;
@@ -45382,21 +46120,22 @@ function checkForAliasModel (el, value) {
/* */
-/**
- * Expand input[v-model] with dyanmic type bindings into v-if-else chains
- * Turn this:
- * <input v-model="data[type]" :type="type">
- * into this:
- * <input v-if="type === 'checkbox'" type="checkbox" v-model="data[type]">
- * <input v-else-if="type === 'radio'" type="radio" v-model="data[type]">
- * <input v-else :type="type" v-model="data[type]">
- */
-
function preTransformNode (el, options) {
if (el.tag === 'input') {
var map = el.attrsMap;
- if (map['v-model'] && (map['v-bind:type'] || map[':type'])) {
- var typeBinding = getBindingAttr(el, 'type');
+ if (!map['v-model']) {
+ return
+ }
+
+ var typeBinding;
+ if (map[':type'] || map['v-bind:type']) {
+ typeBinding = getBindingAttr(el, 'type');
+ }
+ if (!map.type && !typeBinding && map['v-bind']) {
+ typeBinding = "(" + (map['v-bind']) + ").type";
+ }
+
+ if (typeBinding) {
var ifCondition = getAndRemoveAttr(el, 'v-if', true);
var ifConditionExtra = ifCondition ? ("&&(" + ifCondition + ")") : "";
var hasElse = getAndRemoveAttr(el, 'v-else', true) != null;
@@ -45447,14 +46186,14 @@ function cloneASTElement (el) {
return createASTElement(el.tag, el.attrsList.slice(), el.parent)
}
-var model$2 = {
+var model$1 = {
preTransformNode: preTransformNode
};
var modules$1 = [
klass$1,
style$1,
- model$2
+ model$1
];
/* */
@@ -45623,10 +46362,10 @@ function isDirectChildOfTemplateFor (node) {
/* */
-var fnExpRE = /^\s*([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
-var simplePathRE = /^\s*[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?']|\[".*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*\s*$/;
+var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
+var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
-// keyCode aliases
+// KeyboardEvent.keyCode aliases
var keyCodes = {
esc: 27,
tab: 9,
@@ -45639,6 +46378,23 @@ var keyCodes = {
'delete': [8, 46]
};
+// KeyboardEvent.key aliases
+var keyNames = {
+ // #7880: IE11 and Edge use `Esc` for Escape key name.
+ esc: ['Esc', 'Escape'],
+ tab: 'Tab',
+ enter: 'Enter',
+ // #9112: IE11 uses `Spacebar` for Space key name.
+ space: [' ', 'Spacebar'],
+ // #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
+ up: ['Up', 'ArrowUp'],
+ left: ['Left', 'ArrowLeft'],
+ right: ['Right', 'ArrowRight'],
+ down: ['Down', 'ArrowDown'],
+ // #9112: IE11 uses `Del` for Delete key name.
+ 'delete': ['Backspace', 'Delete', 'Del']
+};
+
// #4868: modifiers that prevent the execution of the listener
// need to explicitly return null so that we can determine whether to remove
// the listener for .once
@@ -45659,8 +46415,7 @@ var modifierCode = {
function genHandlers (
events,
- isNative,
- warn
+ isNative
) {
var res = isNative ? 'nativeOn:{' : 'on:{';
for (var name in events) {
@@ -45688,7 +46443,6 @@ function genHandler (
if (isMethodPath || isFunctionExpression) {
return handler.value
}
- /* istanbul ignore if */
return ("function($event){" + (handler.value) + "}") // inline statement
} else {
var code = '';
@@ -45721,11 +46475,10 @@ function genHandler (
code += genModifierCode;
}
var handlerCode = isMethodPath
- ? handler.value + '($event)'
+ ? ("return " + (handler.value) + "($event)")
: isFunctionExpression
- ? ("(" + (handler.value) + ")($event)")
+ ? ("return (" + (handler.value) + ")($event)")
: handler.value;
- /* istanbul ignore if */
return ("function($event){" + code + handlerCode + "}")
}
}
@@ -45739,12 +46492,15 @@ function genFilterCode (key) {
if (keyVal) {
return ("$event.keyCode!==" + keyVal)
}
- var code = keyCodes[key];
+ var keyCode = keyCodes[key];
+ var keyName = keyNames[key];
return (
"_k($event.keyCode," +
(JSON.stringify(key)) + "," +
- (JSON.stringify(code)) + "," +
- "$event.key)"
+ (JSON.stringify(keyCode)) + "," +
+ "$event.key," +
+ "" + (JSON.stringify(keyName)) +
+ ")"
)
}
@@ -45775,6 +46531,10 @@ var baseDirectives = {
/* */
+
+
+
+
var CodegenState = function CodegenState (options) {
this.options = options;
this.warn = options.warn || baseWarn;
@@ -45782,9 +46542,10 @@ var CodegenState = function CodegenState (options) {
this.dataGenFns = pluckModuleFunction(options.modules, 'genData');
this.directives = extend(extend({}, baseDirectives), options.directives);
var isReservedTag = options.isReservedTag || no;
- this.maybeComponent = function (el) { return !isReservedTag(el.tag); };
+ this.maybeComponent = function (el) { return !(isReservedTag(el.tag) && !el.component); };
this.onceId = 0;
this.staticRenderFns = [];
+ this.pre = false;
};
@@ -45802,6 +46563,10 @@ function generate (
}
function genElement (el, state) {
+ if (el.parent) {
+ el.pre = el.pre || el.parent.pre;
+ }
+
if (el.staticRoot && !el.staticProcessed) {
return genStatic(el, state)
} else if (el.once && !el.onceProcessed) {
@@ -45810,7 +46575,7 @@ function genElement (el, state) {
return genFor(el, state)
} else if (el.if && !el.ifProcessed) {
return genIf(el, state)
- } else if (el.tag === 'template' && !el.slotTarget) {
+ } else if (el.tag === 'template' && !el.slotTarget && !state.pre) {
return genChildren(el, state) || 'void 0'
} else if (el.tag === 'slot') {
return genSlot(el, state)
@@ -45820,7 +46585,10 @@ function genElement (el, state) {
if (el.component) {
code = genComponent(el.component, el, state);
} else {
- var data = el.plain ? undefined : genData$2(el, state);
+ var data;
+ if (!el.plain || (el.pre && state.maybeComponent(el))) {
+ data = genData$2(el, state);
+ }
var children = el.inlineTemplate ? null : genChildren(el, state, true);
code = "_c('" + (el.tag) + "'" + (data ? ("," + data) : '') + (children ? ("," + children) : '') + ")";
@@ -45836,7 +46604,15 @@ function genElement (el, state) {
// hoist static sub-trees out
function genStatic (el, state) {
el.staticProcessed = true;
+ // Some elements (templates) need to behave differently inside of a v-pre
+ // node. All pre nodes are static roots, so we can use this as a location to
+ // wrap a state change and reset it upon exiting the pre node.
+ var originalPreState = state.pre;
+ if (el.pre) {
+ state.pre = el.pre;
+ }
state.staticRenderFns.push(("with(this){return " + (genElement(el, state)) + "}"));
+ state.pre = originalPreState;
return ("_m(" + (state.staticRenderFns.length - 1) + (el.staticInFor ? ',true' : '') + ")")
}
@@ -45977,10 +46753,10 @@ function genData$2 (el, state) {
}
// event handlers
if (el.events) {
- data += (genHandlers(el.events, false, state.warn)) + ",";
+ data += (genHandlers(el.events, false)) + ",";
}
if (el.nativeEvents) {
- data += (genHandlers(el.nativeEvents, true, state.warn)) + ",";
+ data += (genHandlers(el.nativeEvents, true)) + ",";
}
// slot target
// only for non-scoped slots
@@ -46072,7 +46848,7 @@ function genScopedSlot (
var fn = "function(" + (String(el.slotScope)) + "){" +
"return " + (el.tag === 'template'
? el.if
- ? ((el.if) + "?" + (genChildren(el, state) || 'undefined') + ":undefined")
+ ? ("(" + (el.if) + ")?" + (genChildren(el, state) || 'undefined') + ":undefined")
: genChildren(el, state) || 'undefined'
: genElement(el, state)) + "}";
return ("{key:" + key + ",fn:" + fn + "}")
@@ -46110,13 +46886,16 @@ function genChildren (
el$1.tag !== 'template' &&
el$1.tag !== 'slot'
) {
- return (altGenElement || genElement)(el$1, state)
+ var normalizationType = checkSkip
+ ? state.maybeComponent(el$1) ? ",1" : ",0"
+ : "";
+ return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
}
- var normalizationType = checkSkip
+ var normalizationType$1 = checkSkip
? getNormalizationType(children, state.maybeComponent)
: 0;
var gen = altGenNode || genNode;
- return ("[" + (children.map(function (c) { return gen(c, state); }).join(',')) + "]" + (normalizationType ? ("," + normalizationType) : ''))
+ return ("[" + (children.map(function (c) { return gen(c, state); }).join(',')) + "]" + (normalizationType$1 ? ("," + normalizationType$1) : ''))
}
}
@@ -46154,7 +46933,7 @@ function needsNormalization (el) {
function genNode (node, state) {
if (node.type === 1) {
return genElement(node, state)
- } if (node.type === 3 && node.isComment) {
+ } else if (node.type === 3 && node.isComment) {
return genComment(node)
} else {
return genText(node)
@@ -46327,6 +47106,8 @@ function checkExpression (exp, text, errors) {
/* */
+
+
function createFunction (code, errors) {
try {
return new Function(code)
@@ -46498,6 +47279,7 @@ var createCompiler = createCompilerCreator(function baseCompile (
/* */
var ref$1 = createCompiler(baseOptions);
+var compile = ref$1.compile;
var compileToFunctions = ref$1.compileToFunctions;
/* */
@@ -46522,8 +47304,8 @@ var idToTemplate = cached(function (id) {
return el && el.innerHTML
});
-var mount = Vue$3.prototype.$mount;
-Vue$3.prototype.$mount = function (
+var mount = Vue.prototype.$mount;
+Vue.prototype.$mount = function (
el,
hydrating
) {
@@ -46605,9 +47387,9 @@ function getOuterHTML (el) {
}
}
-Vue$3.compile = compileToFunctions;
+Vue.compile = compileToFunctions;
-module.exports = Vue$3;
+module.exports = Vue;
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1), __webpack_require__(37).setImmediate))
@@ -46615,15 +47397,18 @@ module.exports = Vue$3;
/* 37 */
/***/ (function(module, exports, __webpack_require__) {
-/* WEBPACK VAR INJECTION */(function(global) {var apply = Function.prototype.apply;
+/* WEBPACK VAR INJECTION */(function(global) {var scope = (typeof global !== "undefined" && global) ||
+ (typeof self !== "undefined" && self) ||
+ window;
+var apply = Function.prototype.apply;
// DOM APIs, for completeness
exports.setTimeout = function() {
- return new Timeout(apply.call(setTimeout, window, arguments), clearTimeout);
+ return new Timeout(apply.call(setTimeout, scope, arguments), clearTimeout);
};
exports.setInterval = function() {
- return new Timeout(apply.call(setInterval, window, arguments), clearInterval);
+ return new Timeout(apply.call(setInterval, scope, arguments), clearInterval);
};
exports.clearTimeout =
exports.clearInterval = function(timeout) {
@@ -46638,7 +47423,7 @@ function Timeout(id, clearFn) {
}
Timeout.prototype.unref = Timeout.prototype.ref = function() {};
Timeout.prototype.close = function() {
- this._clearFn.call(window, this._id);
+ this._clearFn.call(scope, this._id);
};
// Does not start the time, just sets up the members needed.
@@ -46666,7 +47451,7 @@ exports._unrefActive = exports.active = function(item) {
// setimmediate attaches itself to the global object
__webpack_require__(38);
-// On some exotic environments, it's not clear which object `setimmeidate` was
+// On some exotic environments, it's not clear which object `setimmediate` was
// able to install onto. Search each possibility in the same order as the
// `setimmediate` library.
exports.setImmediate = (typeof self !== "undefined" && self.setImmediate) ||
@@ -46897,7 +47682,7 @@ var Component = normalizeComponent(
__vue_scopeId__,
__vue_module_identifier__
)
-Component.options.__file = "resources\\assets\\js\\components\\ExampleComponent.vue"
+Component.options.__file = "resources/assets/js/components/ExampleComponent.vue"
/* hot reload */
if (false) {(function () {
@@ -46906,9 +47691,9 @@ if (false) {(function () {
if (!hotAPI.compatible) return
module.hot.accept()
if (!module.hot.data) {
- hotAPI.createRecord("data-v-0ca92eac", Component.options)
+ hotAPI.createRecord("data-v-7168fb6a", Component.options)
} else {
- hotAPI.reload("data-v-0ca92eac", Component.options)
+ hotAPI.reload("data-v-7168fb6a", Component.options)
}
module.hot.dispose(function (data) {
disposed = true
@@ -47095,7 +47880,7 @@ module.exports = { render: render, staticRenderFns: staticRenderFns }
if (false) {
module.hot.accept()
if (module.hot.data) {
- require("vue-hot-reload-api") .rerender("data-v-0ca92eac", module.exports)
+ require("vue-hot-reload-api") .rerender("data-v-7168fb6a", module.exports)
}
}
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 585e57f4862c59104ee7dc943aa40f83bdace6b8..2d60117130c3d9e573bbc64a6574de2bc9dee19d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
-}
\ No newline at end of file
+}
diff --git a/public/storage/banner.jpg b/public/storage/banner.jpg
index d8855088ae546abb692ece720e9879993d4cf9b1..49b6a4c0544f03d18d04cf72048df8d52cf78d31 100644
Binary files a/public/storage/banner.jpg and b/public/storage/banner.jpg differ
diff --git a/public/storage/banner1.jpg b/public/storage/banner1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d8855088ae546abb692ece720e9879993d4cf9b1
Binary files /dev/null and b/public/storage/banner1.jpg differ
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
old mode 100644
new mode 100755
diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/resources/assets/js/components/ExampleComponent.vue b/resources/assets/js/components/ExampleComponent.vue
old mode 100644
new mode 100755
diff --git a/resources/assets/sass/_custom.scss b/resources/assets/sass/_custom.scss
old mode 100644
new mode 100755
diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss
old mode 100644
new mode 100755
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
old mode 100644
new mode 100755
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
old mode 100644
new mode 100755
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
old mode 100644
new mode 100755
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
old mode 100644
new mode 100755
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
old mode 100644
new mode 100755
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/addCSV.blade.php b/resources/views/admin/addCSV.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/addmember.blade.php b/resources/views/admin/addmember.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/addquestion.blade.php b/resources/views/admin/addquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/createpost.blade.php b/resources/views/admin/createpost.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/editanswer.blade.php b/resources/views/admin/editanswer.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/editpost.blade.php b/resources/views/admin/editpost.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/editprofile.blade.php b/resources/views/admin/editprofile.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/editquestion.blade.php b/resources/views/admin/editquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/profile.blade.php b/resources/views/admin/profile.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showeachanswer.blade.php b/resources/views/admin/showeachanswer.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showeachpost.blade.php b/resources/views/admin/showeachpost.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showeachquestion.blade.php b/resources/views/admin/showeachquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showmember.blade.php b/resources/views/admin/showmember.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showpost.blade.php b/resources/views/admin/showpost.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/admin/showquestion.blade.php b/resources/views/admin/showquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/article.blade.php b/resources/views/article.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/email/reverification.blade.php b/resources/views/auth/email/reverification.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/email/verification.blade.php b/resources/views/auth/email/verification.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/dashboard-user.blade.php b/resources/views/dashboard-user.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/inc/addmembertab.blade.php b/resources/views/inc/addmembertab.blade.php
old mode 100644
new mode 100755
index 9132c040930a49ce9b1eb565d91ca15cc1bdf348..7a1be546f732aa5a55e4f53d837029ae1334ea1b
--- a/resources/views/inc/addmembertab.blade.php
+++ b/resources/views/inc/addmembertab.blade.php
@@ -3,6 +3,6 @@
<i class="addMenu">Add Manually</i>
</a>
<a class="nav-item nav-link CSVAdd" href="/admin/addCSV">
- <i class="addMenu">Upload CSV</i>
+ <i class="addMenu">Upload CSV or XLSX</i>
</a>
</nav>
\ No newline at end of file
diff --git a/resources/views/inc/adminmenu.blade.php b/resources/views/inc/adminmenu.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/inc/messages.blade.php b/resources/views/inc/messages.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/inc/navbarhome.blade.php b/resources/views/inc/navbarhome.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/layouts/apphome.blade.php b/resources/views/layouts/apphome.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/members/editprofilemember.blade.php b/resources/views/members/editprofilemember.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/members/list.blade.php b/resources/views/members/list.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/members/login.blade.php b/resources/views/members/login.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/members/showprofile.blade.php b/resources/views/members/showprofile.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/showarticle.blade.php b/resources/views/showarticle.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/showmember.blade.php b/resources/views/showmember.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/addanswer.blade.php b/resources/views/users/addanswer.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/addquestion.blade.php b/resources/views/users/addquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/editanswer.blade.php b/resources/views/users/editanswer.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/editprofile.blade.php b/resources/views/users/editprofile.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/editquestion.blade.php b/resources/views/users/editquestion.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
old mode 100644
new mode 100755
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
old mode 100644
new mode 100755
diff --git a/storage/app/public/banner.jpg b/storage/app/public/banner.jpg
index d8855088ae546abb692ece720e9879993d4cf9b1..49b6a4c0544f03d18d04cf72048df8d52cf78d31 100644
Binary files a/storage/app/public/banner.jpg and b/storage/app/public/banner.jpg differ