Browse Source

pass unique ID to onload; data-name="name" for name input

Artur Paikin 7 years ago
parent
commit
3b7dbc39e3
2 changed files with 13 additions and 11 deletions
  1. 6 5
      src/plugins/Dashboard/FileCard.js
  2. 7 6
      src/plugins/Dashboard/index.js

+ 6 - 5
src/plugins/Dashboard/FileCard.js

@@ -36,7 +36,7 @@ module.exports = function fileCard (props) {
     })
   }
 
-  const fileCardEl = html`<div class="UppyDashboardFileCard" aria-hidden="${!props.fileCardFor}">
+  const fileCardEl = () => html`<div class="UppyDashboardFileCard" aria-hidden="${!props.fileCardFor}">
     <div class="UppyDashboardContent-bar">
       <h2 class="UppyDashboardContent-title">Editing <span class="UppyDashboardContent-titleFile">${file.meta ? file.meta.name : file.name}</span></h2>
       <button class="UppyDashboardContent-back" type="button" title="Finish editing file"
@@ -56,7 +56,7 @@ module.exports = function fileCard (props) {
           <div class="UppyDashboardFileCard-info">
             <fieldset class="UppyDashboardFileCard-fieldset">
               <label class="UppyDashboardFileCard-label">Name</label>
-              <input class="UppyDashboardFileCard-input" name="name" type="text" value="${file.meta.name}"
+              <input class="UppyDashboardFileCard-input" data-name="name" type="text" value="${file.meta.name}"
                      onkeyup=${tempStoreMeta} />
             </fieldset>
             ${renderMetaFields(file)}
@@ -70,10 +70,11 @@ module.exports = function fileCard (props) {
               title="Finish editing file"
               onclick=${() => props.done(meta, file.id)}>${checkIcon()}</button>
     </div>
-    </div>`
+  </div>`
 
-  return onload(html`<div>${fileCardEl}</div>`,
+  return onload(html`<div>${fileCardEl()}</div>`,
     () => document.body.addEventListener('keyup', handleEnterKey),
-    () => document.body.removeEventListener('keyup', handleEnterKey)
+    () => document.body.removeEventListener('keyup', handleEnterKey),
+    `uppy${file.id}`
   )
 }

+ 7 - 6
src/plugins/Dashboard/index.js

@@ -326,21 +326,22 @@ module.exports = class DashboardUI extends Plugin {
     }
 
     const pauseUpload = (fileID) => {
-      this.core.emitter.emit('core:upload-pause', fileID)
+      this.core.emit.emit('core:upload-pause', fileID)
     }
 
     const cancelUpload = (fileID) => {
-      this.core.emitter.emit('core:upload-cancel', fileID)
-      this.core.emitter.emit('core:file-remove', fileID)
+      this.core.emit('core:upload-cancel', fileID)
+      this.core.emit('core:file-remove', fileID)
     }
 
     const showFileCard = (fileID) => {
-      this.core.emitter.emit('dashboard:file-card', fileID)
+      this.core.emit('dashboard:file-card', fileID)
     }
 
     const fileCardDone = (meta, fileID) => {
-      this.core.emitter.emit('core:update-meta', meta, fileID)
-      this.core.emitter.emit('dashboard:file-card')
+      console.log(meta)
+      this.core.emit('core:update-meta', meta, fileID)
+      this.core.emit('dashboard:file-card')
     }
 
     const info = (text, type, duration) => {