From 85af12953f3391d78fea0c4614c9eabde3252d38 Mon Sep 17 00:00:00 2001 From: Mr_Green Date: Thu, 7 Dec 2017 15:00:52 +0530 Subject: [PATCH 1/4] Changes related to #24958 --- js/src/util.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/src/util.js b/js/src/util.js index ef2cc3c57f4d..37a4f66305e1 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -21,7 +21,6 @@ const Util = (($) => { const MAX_UID = 1000000 const TransitionEndEvent = { - WebkitTransition : 'webkitTransitionEnd', transition : 'transitionend' } From 4026ee73e076619014aa866187db111a8ca379a3 Mon Sep 17 00:00:00 2001 From: "venkateshwar@divami.com" Date: Thu, 7 Dec 2017 15:18:17 +0530 Subject: [PATCH 2/4] Remove TransitionEndEvent const --- js/src/util.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/js/src/util.js b/js/src/util.js index 37a4f66305e1..a048a17b166f 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -20,10 +20,6 @@ const Util = (($) => { const MAX_UID = 1000000 - const TransitionEndEvent = { - transition : 'transitionend' - } - // shoutout AngusCroll (https://goo.gl/pxwQGp) function toType(obj) { return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase() @@ -49,11 +45,9 @@ const Util = (($) => { const el = document.createElement('bootstrap') - for (const name in TransitionEndEvent) { - if (typeof el.style[name] !== 'undefined') { - return { - end: TransitionEndEvent[name] - } + if (typeof el.style[name] !== 'undefined') { + return { + end: 'transitionend' } } From 50617c5dfc0741e3ccb4f3f91503d886a7711205 Mon Sep 17 00:00:00 2001 From: "venkateshwar@divami.com" Date: Thu, 7 Dec 2017 15:50:58 +0530 Subject: [PATCH 3/4] transitionEnd related clean --- js/src/util.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/js/src/util.js b/js/src/util.js index a048a17b166f..35613ff9285e 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -42,16 +42,10 @@ const Util = (($) => { if (window.QUnit) { return false } - - const el = document.createElement('bootstrap') - - if (typeof el.style[name] !== 'undefined') { - return { - end: 'transitionend' - } + + return { + end: 'transitionend' } - - return false } function transitionEndEmulator(duration) { From 51b01801e559c7a525bdbf3712aa5f1ff087919c Mon Sep 17 00:00:00 2001 From: Mr_Green Date: Thu, 7 Dec 2017 16:00:42 +0530 Subject: [PATCH 4/4] Trailing space removal. --- js/src/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/util.js b/js/src/util.js index 35613ff9285e..c2f7ad45382a 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -42,7 +42,7 @@ const Util = (($) => { if (window.QUnit) { return false } - + return { end: 'transitionend' }