Remove unnecessary utilities

src/core/Utils.js

@@ -22,64 +22,64 @@ function promiseWaterfall (methods) {
   return finalTaskPromise
 }
 
-/**
- * Toggles a class on a DOM element
- * This is how we roll $('.element').toggleClass in a non-jQuery world
- *
- * @memberof Utils
- * @param {String} el selector
- * @param {String} className to toggle
- * @return {String}
- */
-function toggleClass (el, className) {
-  if (el.classList) {
-    el.classList.toggle(className)
-  } else {
-    const classes = el.className.split(' ')
-    const existingIndex = classes.indexOf(className)
+// /**
+//  * Toggles a class on a DOM element
+//  * This is how we roll $('.element').toggleClass in a non-jQuery world
+//  *
+//  * @memberof Utils
+//  * @param {String} el selector
+//  * @param {String} className to toggle
+//  * @return {String}
+//  */
+// function toggleClass (el, className) {
+//   if (el.classList) {
+//     el.classList.toggle(className)
+//   } else {
+//     const classes = el.className.split(' ')
+//     const existingIndex = classes.indexOf(className)
+//
+//     if (existingIndex >= 0) {
+//       classes.splice(existingIndex, 1)
+//     } else {
+//       classes.push(className)
+//       el.className = classes.join(' ')
+//     }
+//   }
+// }
 
-    if (existingIndex >= 0) {
-      classes.splice(existingIndex, 1)
-    } else {
-      classes.push(className)
-      el.className = classes.join(' ')
-    }
-  }
-}
-
-/**
- * Adds a class to a DOM element
- *
- * @memberof Utils
- * @param {Object} el selector
- * @param {String} className to add
- * @return {String}
- */
-function addClass (el, className) {
-  if (el.classList) {
-    el.classList.add(className)
-  } else {
-    el.className += ' ' + className
-  }
-}
+// /**
+//  * Adds a class to a DOM element
+//  *
+//  * @memberof Utils
+//  * @param {Object} el selector
+//  * @param {String} className to add
+//  * @return {String}
+//  */
+// function addClass (el, className) {
+//   if (el.classList) {
+//     el.classList.add(className)
+//   } else {
+//     el.className += ' ' + className
+//   }
+// }
 
-/**
- * Removes a class to a DOM element
- *
- * @memberof Utils
- * @param {String} el selector
- * @param {String} className to remove
- * @return {String}
- */
-function removeClass (el, className) {
-  if (el.classList) {
-    el.classList.remove(className)
-  } else {
-    const patClasses = className.split(' ').join('|')
-    const pattern = new RegExp('(^|\\b)' + patClasses + '(\\b|$)', 'gi')
-    el.className = el.className.replace(pattern, ' ')
-  }
-}
+// /**
+//  * Removes a class to a DOM element
+//  *
+//  * @memberof Utils
+//  * @param {String} el selector
+//  * @param {String} className to remove
+//  * @return {String}
+//  */
+// function removeClass (el, className) {
+//   if (el.classList) {
+//     el.classList.remove(className)
+//   } else {
+//     const patClasses = className.split(' ').join('|')
+//     const pattern = new RegExp('(^|\\b)' + patClasses + '(\\b|$)', 'gi')
+//     el.className = el.className.replace(pattern, ' ')
+//   }
+// }
 
 /**
  * Adds multiple listeners to to a DOM element
@@ -111,9 +111,9 @@ function qsa (selector, context) {
 
 export default {
   promiseWaterfall,
-  toggleClass,
-  addClass,
-  removeClass,
+  // toggleClass,
+  // addClass,
+  // removeClass,
   addListenerMulti,
   flatten,
   qsa

src/plugins/DragDrop.js

@@ -102,10 +102,14 @@ export default class DragDrop extends Plugin {
       this.container.classList.remove('is-dragover')
     })
 
-    document.addEventListener('dragover', (e) => {
+    document.addEventListener('dragover dragenter', (e) => {
       this.container.classList.add('is-drop-ready')
     })
 
+    document.addEventListener('dragleave dragend drop', (e) => {
+      this.container.classList.remove('is-drop-ready')
+    })
+
     const onDrop = new Promise((resolve, reject) => {
       this.dropzone.addEventListener('drop', (e) => {
         resolve(this.handleDrop.bind(null, e))
@@ -176,9 +180,9 @@ export default class DragDrop extends Plugin {
     this.dropzone = document.querySelector(`${this.target} .UppyDragDrop-inner`)
     this.input = document.querySelector(`${this.target} .UppyDragDrop-input`)
 
-    Utils.addClass(this.container, 'UppyDragDrop')
+    this.container.classList.add('UppyDragDrop')
     if (this.isDragDropSupported) {
-      Utils.addClass(this.container, 'is-dragdrop-supported')
+      this.container.classList.add('is-dragdrop-supported')
     }
   }