diff --git a/docs/en/Apps/VoloDocs.md b/docs/en/Apps/VoloDocs.md index 936f7f10d4..ef78a310ad 100644 --- a/docs/en/Apps/VoloDocs.md +++ b/docs/en/Apps/VoloDocs.md @@ -21,9 +21,15 @@ https://github.com/abpframework/abp/tree/master/modules/docs ## Download -You can download the VoloDocs release from the following link: +You can download the VoloDocs release from the following links: -http://apps.abp.io/VoloDocs/VoloDocs.zip *(will be ready soon...)* +http://apps.abp.io/VoloDocs/VoloDocs.win-x64.zip - **Windows 64 bit** + +http://apps.abp.io/VoloDocs/VoloDocs.win-x86.zip - **Windows 32 bit** + +http://apps.abp.io/VoloDocs/VoloDocs.osx-x64.zip - **MacOS** + +http://apps.abp.io/VoloDocs/VoloDocs.linux-x64.zip - **Linux** ## Folder Structure diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index c405b583a8..7870968c45 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -43,10 +43,4 @@ - - - PreserveNewest - - - diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 9850ed265a..9520a0e9df 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -147,7 +147,7 @@ namespace VoloDocs.Web app.UseAbpRequestLocalization(); app.UseStatusCodePagesWithReExecute("/error/{0}"); - app.UseMiddleware(); + //app.UseMiddleware(); app.UseMvc(routes => { diff --git a/modules/docs/app/VoloDocs.Web/appsettings.json b/modules/docs/app/VoloDocs.Web/appsettings.json index e893a26c7c..2b71262885 100644 --- a/modules/docs/app/VoloDocs.Web/appsettings.json +++ b/modules/docs/app/VoloDocs.Web/appsettings.json @@ -1,5 +1,5 @@ { "ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True;MultipleActiveResultSets=true", - "Title": "Volo Documents", + "Title": "VoloDocs", "LogoUrl": "/assets/images/Logo.png" } \ No newline at end of file diff --git a/modules/docs/app/VoloDocs.Web/publish.bat b/modules/docs/app/VoloDocs.Web/publish.bat index 2ed332ce78..62f1f02d1f 100644 --- a/modules/docs/app/VoloDocs.Web/publish.bat +++ b/modules/docs/app/VoloDocs.Web/publish.bat @@ -6,6 +6,14 @@ dotnet build DEL /F/Q/S "C:\Publishes\VoloDocs" > NUL && RMDIR /Q/S "C:\Publishes\VoloDocs" -dotnet publish -c Release -o "C:\Publishes\VoloDocs\Web" +dotnet publish -c Release -r win-x64 --self-contained true -o "C:\Publishes\VoloDocs\win-x64\Web" +dotnet publish -c Release -r win-x86 --self-contained true -o "C:\Publishes\VoloDocs\win-x86\Web" +dotnet publish -c Release -r osx-x64 --self-contained true -o "C:\Publishes\VoloDocs\osx-x64\Web" +dotnet publish -c Release -r linux-x64 --self-contained true -o "C:\Publishes\VoloDocs\linux-x64\Web" -cd..\VoloDocs.Migrator && dotnet publish -c Release -o "C:\Publishes\VoloDocs\Migrator" \ No newline at end of file +cd..\VoloDocs.Migrator + +dotnet publish -c Release -r win-x64 --self-contained true -o "C:\Publishes\VoloDocs\win-x64\Migrator" +dotnet publish -c Release -r win-x86 --self-contained true -o "C:\Publishes\VoloDocs\win-x86\Migrator" +dotnet publish -c Release -r osx-x64 --self-contained true -o "C:\Publishes\VoloDocs\osx-x64\Migrator" +dotnet publish -c Release -r linux-x64 --self-contained true -o "C:\Publishes\VoloDocs\linux-x64\Migrator" diff --git a/modules/docs/app/VoloDocs.Web/run.bat b/modules/docs/app/VoloDocs.Web/run.bat deleted file mode 100644 index 3286376287..0000000000 --- a/modules/docs/app/VoloDocs.Web/run.bat +++ /dev/null @@ -1 +0,0 @@ -@dotnet VoloDocs.Web.dll \ No newline at end of file diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/css/bootstrap.css b/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/css/bootstrap.css index 943532db55..7d43e1f107 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/css/bootstrap.css +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.1.3 (https://getbootstrap.com/) + * Bootstrap v4.1.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) @@ -31,7 +31,7 @@ --breakpoint-md: 768px; --breakpoint-lg: 992px; --breakpoint-xl: 1200px; - --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } @@ -47,7 +47,7 @@ html { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; -ms-overflow-style: scrollbar; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -webkit-tap-highlight-color: transparent; } @-ms-viewport { @@ -60,7 +60,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section { body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 1rem; font-weight: 400; line-height: 1.5; @@ -210,9 +210,8 @@ img { border-style: none; } -svg { +svg:not(:root) { overflow: hidden; - vertical-align: middle; } table { @@ -1516,6 +1515,7 @@ pre code { .table { width: 100%; + max-width: 100%; margin-bottom: 1rem; background-color: transparent; } @@ -1811,7 +1811,6 @@ pre code { .form-control { display: block; width: 100%; - height: calc(2.25rem + 2px); padding: 0.375rem 0.75rem; font-size: 1rem; line-height: 1.5; @@ -1872,6 +1871,10 @@ pre code { opacity: 1; } +select.form-control:not([size]):not([multiple]) { + height: calc(2.25rem + 2px); +} + select.form-control:focus::-ms-value { color: #495057; background-color: #fff; @@ -1918,33 +1921,55 @@ select.form-control:focus::-ms-value { border-width: 1px 0; } -.form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg { +.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 { padding-right: 0; padding-left: 0; } -.form-control-sm { - height: calc(1.8125rem + 2px); +.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 { padding: 0.25rem 0.5rem; font-size: 0.875rem; line-height: 1.5; border-radius: 0.2rem; } -.form-control-lg { - height: calc(2.875rem + 2px); +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.8125rem + 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 { padding: 0.5rem 1rem; font-size: 1.25rem; line-height: 1.5; border-radius: 0.3rem; } -select.form-control[size], select.form-control[multiple] { - height: auto; -} - -textarea.form-control { - height: auto; +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.875rem + 2px); } .form-group { @@ -2021,13 +2046,13 @@ textarea.form-control { z-index: 5; display: none; max-width: 100%; - padding: 0.25rem 0.5rem; + padding: .5rem; margin-top: .1rem; - font-size: 0.875rem; - line-height: 1.5; + font-size: .875rem; + line-height: 1; color: #fff; - background-color: rgba(40, 167, 69, 0.9); - border-radius: 0.25rem; + background-color: rgba(40, 167, 69, 0.8); + border-radius: .2rem; } .was-validated .form-control:valid, .form-control.is-valid, .was-validated @@ -2096,7 +2121,7 @@ textarea.form-control { border-color: #28a745; } -.was-validated .custom-file-input:valid ~ .custom-file-label::after, .custom-file-input.is-valid ~ .custom-file-label::after { +.was-validated .custom-file-input:valid ~ .custom-file-label::before, .custom-file-input.is-valid ~ .custom-file-label::before { border-color: inherit; } @@ -2124,13 +2149,13 @@ textarea.form-control { z-index: 5; display: none; max-width: 100%; - padding: 0.25rem 0.5rem; + padding: .5rem; margin-top: .1rem; - font-size: 0.875rem; - line-height: 1.5; + font-size: .875rem; + line-height: 1; color: #fff; - background-color: rgba(220, 53, 69, 0.9); - border-radius: 0.25rem; + background-color: rgba(220, 53, 69, 0.8); + border-radius: .2rem; } .was-validated .form-control:invalid, .form-control.is-invalid, .was-validated @@ -2199,7 +2224,7 @@ textarea.form-control { border-color: #dc3545; } -.was-validated .custom-file-input:invalid ~ .custom-file-label::after, .custom-file-input.is-invalid ~ .custom-file-label::after { +.was-validated .custom-file-input:invalid ~ .custom-file-label::before, .custom-file-input.is-invalid ~ .custom-file-label::before { border-color: inherit; } @@ -2327,6 +2352,10 @@ textarea.form-control { 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; @@ -3325,6 +3354,12 @@ input[type="button"].btn-block { 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, @@ -3337,16 +3372,6 @@ input[type="button"].btn-block { 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; @@ -3431,30 +3456,6 @@ input[type="button"].btn-block { margin-top: 0; } -.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 { - height: calc(2.875rem + 2px); - padding: 0.5rem 1rem; - font-size: 1.25rem; - line-height: 1.5; - border-radius: 0.3rem; -} - -.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 { - height: calc(1.8125rem + 2px); - padding: 0.25rem 0.5rem; - font-size: 0.875rem; - line-height: 1.5; - border-radius: 0.2rem; -} - .input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-append:not(:last-child) > .btn, @@ -3614,7 +3615,7 @@ input[type="button"].btn-block { .custom-select:focus { border-color: #80bdff; outline: 0; - box-shadow: 0 0 0 0.2rem 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); } .custom-select:focus::-ms-value { @@ -3677,10 +3678,6 @@ input[type="button"].btn-block { border-color: #80bdff; } -.custom-file-input:disabled ~ .custom-file-label { - background-color: #e9ecef; -} - .custom-file-input:lang(en) ~ .custom-file-label::after { content: "Browse"; } @@ -3730,18 +3727,6 @@ input[type="button"].btn-block { outline: none; } -.custom-range:focus::-webkit-slider-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); -} - -.custom-range:focus::-moz-range-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); -} - -.custom-range:focus::-ms-thumb { - box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); -} - .custom-range::-moz-focus-outer { border: 0; } @@ -3753,15 +3738,13 @@ input[type="button"].btn-block { background-color: #007bff; border: 0; border-radius: 1rem; - transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -webkit-appearance: none; appearance: none; } -@media screen and (prefers-reduced-motion: reduce) { - .custom-range::-webkit-slider-thumb { - transition: none; - } +.custom-range::-webkit-slider-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); } .custom-range::-webkit-slider-thumb:active { @@ -3784,15 +3767,13 @@ input[type="button"].btn-block { background-color: #007bff; border: 0; border-radius: 1rem; - transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -moz-appearance: none; appearance: none; } -@media screen and (prefers-reduced-motion: reduce) { - .custom-range::-moz-range-thumb { - transition: none; - } +.custom-range::-moz-range-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); } .custom-range::-moz-range-thumb:active { @@ -3812,20 +3793,15 @@ input[type="button"].btn-block { .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; - transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; appearance: none; } -@media screen and (prefers-reduced-motion: reduce) { - .custom-range::-ms-thumb { - transition: none; - } +.custom-range::-ms-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); } .custom-range::-ms-thumb:active { @@ -3853,20 +3829,6 @@ input[type="button"].btn-block { border-radius: 1rem; } -.custom-control-label::before, -.custom-file-label, -.custom-select { - transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -} - -@media screen and (prefers-reduced-motion: reduce) { - .custom-control-label::before, - .custom-file-label, - .custom-select { - transition: none; - } -} - .nav { display: -ms-flexbox; display: flex; @@ -5321,16 +5283,16 @@ input[type="button"].btn-block { opacity: .5; } -.close:not(:disabled):not(.disabled) { - cursor: pointer; -} - -.close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus { +.close:hover, .close:focus { color: #000; text-decoration: none; opacity: .75; } +.close:not(:disabled):not(.disabled) { + cursor: pointer; +} + button.close { padding: 0; background-color: transparent; @@ -5342,11 +5304,6 @@ button.close { overflow: hidden; } -.modal-open .modal { - overflow-x: hidden; - overflow-y: auto; -} - .modal { position: fixed; top: 0; @@ -5359,6 +5316,11 @@ button.close { outline: 0; } +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; +} + .modal-dialog { position: relative; width: auto; @@ -5393,12 +5355,6 @@ 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: -ms-flexbox; @@ -5497,9 +5453,6 @@ button.close { .modal-dialog-centered { min-height: calc(100% - (1.75rem * 2)); } - .modal-dialog-centered::before { - height: calc(100vh - (1.75rem * 2)); - } .modal-sm { max-width: 300px; } @@ -5516,7 +5469,7 @@ button.close { z-index: 1070; display: block; margin: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-style: normal; font-weight: 400; line-height: 1.5; @@ -5629,7 +5582,7 @@ button.close { z-index: 1060; display: block; max-width: 276px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-style: normal; font-weight: 400; line-height: 1.5; @@ -5824,27 +5777,25 @@ button.close { -ms-flex-align: center; align-items: center; width: 100%; + transition: -webkit-transform 0.6s ease; + transition: transform 0.6s ease; + transition: transform 0.6s ease, -webkit-transform 0.6s ease; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; perspective: 1000px; } +@media screen and (prefers-reduced-motion: reduce) { + .carousel-item { + transition: none; + } +} + .carousel-item.active, .carousel-item-next, .carousel-item-prev { display: block; - transition: -webkit-transform 0.6s ease; - transition: transform 0.6s ease; - transition: transform 0.6s ease, -webkit-transform 0.6s ease; -} - -@media screen and (prefers-reduced-motion: reduce) { - .carousel-item.active, - .carousel-item-next, - .carousel-item-prev { - transition: none; - } } .carousel-item-next, diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js index e8b832da6b..adb3400738 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.1.3 (https://getbootstrap.com/) + * Bootstrap v4.1.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) */ @@ -69,7 +69,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): util.js + * Bootstrap (v4.1.1): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -146,7 +146,8 @@ } try { - return document.querySelector(selector) ? selector : null; + var $selector = $$$1(document).find(selector); + return $selector.length > 0 ? selector : null; } catch (err) { return null; } @@ -201,7 +202,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): alert.js + * Bootstrap (v4.1.1): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -213,7 +214,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'alert'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -276,7 +277,7 @@ var parent = false; if (selector) { - parent = document.querySelector(selector); + parent = $$$1(selector)[0]; } if (!parent) { @@ -376,7 +377,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): button.js + * Bootstrap (v4.1.1): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -388,7 +389,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'button'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.button'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -433,14 +434,14 @@ var rootElement = $$$1(this._element).closest(Selector.DATA_TOGGLE)[0]; if (rootElement) { - var input = this._element.querySelector(Selector.INPUT); + var input = $$$1(this._element).find(Selector.INPUT)[0]; if (input) { if (input.type === 'radio') { - if (input.checked && this._element.classList.contains(ClassName.ACTIVE)) { + if (input.checked && $$$1(this._element).hasClass(ClassName.ACTIVE)) { triggerChangeEvent = false; } else { - var activeElement = rootElement.querySelector(Selector.ACTIVE); + var activeElement = $$$1(rootElement).find(Selector.ACTIVE)[0]; if (activeElement) { $$$1(activeElement).removeClass(ClassName.ACTIVE); @@ -453,7 +454,7 @@ return; } - input.checked = !this._element.classList.contains(ClassName.ACTIVE); + input.checked = !$$$1(this._element).hasClass(ClassName.ACTIVE); $$$1(input).trigger('change'); } @@ -463,7 +464,7 @@ } if (addAriaPressed) { - this._element.setAttribute('aria-pressed', !this._element.classList.contains(ClassName.ACTIVE)); + this._element.setAttribute('aria-pressed', !$$$1(this._element).hasClass(ClassName.ACTIVE)); } if (triggerChangeEvent) { @@ -540,7 +541,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): carousel.js + * Bootstrap (v4.1.1): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -552,7 +553,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'carousel'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -631,7 +632,7 @@ this.touchTimeout = null; this._config = this._getConfig(config); this._element = $$$1(element)[0]; - this._indicatorsElement = this._element.querySelector(Selector.INDICATORS); + this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0]; this._addEventListeners(); } // Getters @@ -665,7 +666,7 @@ this._isPaused = true; } - if (this._element.querySelector(Selector.NEXT_PREV)) { + if ($$$1(this._element).find(Selector.NEXT_PREV)[0]) { Util.triggerTransitionEnd(this._element); this.cycle(true); } @@ -692,7 +693,7 @@ _proto.to = function to(index) { var _this = this; - this._activeElement = this._element.querySelector(Selector.ACTIVE_ITEM); + this._activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeIndex = this._getItemIndex(this._activeElement); @@ -798,7 +799,7 @@ }; _proto._getItemIndex = function _getItemIndex(element) { - this._items = element && element.parentNode ? [].slice.call(element.parentNode.querySelectorAll(Selector.ITEM)) : []; + this._items = $$$1.makeArray($$$1(element).parent().find(Selector.ITEM)); return this._items.indexOf(element); }; @@ -823,7 +824,7 @@ _proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { var targetIndex = this._getItemIndex(relatedTarget); - var fromIndex = this._getItemIndex(this._element.querySelector(Selector.ACTIVE_ITEM)); + var fromIndex = this._getItemIndex($$$1(this._element).find(Selector.ACTIVE_ITEM)[0]); var slideEvent = $$$1.Event(Event.SLIDE, { relatedTarget: relatedTarget, @@ -837,8 +838,7 @@ _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) { if (this._indicatorsElement) { - var indicators = [].slice.call(this._indicatorsElement.querySelectorAll(Selector.ACTIVE)); - $$$1(indicators).removeClass(ClassName.ACTIVE); + $$$1(this._indicatorsElement).find(Selector.ACTIVE).removeClass(ClassName.ACTIVE); var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)]; @@ -851,7 +851,7 @@ _proto._slide = function _slide(direction, element) { var _this3 = this; - var activeElement = this._element.querySelector(Selector.ACTIVE_ITEM); + var activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeElementIndex = this._getItemIndex(activeElement); @@ -1017,13 +1017,11 @@ $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); $$$1(window).on(Event.LOAD_DATA_API, function () { - var carousels = [].slice.call(document.querySelectorAll(Selector.DATA_RIDE)); - - for (var i = 0, len = carousels.length; i < len; i++) { - var $carousel = $$$1(carousels[i]); + $$$1(Selector.DATA_RIDE).each(function () { + var $carousel = $$$1(this); Carousel._jQueryInterface.call($carousel, $carousel.data()); - } + }); }); /** * ------------------------------------------------------------------------ @@ -1044,7 +1042,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): collapse.js + * Bootstrap (v4.1.1): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1056,7 +1054,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'collapse'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1104,17 +1102,14 @@ this._isTransitioning = false; this._element = element; this._config = this._getConfig(config); - this._triggerArray = $$$1.makeArray(document.querySelectorAll("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]"))); - var toggleList = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE)); + this._triggerArray = $$$1.makeArray($$$1("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]"))); + var tabToggles = $$$1(Selector.DATA_TOGGLE); - for (var i = 0, len = toggleList.length; i < len; i++) { - var elem = toggleList[i]; + for (var i = 0; i < tabToggles.length; i++) { + var elem = tabToggles[i]; var selector = Util.getSelectorFromElement(elem); - var filterElement = [].slice.call(document.querySelectorAll(selector)).filter(function (foundElem) { - return foundElem === element; - }); - if (selector !== null && filterElement.length > 0) { + if (selector !== null && $$$1(selector).filter(element).length > 0) { this._selector = selector; this._triggerArray.push(elem); @@ -1155,9 +1150,7 @@ var activesData; if (this._parent) { - actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES)).filter(function (elem) { - return elem.getAttribute('data-parent') === _this._config.parent; - }); + actives = $$$1.makeArray($$$1(this._parent).find(Selector.ACTIVES).filter("[data-parent=\"" + this._config.parent + "\"]")); if (actives.length === 0) { actives = null; @@ -1192,7 +1185,7 @@ $$$1(this._element).removeClass(ClassName.COLLAPSE).addClass(ClassName.COLLAPSING); this._element.style[dimension] = 0; - if (this._triggerArray.length) { + if (this._triggerArray.length > 0) { $$$1(this._triggerArray).removeClass(ClassName.COLLAPSED).attr('aria-expanded', true); } @@ -1233,15 +1226,14 @@ 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); - var triggerArrayLength = this._triggerArray.length; - if (triggerArrayLength > 0) { - for (var i = 0; i < triggerArrayLength; i++) { + if (this._triggerArray.length > 0) { + for (var i = 0; i < this._triggerArray.length; i++) { var trigger = this._triggerArray[i]; var selector = Util.getSelectorFromElement(trigger); if (selector !== null) { - var $elem = $$$1([].slice.call(document.querySelectorAll(selector))); + var $elem = $$$1(selector); if (!$elem.hasClass(ClassName.SHOW)) { $$$1(trigger).addClass(ClassName.COLLAPSED).attr('aria-expanded', false); @@ -1302,12 +1294,11 @@ parent = this._config.parent[0]; } } else { - parent = document.querySelector(this._config.parent); + parent = $$$1(this._config.parent)[0]; } var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]"; - var children = [].slice.call(parent.querySelectorAll(selector)); - $$$1(children).each(function (i, element) { + $$$1(parent).find(selector).each(function (i, element) { _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]); }); return parent; @@ -1317,7 +1308,7 @@ if (element) { var isOpen = $$$1(element).hasClass(ClassName.SHOW); - if (triggerArray.length) { + if (triggerArray.length > 0) { $$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen); } } @@ -1326,7 +1317,7 @@ Collapse._getTargetFromElement = function _getTargetFromElement(element) { var selector = Util.getSelectorFromElement(element); - return selector ? document.querySelector(selector) : null; + return selector ? $$$1(selector)[0] : null; }; Collapse._jQueryInterface = function _jQueryInterface(config) { @@ -1384,8 +1375,7 @@ var $trigger = $$$1(this); var selector = Util.getSelectorFromElement(this); - var selectors = [].slice.call(document.querySelectorAll(selector)); - $$$1(selectors).each(function () { + $$$1(selector).each(function () { var $target = $$$1(this); var data = $target.data(DATA_KEY); var config = data ? 'toggle' : $trigger.data(); @@ -3930,7 +3920,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): dropdown.js + * Bootstrap (v4.1.1): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -3942,7 +3932,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'dropdown'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -4151,16 +4141,14 @@ if (!this._menu) { var parent = Dropdown._getParentFromElement(this._element); - if (parent) { - this._menu = parent.querySelector(Selector.MENU); - } + this._menu = $$$1(parent).find(Selector.MENU)[0]; } return this._menu; }; _proto._getPlacement = function _getPlacement() { - var $parentDropdown = $$$1(this._element.parentNode); + var $parentDropdown = $$$1(this._element).parent(); var placement = AttachmentMap.BOTTOM; // Handle dropup if ($parentDropdown.hasClass(ClassName.DROPUP)) { @@ -4248,9 +4236,9 @@ return; } - var toggles = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE)); + var toggles = $$$1.makeArray($$$1(Selector.DATA_TOGGLE)); - for (var i = 0, len = toggles.length; i < len; i++) { + for (var i = 0; i < toggles.length; i++) { var parent = Dropdown._getParentFromElement(toggles[i]); var context = $$$1(toggles[i]).data(DATA_KEY); @@ -4258,10 +4246,6 @@ relatedTarget: toggles[i] }; - if (event && event.type === 'click') { - relatedTarget.clickEvent = event; - } - if (!context) { continue; } @@ -4300,7 +4284,7 @@ var selector = Util.getSelectorFromElement(element); if (selector) { - parent = document.querySelector(selector); + parent = $$$1(selector)[0]; } return parent || element.parentNode; @@ -4332,7 +4316,7 @@ if (!isActive && (event.which !== ESCAPE_KEYCODE || event.which !== SPACE_KEYCODE) || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) { if (event.which === ESCAPE_KEYCODE) { - var toggle = parent.querySelector(Selector.DATA_TOGGLE); + var toggle = $$$1(parent).find(Selector.DATA_TOGGLE)[0]; $$$1(toggle).trigger('focus'); } @@ -4340,7 +4324,7 @@ return; } - var items = [].slice.call(parent.querySelectorAll(Selector.VISIBLE_ITEMS)); + var items = $$$1(parent).find(Selector.VISIBLE_ITEMS).get(); if (items.length === 0) { return; @@ -4418,7 +4402,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): modal.js + * Bootstrap (v4.1.1): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -4430,7 +4414,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'modal'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -4474,7 +4458,8 @@ DATA_TOGGLE: '[data-toggle="modal"]', DATA_DISMISS: '[data-dismiss="modal"]', FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', - STICKY_CONTENT: '.sticky-top' + STICKY_CONTENT: '.sticky-top', + NAVBAR_TOGGLER: '.navbar-toggler' /** * ------------------------------------------------------------------------ * Class Definition @@ -4489,7 +4474,7 @@ function Modal(element, config) { this._config = this._getConfig(config); this._element = element; - this._dialog = element.querySelector(Selector.DIALOG); + this._dialog = $$$1(element).find(Selector.DIALOG)[0]; this._backdrop = null; this._isShown = false; this._isBodyOverflowing = false; @@ -4746,7 +4731,7 @@ this._backdrop.className = ClassName.BACKDROP; if (animate) { - this._backdrop.classList.add(animate); + $$$1(this._backdrop).addClass(animate); } $$$1(this._backdrop).appendTo(document.body); @@ -4840,19 +4825,23 @@ 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 - var fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT)); - var stickyContent = [].slice.call(document.querySelectorAll(Selector.STICKY_CONTENT)); // Adjust fixed content padding - - $$$1(fixedContent).each(function (index, element) { - var actualPadding = element.style.paddingRight; + // 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 - $$$1(stickyContent).each(function (index, element) { - var actualMargin = element.style.marginRight; + $$$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 + + $$$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"); }); // Adjust body padding var actualPadding = document.body.style.paddingRight; @@ -4863,15 +4852,15 @@ _proto._resetScrollbar = function _resetScrollbar() { // Restore fixed content padding - var fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT)); - $$$1(fixedContent).each(function (index, element) { + $$$1(Selector.FIXED_CONTENT).each(function (index, element) { var padding = $$$1(element).data('padding-right'); - $$$1(element).removeData('padding-right'); - element.style.paddingRight = padding ? padding : ''; - }); // Restore sticky content - var elements = [].slice.call(document.querySelectorAll("" + Selector.STICKY_CONTENT)); - $$$1(elements).each(function (index, element) { + 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'); if (typeof margin !== 'undefined') { @@ -4880,8 +4869,10 @@ }); // Restore body padding var padding = $$$1(document.body).data('padding-right'); - $$$1(document.body).removeData('padding-right'); - document.body.style.paddingRight = padding ? padding : ''; + + if (typeof padding !== 'undefined') { + $$$1(document.body).css('padding-right', padding).removeData('padding-right'); + } }; _proto._getScrollbarWidth = function _getScrollbarWidth() { @@ -4946,7 +4937,7 @@ var selector = Util.getSelectorFromElement(this); if (selector) { - target = document.querySelector(selector); + target = $$$1(selector)[0]; } var config = $$$1(target).data(DATA_KEY) ? 'toggle' : _objectSpread({}, $$$1(target).data(), $$$1(this).data()); @@ -4989,7 +4980,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): tooltip.js + * Bootstrap (v4.1.1): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -5001,7 +4992,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'tooltip'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; @@ -5211,7 +5202,7 @@ var attachment = this._getAttachment(placement); this.addAttachmentClass(attachment); - var container = this.config.container === false ? document.body : $$$1(document).find(this.config.container); + 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)) { @@ -5350,9 +5341,9 @@ }; _proto.setContent = function setContent() { - var tip = this.getTipElement(); - this.setElementContent($$$1(tip.querySelectorAll(Selector.TOOLTIP_INNER)), this.getTitle()); - $$$1(tip).removeClass(ClassName.FADE + " " + ClassName.SHOW); + var $tip = $$$1(this.getTipElement()); + this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); + $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW); }; _proto.setElementContent = function setElementContent($element, content) { @@ -5545,18 +5536,15 @@ var $tip = $$$1(this.getTipElement()); var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX); - if (tabClass !== null && tabClass.length) { + if (tabClass !== null && tabClass.length > 0) { $tip.removeClass(tabClass.join('')); } }; - _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(popperData) { - var popperInstance = popperData.instance; - this.tip = popperInstance.popper; - + _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(data) { this._cleanTipClass(); - this.addAttachmentClass(this._getAttachment(popperData.placement)); + this.addAttachmentClass(this._getAttachment(data.placement)); }; _proto._fixTransition = function _fixTransition() { @@ -5659,7 +5647,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): popover.js + * Bootstrap (v4.1.1): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -5671,7 +5659,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'popover'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; @@ -5856,7 +5844,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): scrollspy.js + * Bootstrap (v4.1.1): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -5868,7 +5856,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'scrollspy'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -5950,13 +5938,13 @@ this._offsets = []; this._targets = []; this._scrollHeight = this._getScrollHeight(); - var targets = [].slice.call(document.querySelectorAll(this._selector)); + var targets = $$$1.makeArray($$$1(this._selector)); targets.map(function (element) { var target; var targetSelector = Util.getSelectorFromElement(element); if (targetSelector) { - target = document.querySelector(targetSelector); + target = $$$1(targetSelector)[0]; } if (target) { @@ -6053,9 +6041,7 @@ return; } - var offsetLength = this._offsets.length; - - for (var i = offsetLength; i--;) { + for (var i = this._offsets.length; 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) { @@ -6075,7 +6061,7 @@ queries = queries.map(function (selector) { return selector + "[data-target=\"" + target + "\"]," + (selector + "[href=\"" + target + "\"]"); }); - var $link = $$$1([].slice.call(document.querySelectorAll(queries.join(',')))); + var $link = $$$1(queries.join(',')); if ($link.hasClass(ClassName.DROPDOWN_ITEM)) { $link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE); @@ -6096,8 +6082,7 @@ }; _proto._clear = function _clear() { - var nodes = [].slice.call(document.querySelectorAll(this._selector)); - $$$1(nodes).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE); + $$$1(this._selector).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE); }; // Static @@ -6144,10 +6129,9 @@ $$$1(window).on(Event.LOAD_DATA_API, function () { - var scrollSpys = [].slice.call(document.querySelectorAll(Selector.DATA_SPY)); - var scrollSpysLength = scrollSpys.length; + var scrollSpys = $$$1.makeArray($$$1(Selector.DATA_SPY)); - for (var i = scrollSpysLength; i--;) { + for (var i = scrollSpys.length; i--;) { var $spy = $$$1(scrollSpys[i]); ScrollSpy._jQueryInterface.call($spy, $spy.data()); @@ -6172,7 +6156,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): tab.js + * Bootstrap (v4.1.1): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -6184,7 +6168,7 @@ * ------------------------------------------------------------------------ */ var NAME = 'tab'; - var VERSION = '4.1.3'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -6266,7 +6250,7 @@ } if (selector) { - target = document.querySelector(selector); + target = $$$1(selector)[0]; } this._activate(this._element, listElement); @@ -6348,8 +6332,7 @@ var dropdownElement = $$$1(element).closest(Selector.DROPDOWN)[0]; if (dropdownElement) { - var dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(Selector.DROPDOWN_TOGGLE)); - $$$1(dropdownToggleList).addClass(ClassName.ACTIVE); + $$$1(dropdownElement).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE); } element.setAttribute('aria-expanded', true); @@ -6421,7 +6404,7 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.3): index.js + * Bootstrap (v4.1.1): index.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css index 84ec203661..56ea4f4cae 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css @@ -4,7 +4,6 @@ table.dataTable { margin-bottom: 6px !important; max-width: none !important; border-collapse: separate !important; - border-spacing: 0; } table.dataTable td, table.dataTable th { @@ -26,7 +25,7 @@ div.dataTables_wrapper div.dataTables_length label { white-space: nowrap; } div.dataTables_wrapper div.dataTables_length select { - width: auto; + width: 75px; display: inline-block; } div.dataTables_wrapper div.dataTables_filter { @@ -133,9 +132,6 @@ div.dataTables_scrollBody table { margin-top: 0 !important; margin-bottom: 0 !important; } -div.dataTables_scrollBody table thead .sorting:before, -div.dataTables_scrollBody table thead .sorting_asc:before, -div.dataTables_scrollBody table thead .sorting_desc:before, div.dataTables_scrollBody table thead .sorting:after, div.dataTables_scrollBody table thead .sorting_asc:after, div.dataTables_scrollBody table thead .sorting_desc:after { diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js index f2d2ad583b..7977fd79df 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js @@ -1,9 +1,9 @@ -/*! DataTables Bootstrap 4 integration - * ©2011-2017 SpryMedia Ltd - datatables.net/license +/*! DataTables Bootstrap 3 integration + * ©2011-2015 SpryMedia Ltd - datatables.net/license */ /** - * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and + * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and * DataTables 1.10 or newer. * * This file sets the defaults and adds options to DataTables to style its @@ -55,9 +55,9 @@ $.extend( true, DataTable.defaults, { /* Default class modification */ $.extend( DataTable.ext.classes, { - sWrapper: "dataTables_wrapper dt-bootstrap4", + sWrapper: "dataTables_wrapper container-fluid dt-bootstrap4", sFilterInput: "form-control form-control-sm", - sLengthSelect: "custom-select custom-select-sm form-control form-control-sm", + sLengthSelect: "form-control form-control-sm", sProcessing: "dataTables_processing card", sPageButton: "paginate_button page-item" } ); diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net/js/jquery.dataTables.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net/js/jquery.dataTables.js index 3db866f547..ef9828da33 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net/js/jquery.dataTables.js +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/datatables.net/js/jquery.dataTables.js @@ -1,15 +1,15 @@ -/*! DataTables 1.10.19 - * ©2008-2018 SpryMedia Ltd - datatables.net/license +/*! DataTables 1.10.16 + * ©2008-2017 SpryMedia Ltd - datatables.net/license */ /** * @summary DataTables * @description Paginate, search and order HTML tables - * @version 1.10.19 + * @version 1.10.16 * @file jquery.dataTables.js * @author SpryMedia Ltd * @contact www.datatables.net - * @copyright Copyright 2008-2018 SpryMedia Ltd. + * @copyright Copyright 2008-2017 SpryMedia Ltd. * * This source file is free software, available under the following license: * MIT license - http://datatables.net/license @@ -909,11 +909,8 @@ var s = allSettings[i]; /* Base check on table node */ - if ( - s.nTable == this || - (s.nTHead && s.nTHead.parentNode == this) || - (s.nTFoot && s.nTFoot.parentNode == this) - ) { + if ( s.nTable == this || s.nTHead.parentNode == this || (s.nTFoot && s.nTFoot.parentNode == this) ) + { var bRetrieve = oInit.bRetrieve !== undefined ? oInit.bRetrieve : defaults.bRetrieve; var bDestroy = oInit.bDestroy !== undefined ? oInit.bDestroy : defaults.bDestroy; @@ -970,7 +967,11 @@ // Backwards compatibility, before we apply all the defaults _fnCompatOpts( oInit ); - _fnLanguageCompat( oInit.oLanguage ); + + if ( oInit.oLanguage ) + { + _fnLanguageCompat( oInit.oLanguage ); + } // If the length menu is given, but the init display length is not, use the length menu if ( oInit.aLengthMenu && ! oInit.iDisplayLength ) @@ -1353,10 +1354,8 @@ // - fr - Swiss Franc // - kr - Swedish krona, Norwegian krone and Danish krone // - \u2009 is thin space and \u202F is narrow no-break space, both used in many - // - Ƀ - Bitcoin - // - Ξ - Ethereum // standards as thousands separators. - var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi; + var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi; var _empty = function ( d ) { @@ -1731,43 +1730,33 @@ */ function _fnLanguageCompat( lang ) { - // Note the use of the Hungarian notation for the parameters in this method as - // this is called after the mapping of camelCase to Hungarian var defaults = DataTable.defaults.oLanguage; + var zeroRecords = lang.sZeroRecords; - // Default mapping - var defaultDecimal = defaults.sDecimal; - if ( defaultDecimal ) { - _addNumericSort( defaultDecimal ); + /* Backwards compatibility - if there is no sEmptyTable given, then use the same as + * sZeroRecords - assuming that is given. + */ + if ( ! lang.sEmptyTable && zeroRecords && + defaults.sEmptyTable === "No data available in table" ) + { + _fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' ); } - if ( lang ) { - var zeroRecords = lang.sZeroRecords; - - // Backwards compatibility - if there is no sEmptyTable given, then use the same as - // sZeroRecords - assuming that is given. - if ( ! lang.sEmptyTable && zeroRecords && - defaults.sEmptyTable === "No data available in table" ) - { - _fnMap( lang, lang, 'sZeroRecords', 'sEmptyTable' ); - } - - // Likewise with loading records - if ( ! lang.sLoadingRecords && zeroRecords && - defaults.sLoadingRecords === "Loading..." ) - { - _fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' ); - } + /* Likewise with loading records */ + if ( ! lang.sLoadingRecords && zeroRecords && + defaults.sLoadingRecords === "Loading..." ) + { + _fnMap( lang, lang, 'sZeroRecords', 'sLoadingRecords' ); + } - // Old parameter name of the thousands separator mapped onto the new - if ( lang.sInfoThousands ) { - lang.sThousands = lang.sInfoThousands; - } + // Old parameter name of the thousands separator mapped onto the new + if ( lang.sInfoThousands ) { + lang.sThousands = lang.sInfoThousands; + } - var decimal = lang.sDecimal; - if ( decimal && defaultDecimal !== decimal ) { - _addNumericSort( decimal ); - } + var decimal = lang.sDecimal; + if ( decimal ) { + _addNumericSort( decimal ); } } @@ -3139,7 +3128,7 @@ } } - _fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow, cells] ); + _fnCallbackFire( oSettings, 'aoRowCreatedCallback', null, [nTr, rowData, iRow] ); } // Remove once webkit bug 131819 and Chromium bug 365619 have been resolved @@ -3464,7 +3453,7 @@ // iRowCount and j are not currently documented. Are they at all // useful? _fnCallbackFire( oSettings, 'aoRowCallback', null, - [nRow, aoData._aData, iRowCount, j, iDataIndex] ); + [nRow, aoData._aData, iRowCount, j] ); anRows.push( nRow ); iRowCount++; @@ -3868,12 +3857,12 @@ { ajaxData = ajax.data; - var newData = typeof ajaxData === 'function' ? + var newData = $.isFunction( ajaxData ) ? ajaxData( data, oSettings ) : // fn can manipulate data or return ajaxData; // an object object or array to merge // If the function returned something, use that alone - data = typeof ajaxData === 'function' && newData ? + data = $.isFunction( ajaxData ) && newData ? newData : $.extend( true, data, newData ); @@ -3937,7 +3926,7 @@ url: ajax || oSettings.sAjaxSource } ) ); } - else if ( typeof ajax === 'function' ) + else if ( $.isFunction( ajax ) ) { // Is a function - let the caller define what needs to be done oSettings.jqXHR = ajax.call( instance, data, callback, oSettings ); @@ -5371,18 +5360,14 @@ // both match, but we want to hide it completely. We want to also fix their // width to what they currently are _fnApplyToChildren( function(nSizer, i) { - nSizer.innerHTML = '
'+headerContent[i]+'
'; - nSizer.childNodes[0].style.height = "0"; - nSizer.childNodes[0].style.overflow = "hidden"; + nSizer.innerHTML = '
'+headerContent[i]+'
'; nSizer.style.width = headerWidths[i]; }, headerSrcEls ); if ( footer ) { _fnApplyToChildren( function(nSizer, i) { - nSizer.innerHTML = '
'+footerContent[i]+'
'; - nSizer.childNodes[0].style.height = "0"; - nSizer.childNodes[0].style.overflow = "hidden"; + nSizer.innerHTML = '
'+footerContent[i]+'
'; nSizer.style.width = footerWidths[i]; }, footerSrcEls ); } @@ -6576,7 +6561,7 @@ { $(n) .on( 'click.DT', oData, function (e) { - $(n).blur(); // Remove focus outline for mouse users + n.blur(); // Remove focus outline for mouse users fn(e); } ) .on( 'keypress.DT', oData, function (e){ @@ -7816,26 +7801,13 @@ } } else if ( order == 'current' || order == 'applied' ) { - if ( search == 'none') { - a = displayMaster.slice(); - } - else if ( search == 'applied' ) { - a = displayFiltered.slice(); - } - else if ( search == 'removed' ) { - // O(n+m) solution by creating a hash map - var displayFilteredMap = {}; - - for ( var i=0, ien=displayFiltered.length ; i