From 4ad103f228fae209186d33fa0688d949584b2e1b Mon Sep 17 00:00:00 2001 From: Roman Pinyazhin Date: Sat, 9 Jun 2018 16:55:42 +0400 Subject: [PATCH] Empty description and cursor will appear on the Upload button in the UploadMany dialog #484 --- .../client/jqueryfileupload/CubaFileUploadWidget.java | 5 ++++- .../web/themes/halo/components/fileupload/fileupload.scss | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/web-toolkit/src/com/haulmont/cuba/web/widgets/client/jqueryfileupload/CubaFileUploadWidget.java b/modules/web-toolkit/src/com/haulmont/cuba/web/widgets/client/jqueryfileupload/CubaFileUploadWidget.java index 990847c48f..2c05f66511 100644 --- a/modules/web-toolkit/src/com/haulmont/cuba/web/widgets/client/jqueryfileupload/CubaFileUploadWidget.java +++ b/modules/web-toolkit/src/com/haulmont/cuba/web/widgets/client/jqueryfileupload/CubaFileUploadWidget.java @@ -28,6 +28,7 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Focusable; import com.google.gwt.user.client.ui.HasEnabled; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.BrowserInfo; import com.vaadin.client.StyleConstants; import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.VButton; @@ -76,7 +77,9 @@ public class CubaFileUploadWidget extends FlowPanel implements Focusable, HasEna Element inputElement = Document.get().createFileInputElement(); inputElement.setAttribute("name", "files[]"); - inputElement.setAttribute("title", " "); + if (!BrowserInfo.get().isIE() && !BrowserInfo.get().isEdge()) { + inputElement.setAttribute("title", " "); + } listenToFocusEvents(inputElement); getElement().appendChild(inputElement); diff --git a/modules/web/themes/halo/components/fileupload/fileupload.scss b/modules/web/themes/halo/components/fileupload/fileupload.scss index 1ed6629d2a..0832547a84 100644 --- a/modules/web/themes/halo/components/fileupload/fileupload.scss +++ b/modules/web/themes/halo/components/fileupload/fileupload.scss @@ -64,6 +64,11 @@ height: 100%; @include box-defaults; + + // hide caret of input + .v-ie & { + -ms-user-select: none; + } } .#{$primary-stylename}.v-disabled input {