diff options
| author | Mark Otto <[email protected]> | 2015-08-18 20:25:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-18 20:25:48 -0700 |
| commit | 1c19ded8c14cc9caca8ca2992834e2900dbbb4e5 (patch) | |
| tree | aecfad1ba54e89b6db1f72f20c991784768399e5 /js/src/button.js | |
| parent | 0df8fae72508fd9291ccce1fb915e7eac4f83a95 (diff) | |
| parent | 8cfde5ef29756a433645c61b2ba8fec63caada78 (diff) | |
| download | bootstrap-1c19ded8c14cc9caca8ca2992834e2900dbbb4e5.tar.xz bootstrap-1c19ded8c14cc9caca8ca2992834e2900dbbb4e5.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'js/src/button.js')
| -rw-r--r-- | js/src/button.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/src/button.js b/js/src/button.js index 8210e8ae0..58ef66b8b 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -20,7 +20,6 @@ const Button = (($) => { const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] - const TRANSITION_DURATION = 150 const ClassName = { ACTIVE : 'active', @@ -67,7 +66,7 @@ const Button = (($) => { toggle() { let triggerChangeEvent = true - let rootElement = $(this._element).closest( + let rootElement = $(this._element).closest( Selector.DATA_TOGGLE )[0] @@ -137,7 +136,7 @@ const Button = (($) => { */ $(document) - .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { + .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => { event.preventDefault() let button = event.target @@ -148,8 +147,8 @@ const Button = (($) => { Button._jQueryInterface.call($(button), 'toggle') }) - .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { - var button = $(event.target).closest(Selector.BUTTON)[0] + .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => { + let button = $(event.target).closest(Selector.BUTTON)[0] $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)) }) |
