From 1487c3a9947b0eb55c61b5d93ff9f0c69a812aeb Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Mon, 23 Oct 2017 09:35:27 +0200
Subject: Add `Util.jQuery` which will detect jQuery instead of relying on
 global `$` (#24513)

---
 js/src/util.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/src/util.js')

diff --git a/js/src/util.js b/js/src/util.js
index 16d114b1a..e3e779793 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -154,6 +154,10 @@ const Util = (() => {
           }
         }
       }
+    },
+
+    get jQuery() {
+      return window.jQuery || window.$
     }
   }
 
-- 
cgit v1.2.3


From ca4ad8bee8000617c2ae1a08afe7af1103058776 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 23 Oct 2017 10:45:27 +0300
Subject: Clean up transitionEnd properties. (#24511)

We don't support Opera 12, and Firefox's property was the unprefixed one.
---
 js/src/util.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/src/util.js')

diff --git a/js/src/util.js b/js/src/util.js
index e3e779793..1fa55494e 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -22,8 +22,6 @@ const Util = (() => {
 
   const TransitionEndEvent = {
     WebkitTransition : 'webkitTransitionEnd',
-    MozTransition    : 'transitionend',
-    OTransition      : 'oTransitionEnd otransitionend',
     transition       : 'transitionend'
   }
 
-- 
cgit v1.2.3


From 62fbb23ee61999e362cd8ade6073732a46466077 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 24 Oct 2017 10:12:45 +0200
Subject: Change Rollup config to wrap our dist files with jQuery instead of $

---
 js/src/util.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'js/src/util.js')

diff --git a/js/src/util.js b/js/src/util.js
index 1fa55494e..71f93a7c5 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -7,7 +7,7 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
-const Util = (() => {
+const Util = (($) => {
 
 
   /**
@@ -152,10 +152,6 @@ const Util = (() => {
           }
         }
       }
-    },
-
-    get jQuery() {
-      return window.jQuery || window.$
     }
   }
 
-- 
cgit v1.2.3