瀏覽代碼

Events in DragDrop & minor changes

Artur Paikin 9 年之前
父節點
當前提交
ebc17c4426
共有 4 個文件被更改,包括 10 次插入4 次删除
  1. 6 1
      src/plugins/DragDrop.js
  2. 1 0
      src/plugins/Modal.js
  3. 2 2
      src/plugins/Plugin.js
  4. 1 1
      src/scss/_dragdrop.scss

+ 6 - 1
src/plugins/DragDrop.js

@@ -129,12 +129,17 @@ export default class DragDrop extends Plugin {
       this.handleInputChange()
     }
 
+    const onSubmit = (ev) => {
+      ev.preventDefault()
+    }
+
     return yo`
       <div class="UppyDragDrop-container ${this.isDragDropSupported ? 'is-dragdrop-supported' : ''}">
         <form class="UppyDragDrop-inner"
               ondragover=${onDragOver}
               ondragleave=${onDragLeave}
-              ondrop=${onDrop}>
+              ondrop=${onDrop}
+              onsubmit=${onSubmit}>
           <input class="UppyDragDrop-input"
                  type="file"
                  name="files[]"

+ 1 - 0
src/plugins/Modal.js

@@ -86,6 +86,7 @@ export default class Modal extends Plugin {
     const modal = this.core.getState().modal
     modal.isHidden = true
     this.core.setState({modal: modal})
+    // this.core.resetState()
 
     document.body.classList.remove('is-UppyModal-open')
   }

+ 2 - 2
src/plugins/Plugin.js

@@ -26,11 +26,11 @@ export default class Plugin {
    */
   getTarget (target, callerPlugin, el) {
     if (typeof target === 'string') {
-      // this.core.log('string is a target')
+      this.core.log('string is a target')
       document.querySelector(target).appendChild(el)
       return target
     } else {
-      // this.core.log('plugin is a target')
+      this.core.log('plugin is a target')
       let targetPlugin = this.core.getPlugin(target.name)
       let selectorTarget = targetPlugin.addTarget(callerPlugin, el)
 

+ 1 - 1
src/scss/_dragdrop.scss

@@ -12,7 +12,7 @@
 }
 
   .UppyDragDrop-container.is-dragdrop-supported {
-    border: 2px dashed;
+    border: 4px dashed;
     border-color: #dadada;
   }