2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
This commit is contained in:
Mark Otto
2018-09-17 12:34:34 -07:00
parent 928ebd8925
commit b68ea572da
27 changed files with 97 additions and 167 deletions
+5 -6
View File
@@ -87,7 +87,6 @@ html {
.col-xl-auto {
position: relative;
width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
@@ -104,7 +103,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-1 {
@@ -310,7 +309,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-sm-1 {
-ms-flex: 0 0 8.333333%;
@@ -482,7 +481,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-md-1 {
-ms-flex: 0 0 8.333333%;
@@ -654,7 +653,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-lg-1 {
-ms-flex: 0 0 8.333333%;
@@ -826,7 +825,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-xl-1 {
-ms-flex: 0 0 8.333333%;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-1
View File
@@ -134,7 +134,6 @@ a {
color: #007bff;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
}
a:hover {
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -4,5 +4,5 @@
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/*,::after,::before{box-sizing:border-box}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}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}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-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
*/*,::after,::before{box-sizing:border-box}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}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}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-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
/*# sourceMappingURL=bootstrap-reboot.min.css.map */
File diff suppressed because one or more lines are too long
+35 -76
View File
@@ -164,7 +164,6 @@ a {
color: #007bff;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
}
a:hover {
@@ -475,7 +474,7 @@ mark,
}
.blockquote-footer::before {
content: "\2014 \00A0";
content: "\2014\00A0";
}
.img-fluid {
@@ -615,7 +614,6 @@ pre code {
.col-xl-auto {
position: relative;
width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
@@ -632,7 +630,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-1 {
@@ -838,7 +836,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-sm-1 {
-ms-flex: 0 0 8.333333%;
@@ -1010,7 +1008,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-md-1 {
-ms-flex: 0 0 8.333333%;
@@ -1182,7 +1180,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-lg-1 {
-ms-flex: 0 0 8.333333%;
@@ -1354,7 +1352,7 @@ pre code {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
max-width: none;
max-width: 100%;
}
.col-xl-1 {
-ms-flex: 0 0 8.333333%;
@@ -2114,10 +2112,6 @@ 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 {
border-color: inherit;
}
.was-validated .custom-file-input:valid ~ .valid-feedback,
.was-validated .custom-file-input:valid ~ .valid-tooltip, .custom-file-input.is-valid ~ .valid-feedback,
.custom-file-input.is-valid ~ .valid-tooltip {
@@ -2125,6 +2119,7 @@ textarea.form-control {
}
.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {
border-color: #28a745;
box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
}
@@ -2235,10 +2230,6 @@ 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 {
border-color: inherit;
}
.was-validated .custom-file-input:invalid ~ .invalid-feedback,
.was-validated .custom-file-input:invalid ~ .invalid-tooltip, .custom-file-input.is-invalid ~ .invalid-feedback,
.custom-file-input.is-invalid ~ .invalid-tooltip {
@@ -2246,6 +2237,7 @@ textarea.form-control {
}
.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {
border-color: #dc3545;
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
}
@@ -2325,13 +2317,14 @@ textarea.form-control {
.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: 1rem;
@@ -2347,6 +2340,7 @@ textarea.form-control {
}
.btn:hover, .btn:focus {
color: #212529;
text-decoration: none;
}
@@ -2642,8 +2636,6 @@ fieldset:disabled a.btn {
.btn-outline-primary {
color: #007bff;
background-color: transparent;
background-image: none;
border-color: #007bff;
}
@@ -2676,8 +2668,6 @@ fieldset:disabled a.btn {
.btn-outline-secondary {
color: #6c757d;
background-color: transparent;
background-image: none;
border-color: #6c757d;
}
@@ -2710,8 +2700,6 @@ fieldset:disabled a.btn {
.btn-outline-success {
color: #28a745;
background-color: transparent;
background-image: none;
border-color: #28a745;
}
@@ -2744,8 +2732,6 @@ fieldset:disabled a.btn {
.btn-outline-info {
color: #17a2b8;
background-color: transparent;
background-image: none;
border-color: #17a2b8;
}
@@ -2778,8 +2764,6 @@ fieldset:disabled a.btn {
.btn-outline-warning {
color: #ffc107;
background-color: transparent;
background-image: none;
border-color: #ffc107;
}
@@ -2812,8 +2796,6 @@ fieldset:disabled a.btn {
.btn-outline-danger {
color: #dc3545;
background-color: transparent;
background-image: none;
border-color: #dc3545;
}
@@ -2846,8 +2828,6 @@ fieldset:disabled a.btn {
.btn-outline-light {
color: #f8f9fa;
background-color: transparent;
background-image: none;
border-color: #f8f9fa;
}
@@ -2880,8 +2860,6 @@ fieldset:disabled a.btn {
.btn-outline-dark {
color: #343a40;
background-color: transparent;
background-image: none;
border-color: #343a40;
}
@@ -3711,10 +3689,6 @@ input[type="button"].btn-block {
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-file-input:focus ~ .custom-file-label::after {
border-color: #80bdff;
}
.custom-file-input:disabled ~ .custom-file-label {
background-color: #e9ecef;
}
@@ -3751,7 +3725,7 @@ input[type="button"].btn-block {
color: #495057;
content: "Browse";
background-color: #e9ecef;
border-left: 1px solid #ced4da;
border-left: inherit;
border-radius: 0 0.25rem 0.25rem 0;
}
@@ -4833,6 +4807,10 @@ input[type="button"].btn-block {
border-radius: 0.25rem;
}
a.badge:hover, a.badge:focus {
text-decoration: none;
}
.badge:empty {
display: none;
}
@@ -4853,9 +4831,8 @@ input[type="button"].btn-block {
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;
}
@@ -4864,9 +4841,8 @@ input[type="button"].btn-block {
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;
}
@@ -4875,9 +4851,8 @@ input[type="button"].btn-block {
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;
}
@@ -4886,9 +4861,8 @@ input[type="button"].btn-block {
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;
}
@@ -4897,9 +4871,8 @@ input[type="button"].btn-block {
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;
}
@@ -4908,9 +4881,8 @@ input[type="button"].btn-block {
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;
}
@@ -4919,9 +4891,8 @@ input[type="button"].btn-block {
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;
}
@@ -4930,9 +4901,8 @@ input[type="button"].btn-block {
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;
}
@@ -5530,6 +5500,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) {
@@ -6051,7 +6023,7 @@ button.close {
.carousel-indicators {
position: absolute;
right: 0;
bottom: 10px;
bottom: 0;
left: 0;
z-index: 15;
display: -ms-flexbox;
@@ -6065,7 +6037,7 @@ button.close {
}
.carousel-indicators li {
position: relative;
box-sizing: content-box;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
width: 30px;
@@ -6075,6 +6047,9 @@ button.close {
text-indent: -999px;
cursor: pointer;
background-color: #fff;
background-clip: padding-box;
border-top: 10px solid transparent;
border-bottom: 10px solid transparent;
opacity: .5;
transition: opacity 0.6s ease;
}
@@ -6085,26 +6060,6 @@ button.close {
}
}
.carousel-indicators li::before {
position: absolute;
top: -10px;
left: 0;
display: inline-block;
width: 100%;
height: 10px;
content: "";
}
.carousel-indicators li::after {
position: absolute;
bottom: -10px;
left: 0;
display: inline-block;
width: 100%;
height: 10px;
content: "";
}
.carousel-indicators .active {
opacity: 1;
}
@@ -9526,6 +9481,10 @@ a.text-dark:hover, a.text-dark:focus {
text-decoration: none !important;
}
.text-reset {
color: inherit !important;
}
.visible {
visibility: visible !important;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+12 -21
View File
@@ -140,24 +140,13 @@
},
getSelectorFromElement: function getSelectorFromElement(element) {
var selector = element.getAttribute('data-target');
var method = 'querySelector';
if (!selector || selector === '#') {
selector = (element.getAttribute('href') || '').trim();
var hrefAttr = element.getAttribute('href');
selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
}
var validSelector = selector;
if (selector.charAt(0) === '#' && selector.indexOf(',') === -1) {
selector = selector.substr(1);
method = 'getElementById';
}
try {
return document[method](selector) ? validSelector : null;
} catch (err) {
return null;
}
return selector && document.querySelector(selector) ? selector : null;
},
getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
if (!element) {
@@ -1164,7 +1153,11 @@
if (this._parent) {
actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES)).filter(function (elem) {
return elem.getAttribute('data-parent') === _this._config.parent;
if (typeof _this._config.parent === 'string') {
return elem.getAttribute('data-parent') === _this._config.parent;
}
return elem.classList.contains(ClassName.COLLAPSE);
});
if (actives.length === 0) {
@@ -1301,7 +1294,7 @@
_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
@@ -1322,12 +1315,10 @@
};
_proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
if (element) {
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
}; // Static
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+12 -21
View File
@@ -141,24 +141,13 @@
},
getSelectorFromElement: function getSelectorFromElement(element) {
var selector = element.getAttribute('data-target');
var method = 'querySelector';
if (!selector || selector === '#') {
selector = (element.getAttribute('href') || '').trim();
var hrefAttr = element.getAttribute('href');
selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
}
var validSelector = selector;
if (selector.charAt(0) === '#' && selector.indexOf(',') === -1) {
selector = selector.substr(1);
method = 'getElementById';
}
try {
return document[method](selector) ? validSelector : null;
} catch (err) {
return null;
}
return selector && document.querySelector(selector) ? selector : null;
},
getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
if (!element) {
@@ -1165,7 +1154,11 @@
if (this._parent) {
actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES)).filter(function (elem) {
return elem.getAttribute('data-parent') === _this._config.parent;
if (typeof _this._config.parent === 'string') {
return elem.getAttribute('data-parent') === _this._config.parent;
}
return elem.classList.contains(ClassName.COLLAPSE);
});
if (actives.length === 0) {
@@ -1302,7 +1295,7 @@
_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
@@ -1323,12 +1316,10 @@
};
_proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
if (element) {
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
}; // Static
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+9 -7
View File
@@ -171,7 +171,11 @@
if (this._parent) {
actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES)).filter(function (elem) {
return elem.getAttribute('data-parent') === _this._config.parent;
if (typeof _this._config.parent === 'string') {
return elem.getAttribute('data-parent') === _this._config.parent;
}
return elem.classList.contains(ClassName.COLLAPSE);
});
if (actives.length === 0) {
@@ -308,7 +312,7 @@
_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
@@ -329,12 +333,10 @@
};
_proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
if (element) {
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
var isOpen = $$$1(element).hasClass(ClassName.SHOW);
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
if (triggerArray.length) {
$$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
}
}; // Static
+1 -1
View File
File diff suppressed because one or more lines are too long
+3 -14
View File
@@ -79,24 +79,13 @@
},
getSelectorFromElement: function getSelectorFromElement(element) {
var selector = element.getAttribute('data-target');
var method = 'querySelector';
if (!selector || selector === '#') {
selector = (element.getAttribute('href') || '').trim();
var hrefAttr = element.getAttribute('href');
selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
}
var validSelector = selector;
if (selector.charAt(0) === '#' && selector.indexOf(',') === -1) {
selector = selector.substr(1);
method = 'getElementById';
}
try {
return document[method](selector) ? validSelector : null;
} catch (err) {
return null;
}
return selector && document.querySelector(selector) ? selector : null;
},
getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
if (!element) {
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long