diff options
| author | Paladox none <thomasmulhall410@yahoo.com> | 2021-07-01 15:55:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-01 15:55:13 +0000 |
| commit | 7d67dc1469794cd0988d1859489014967907fb10 (patch) | |
| tree | dc36c6f905055d4ea907613544b2a1871afff67e | |
| parent | df8b68b6036a0f1f3c6b6e1faf849bc6e7876a78 (diff) | |
| parent | df150be0e7910dab47424b049b2b742c2de11204 (diff) | |
Merge "Fix drag and drop" into stable-3.2
| -rw-r--r-- | polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.js | 5 | ||||
| -rw-r--r-- | polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls_html.js | 18 |
2 files changed, 18 insertions, 5 deletions
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 7ca849fed1..67357c456c 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 @@ class GrEditControls extends mixinBehaviors( [ 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 02639c063c..73487de7fd 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 @@ export const htmlTemplate = html` 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> |