fixed issue: confirm & alert will not stopped in chrome.

zengshijun · Sep 19, 2016 · 17bd8d3 · 17bd8d3
1 parent 72d75de
commit 17bd8d3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/demo/cn/exedit/async_edit.html b/demo/cn/exedit/async_edit.html
@@ -52,7 +52,11 @@
 		}		
 		function beforeRename(treeId, treeNode, newName) {
 			if (newName.length == 0) {
-				alert("节点名称不能为空.");
+				setTimeout(function() {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.cancelEditName();
+					alert("节点名称不能为空.");
+				}, 0);
 				return false;
 			}
 			return true;

diff --git a/demo/cn/exedit/edit_super.html b/demo/cn/exedit/edit_super.html
@@ -61,7 +61,14 @@
 			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
 			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
 			zTree.selectNode(treeNode);
-			return confirm("进入节点 -- " + treeNode.name + " 的编辑状态吗？");
+			setTimeout(function() {
+				if (confirm("进入节点 -- " + treeNode.name + " 的编辑状态吗？")) {
+					setTimeout(function() {
+						zTree.editName(treeNode);
+					}, 0);
+				}
+			}, 0);
+			return false;
 		}
 		function beforeRemove(treeId, treeNode) {
 			className = (className === "dark" ? "":"dark");
@@ -77,9 +84,11 @@
 			className = (className === "dark" ? "":"dark");
 			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
 			if (newName.length == 0) {
-				alert("节点名称不能为空.");
-				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				setTimeout(function() {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.cancelEditName();
+					alert("节点名称不能为空.");
+				}, 0);
 				return false;
 			}
 			return true;

diff --git a/demo/en/exedit/async_edit.html b/demo/en/exedit/async_edit.html
@@ -52,7 +52,11 @@
 		}		
 		function beforeRename(treeId, treeNode, newName) {
 			if (newName.length == 0) {
-				alert("Node name can not be empty.");
+				setTimeout(function() {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.cancelEditName();
+					alert("Node name can not be empty.");
+				}, 0);
 				return false;
 			}
 			return true;

diff --git a/demo/en/exedit/edit_super.html b/demo/en/exedit/edit_super.html
@@ -61,7 +61,14 @@
 			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
 			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
 			zTree.selectNode(treeNode);
-			return confirm("Start node '" + treeNode.name + "' editorial status?");
+			setTimeout(function() {
+				if (confirm("Start node '" + treeNode.name + "' editorial status?")) {
+					setTimeout(function() {
+						zTree.editName(treeNode);
+					}, 0);
+				}
+			}, 0);
+			return false;
 		}
 		function beforeRemove(treeId, treeNode) {
 			className = (className === "dark" ? "":"dark");
@@ -77,9 +84,11 @@
 			className = (className === "dark" ? "":"dark");
 			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
 			if (newName.length == 0) {
-				alert("Node name can not be empty.");
-				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				setTimeout(function() {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.cancelEditName();
+					alert("Node name can not be empty.");
+				}, 0);
 				return false;
 			}
 			return true;