mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 08:04:59 +02:00
Code Issues Releases Wiki Activity

Rename .active to .show

Browse Source
This commit is contained in:
Starsam80
2016-10-27 16:13:17 -06:00
parent ede925d79b
commit bf39bb3ac3
21 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/alert.js
View File

@@ -36,9 +36,9 @@ const Alert = (($) => {
}
const ClassName = {
ALERT : 'alert',
FADE : 'fade',
ACTIVE : 'active'
ALERT : 'alert',
FADE : 'fade',
SHOW : 'show'
}
@@ -108,7 +108,7 @@ const Alert = (($) => {
}
_removeElement(element) {
$(element).removeClass(ClassName.ACTIVE)
$(element).removeClass(ClassName.SHOW)
if (!Util.supportsTransitionEnd() ||
!$(element).hasClass(ClassName.FADE)) {

16
js/src/collapse.js
View File

@@ -44,7 +44,7 @@ const Collapse = (($) => {
}
const ClassName = {
ACTIVE : 'active',
SHOW : 'show',
COLLAPSE : 'collapse',
COLLAPSING : 'collapsing',
COLLAPSED : 'collapsed'
@@ -56,7 +56,7 @@ const Collapse = (($) => {
}
const Selector = {
ACTIVES : '.card > .active, .card > .collapsing',
ACTIVES : '.card > .show, .card > .collapsing',
DATA_TOGGLE : '[data-toggle="collapse"]'
}
@@ -104,7 +104,7 @@ const Collapse = (($) => {
// public
toggle() {
if ($(this._element).hasClass(ClassName.ACTIVE)) {
if ($(this._element).hasClass(ClassName.SHOW)) {
this.hide()
} else {
this.show()
@@ -116,7 +116,7 @@ const Collapse = (($) => {
throw new Error('Collapse is transitioning')
}
if ($(this._element).hasClass(ClassName.ACTIVE)) {
if ($(this._element).hasClass(ClassName.SHOW)) {
return
}
@@ -171,7 +171,7 @@ const Collapse = (($) => {
$(this._element)
.removeClass(ClassName.COLLAPSING)
.addClass(ClassName.COLLAPSE)
.addClass(ClassName.ACTIVE)
.addClass(ClassName.SHOW)
this._element.style[dimension] = ''
@@ -200,7 +200,7 @@ const Collapse = (($) => {
throw new Error('Collapse is transitioning')
}
if (!$(this._element).hasClass(ClassName.ACTIVE)) {
if (!$(this._element).hasClass(ClassName.SHOW)) {
return
}
@@ -221,7 +221,7 @@ const Collapse = (($) => {
$(this._element)
.addClass(ClassName.COLLAPSING)
.removeClass(ClassName.COLLAPSE)
.removeClass(ClassName.ACTIVE)
.removeClass(ClassName.SHOW)
this._element.setAttribute('aria-expanded', false)
@@ -299,7 +299,7 @@ const Collapse = (($) => {
_addAriaAndCollapsedClass(element, triggerArray) {
if (element) {
const isOpen = $(element).hasClass(ClassName.ACTIVE)
const isOpen = $(element).hasClass(ClassName.SHOW)
element.setAttribute('aria-expanded', isOpen)
if (triggerArray.length) {

12
js/src/dropdown.js
View File

@@ -41,7 +41,7 @@ const Dropdown = (($) => {
const ClassName = {
BACKDROP : 'dropdown-backdrop',
DISABLED : 'disabled',
ACTIVE : 'active'
SHOW : 'show'
}
const Selector = {
@@ -86,7 +86,7 @@ const Dropdown = (($) => {
}
const parent = Dropdown._getParentFromElement(this)
const isActive = $(parent).hasClass(ClassName.ACTIVE)
const isActive = $(parent).hasClass(ClassName.SHOW)
Dropdown._clearMenus()
@@ -118,7 +118,7 @@ const Dropdown = (($) => {
this.focus()
this.setAttribute('aria-expanded', true)
$(parent).toggleClass(ClassName.ACTIVE)
$(parent).toggleClass(ClassName.SHOW)
$(parent).trigger($.Event(Event.SHOWN, relatedTarget))
return false
@@ -176,7 +176,7 @@ const Dropdown = (($) => {
relatedTarget : toggles[i]
}
if (!$(parent).hasClass(ClassName.ACTIVE)) {
if (!$(parent).hasClass(ClassName.SHOW)) {
continue
}
@@ -195,7 +195,7 @@ const Dropdown = (($) => {
toggles[i].setAttribute('aria-expanded', 'false')
$(parent)
.removeClass(ClassName.ACTIVE)
.removeClass(ClassName.SHOW)
.trigger($.Event(Event.HIDDEN, relatedTarget))
}
}
@@ -225,7 +225,7 @@ const Dropdown = (($) => {
}
const parent = Dropdown._getParentFromElement(this)
const isActive = $(parent).hasClass(ClassName.ACTIVE)
const isActive = $(parent).hasClass(ClassName.SHOW)
if (!isActive && event.which !== ESCAPE_KEYCODE ||
isActive && event.which === ESCAPE_KEYCODE) {

10
js/src/modal.js
View File

@@ -60,7 +60,7 @@ const Modal = (($) => {
BACKDROP : 'modal-backdrop',
OPEN : 'modal-open',
FADE : 'fade',
ACTIVE : 'active'
SHOW : 'show'
}
const Selector = {
@@ -185,7 +185,7 @@ const Modal = (($) => {
$(document).off(Event.FOCUSIN)
$(this._element).removeClass(ClassName.ACTIVE)
$(this._element).removeClass(ClassName.SHOW)
$(this._element).off(Event.CLICK_DISMISS)
$(this._dialog).off(Event.MOUSEDOWN_DISMISS)
@@ -242,7 +242,7 @@ const Modal = (($) => {
Util.reflow(this._element)
}
$(this._element).addClass(ClassName.ACTIVE)
$(this._element).addClass(ClassName.SHOW)
if (this._config.focus) {
this._enforceFocus()
@@ -356,7 +356,7 @@ const Modal = (($) => {
Util.reflow(this._backdrop)
}
$(this._backdrop).addClass(ClassName.ACTIVE)
$(this._backdrop).addClass(ClassName.SHOW)
if (!callback) {
return
@@ -372,7 +372,7 @@ const Modal = (($) => {
.emulateTransitionEnd(BACKDROP_TRANSITION_DURATION)
} else if (!this._isShown && this._backdrop) {
$(this._backdrop).removeClass(ClassName.ACTIVE)
$(this._backdrop).removeClass(ClassName.SHOW)
const callbackRemove = () => {
this._removeBackdrop()

6
js/src/popover.js
View File

@@ -37,8 +37,8 @@ const Popover = (($) => {
})
const ClassName = {
FADE : 'fade',
ACTIVE : 'active'
FADE : 'fade',
SHOW : 'show'
}
const Selector = {
@@ -117,7 +117,7 @@ const Popover = (($) => {
this.setElementContent($tip.find(Selector.TITLE), this.getTitle())
this.setElementContent($tip.find(Selector.CONTENT), this._getContent())
$tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
$tip.removeClass(`${ClassName.FADE} ${ClassName.SHOW}`)
this.cleanupTether()
}

28
js/src/tooltip.js
View File

@@ -72,8 +72,8 @@ const Tooltip = (($) => {
}
const HoverState = {
ACTIVE : 'active',
OUT : 'out'
SHOW : 'show',
OUT : 'out'
}
const Event = {
@@ -90,8 +90,8 @@ const Tooltip = (($) => {
}
const ClassName = {
FADE : 'fade',
ACTIVE : 'active'
FADE : 'fade',
SHOW : 'show'
}
const Selector = {
@@ -208,7 +208,7 @@ const Tooltip = (($) => {
} else {
if ($(this.getTipElement()).hasClass(ClassName.ACTIVE)) {
if ($(this.getTipElement()).hasClass(ClassName.SHOW)) {
this._leave(null, this)
return
}
@@ -303,7 +303,7 @@ const Tooltip = (($) => {
Util.reflow(tip)
this._tether.position()
$(tip).addClass(ClassName.ACTIVE)
$(tip).addClass(ClassName.SHOW)
const complete = () => {
const prevHoverState = this._hoverState
@@ -336,7 +336,7 @@ const Tooltip = (($) => {
throw new Error('Tooltip is transitioning')
}
const complete = () => {
if (this._hoverState !== HoverState.ACTIVE && tip.parentNode) {
if (this._hoverState !== HoverState.SHOW && tip.parentNode) {
tip.parentNode.removeChild(tip)
}
@@ -356,7 +356,7 @@ const Tooltip = (($) => {
return
}
$(tip).removeClass(ClassName.ACTIVE)
$(tip).removeClass(ClassName.SHOW)
if (Util.supportsTransitionEnd() &&
$(this.tip).hasClass(ClassName.FADE)) {
@@ -388,7 +388,7 @@ const Tooltip = (($) => {
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle())
$tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
$tip.removeClass(`${ClassName.FADE} ${ClassName.SHOW}`)
this.cleanupTether()
}
@@ -513,15 +513,15 @@ const Tooltip = (($) => {
] = true
}
if ($(context.getTipElement()).hasClass(ClassName.ACTIVE) ||
context._hoverState === HoverState.ACTIVE) {
context._hoverState = HoverState.ACTIVE
if ($(context.getTipElement()).hasClass(ClassName.SHOW) ||
context._hoverState === HoverState.SHOW) {
context._hoverState = HoverState.SHOW
return
}
clearTimeout(context._timeout)
context._hoverState = HoverState.ACTIVE
context._hoverState = HoverState.SHOW
if (!context.config.delay || !context.config.delay.show) {
context.show()
@@ -529,7 +529,7 @@ const Tooltip = (($) => {
}
context._timeout = setTimeout(() => {
if (context._hoverState === HoverState.ACTIVE) {
if (context._hoverState === HoverState.SHOW) {
context.show()
}
}, context.config.delay.show)