Merge branch 'v4-dev' into v4-navbars

1 files changed, 5 insertions, 2 deletions

diff --git a/js/src/util.js b/js/src/util.js
index dba6e9bd6..86d9fe1f4 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -16,6 +16,8 @@ const Util = (($) => {
 
   let transition = false
 
+  const MAX_UID = 1000000
+
   const TransitionEndEvent = {
     WebkitTransition : 'webkitTransitionEnd',
     MozTransition    : 'transitionend',
@@ -38,8 +40,9 @@ const Util = (($) => {
       delegateType: transition.end,
       handle(event) {
         if ($(event.target).is(this)) {
-          return event.handleObj.handler.apply(this, arguments)
+          return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params
         }
+        return undefined
       }
     }
   }
@@ -100,7 +103,7 @@ const Util = (($) => {
     getUID(prefix) {
       do {
         /* eslint-disable no-bitwise */
-        prefix += ~~(Math.random() * 1000000) // "~~" acts like a faster Math.floor() here
+        prefix += ~~(Math.random() * MAX_UID) // "~~" acts like a faster Math.floor() here
         /* eslint-enable no-bitwise */
       } while (document.getElementById(prefix))
       return prefix