Fix missing loading icon in non-bootstrap themes

Close #575

Author: mar10

CHANGELOG.md

@@ -1,5 +1,8 @@
-# 2.15.1-0 / Unreleased
-  *
+# 2.16.2-0 / Unreleased
+  * 
+
+# 2.16.1 / 2016-03-18
+  * [Fixed] #575 missing loading icon in non-bootstrap themes
 
 # 2.16.0 / 2016-03-16
   * [Added] ext-clones: new method node.setRefKey(refKey)

src/jquery.fancytree.glyph.js

@@ -43,6 +43,7 @@ $.ui.fancytree.registerExtension({
 			expanderClosed: "icon-caret-right",
 			expanderLazy: "icon-angle-right",
 			expanderOpen: "icon-caret-down",
+			nodata: "icon-meh",
 			noExpander: "",
 			dragHelper: "icon-caret-right",
 			dropMarker: "icon-caret-right",
@@ -78,9 +79,7 @@ $.ui.fancytree.registerExtension({
 		if( span ){
 			// if( node.isLoading() ){
 				// icon = "loading";
-			if( node.statusNodeType ){
-				icon = node.statusNodeType; // loading, error
-			}else if( node.expanded ){
+			if( node.expanded ){
 				icon = "expanderOpen";
 			}else if( node.isUndefined() ){
 				icon = "expanderLazy";
@@ -106,7 +105,9 @@ $.ui.fancytree.registerExtension({
 		// that might be set by opts.icon callbacks)
 		span = $span.children("span.fancytree-icon").get(0);
 		if( span ){
-			if( node.folder ){
+			if( node.statusNodeType ){
+				icon = _getIcon(opts, node.statusNodeType); // loading, error
+			}else if( node.folder ){
 				icon = node.expanded ? _getIcon(opts, "folderOpen") : _getIcon(opts, "folder");
 			}else{
 				icon = node.expanded ? _getIcon(opts, "docOpen") : _getIcon(opts, "doc");
@@ -122,16 +123,15 @@ $.ui.fancytree.registerExtension({
 
 		res = this._superApply(arguments);
 
-		if(node.parent){
-			span = $("span.fancytree-expander", node.span).get(0);
-		}else{
-			span = $(".fancytree-statusnode-loading, .fancytree-statusnode-error", node[this.nodeContainerAttrName])
-				.find("span.fancytree-expander").get(0);
-		}
-		if( status === "loading" ){
-			span.className = "fancytree-expander " + _getIcon(opts, "loading");
-		}else if( status === "error" ){
-			span.className = "fancytree-expander " + _getIcon(opts, "error");
+		if( status === "error" || status === "loading" || status === "nodata" ){
+			if(node.parent){
+				span = $("span.fancytree-expander", node.span).get(0);
+				span.className = "fancytree-expander " + _getIcon(opts, status);
+			}else{ //
+				span = $(".fancytree-statusnode-" + status, node[this.nodeContainerAttrName])
+					.find("span.fancytree-icon").get(0);
+				span.className = "fancytree-icon " + _getIcon(opts, status);
+			}
 		}
 		return res;
 	}

src/jquery.fancytree.js

@@ -2812,7 +2812,7 @@ $.extend(Fancytree.prototype,
 				if($.isArray(delay)){ // random delay range [min..max]
 					delay = delay[0] + Math.random() * (delay[1] - delay[0]);
 				}
-				node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
+				node.warn("nodeLoadChildren waiting debugDelay " + Math.round(delay) + " ms ...");
 				ajax.debugDelay = false;
 				dfd = $.Deferred(function (dfd) {
 					setTimeout(function () {
@@ -3857,7 +3857,8 @@ $.extend(Fancytree.prototype,
 			if( !node.parent ) {
 				_setStatusNode({
 					title: tree.options.strings.loading + (message ? " (" + message + ")" : ""),
-					icon: false,
+					// icon: true,  // needed for 'loding' icon
+					checkbox: false,
 					tooltip: details
 				}, status);
 			}
@@ -3868,7 +3869,8 @@ $.extend(Fancytree.prototype,
 		case "error":
 			_setStatusNode({
 				title: tree.options.strings.loadError + (message ? " (" + message + ")" : ""),
-				icon: false,
+				// icon: false,
+				checkbox: false,
 				tooltip: details
 			}, status);
 			node._isLoading = false;
@@ -3878,7 +3880,8 @@ $.extend(Fancytree.prototype,
 		case "nodata":
 			_setStatusNode({
 				title: tree.options.strings.noData,
-				icon: false,
+				// icon: false,
+				checkbox: false,
 				tooltip: details
 			}, status);
 			node._isLoading = false;