浏览代码

Fixed drag and drop failure when message dragged from email client (#20451)

When dragging message form email client on Windows, item.webkitGetAsEntry()
might return null creating NPE on the client side. Added additional checks
for this situation.

Change-Id: I569f7e6d0d7b137f24be53d1fbce384695ae8c73
tags/7.7.5
adam 7 年前
父节点
当前提交
9d49d3f780
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java

+ 5
- 2
client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java 查看文件

@@ -90,8 +90,11 @@ public class VHtml5DragEvent extends NativeEvent {
// Chrome >= v21 and Opera >= v?
if (this.dataTransfer.items) {
var item = this.dataTransfer.items[fileIndex];
if (item.webkitGetAsEntry) {
return item.webkitGetAsEntry().isFile;
if (typeof item.webkitGetAsEntry == "function") {
var entry = item.webkitGetAsEntry();
if (typeof entry !== "undefined" && entry !== null) {
return entry.isFile;
}
}
}


正在加载...
取消
保存