Merge pull request #4 from clivezhg/cli_work

clivezhg · web-flow · commit 4cb3b88dcc3d · 2017-03-18T09:09:08.000+08:00
Version 1.0.0 (a bit optimization)
diff --git a/src/select2totree.js b/src/select2totree.js
@@ -20,7 +20,7 @@
 					container.setAttribute("data-pup", ele.getAttribute("data-pup"));
 				}
 				if ($(container).hasClass("non-leaf")) {
-					return $('<span class="expand-collapse" onmouseup="expColMouseupHandler(event);"></span>' + $("<div></div").append($iteme).html());
+					return $.merge($('<span class="expand-collapse" onmouseup="expColMouseupHandler(event);"></span>'), $iteme);
 				}
 			}
 			return $iteme;
@@ -103,7 +103,7 @@
 			if (pup) {
 				var pupEle = $options.find(".select2-results__option[data-val='" + pup + "']");
 				if (pupEle.length > 0) {
-					if (!pupEle.eq(0).hasClass("opened")) {
+					if (!pupEle.eq(0).hasClass("opened")) { // hide current node if any parent node is collapsed
 						$(ele).removeClass("showme");
 						shouldShow = false;
 						break;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`container.setAttribute("data-pup", ele.getAttribute("data-pup"));`
`21`	`21`	`}`
`22`	`22`	`if ($(container).hasClass("non-leaf")) {`
`23`		`- return $('<span class="expand-collapse" onmouseup="expColMouseupHandler(event);"></span>' + $("<div></div").append($iteme).html());`
	`23`	`+ return $.merge($('<span class="expand-collapse" onmouseup="expColMouseupHandler(event);"></span>'), $iteme);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`return $iteme;`
`@@ -103,7 +103,7 @@`
`103`	`103`	`if (pup) {`
`104`	`104`	`var pupEle = $options.find(".select2-results__option[data-val='" + pup + "']");`
`105`	`105`	`if (pupEle.length > 0) {`
`106`		`- if (!pupEle.eq(0).hasClass("opened")) {`
	`106`	`+ if (!pupEle.eq(0).hasClass("opened")) { // hide current node if any parent node is collapsed`
`107`	`107`	`$(ele).removeClass("showme");`
`108`	`108`	`shouldShow = false;`
`109`	`109`	`break;`