Merge "Fix drag and drop" into stable-3.2
diff --git a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.js b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.js
index 7ca849f..67357c4 100644
--- a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.js
+++ b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.js
@@ -302,6 +302,11 @@
fr.readAsDataURL(file);
}
}
+
+ _handleKeyPress(event) {
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ }
}
customElements.define(GrEditControls.is, GrEditControls);
diff --git a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_html.js b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_html.js
index 02639c0..73487de 100644
--- a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_html.js
+++ b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_html.js
@@ -95,21 +95,29 @@
query="[[_query]]"
text="{{_path}}"
></gr-autocomplete>
- <div id="dragDropArea" on-drop="_handleDragAndDropUpload">
- <p>Drag and drop a file here</p>
- <p>or</p>
- <p>
+ <div
+ id="dragDropArea"
+ contenteditable="true"
+ on-drop="_handleDragAndDropUpload"
+ on-keypress="_handleKeyPress"
+ >
+ <p contenteditable="false">Drag and drop a file here</p>
+ <p contenteditable="false">or</p>
+ <p contenteditable="false">
<iron-input>
<input
is="iron-input"
id="fileUploadInput"
type="file"
on-change="_handleFileUploadChanged"
+ multiple
hidden
/>
</iron-input>
<label for="fileUploadInput">
- <gr-button id="fileUploadBrowse">Browse</gr-button>
+ <gr-button id="fileUploadBrowse" contenteditable="false"
+ >Browse</gr-button
+ >
</label>
</p>
</div>
