Support async loading with providing Promises or thenable functions

Other:

  - Support `setting.async.loadingIcon` for controlling to show or hide loading icons.
  - Remove `setting.async.{autoParam, otherParam, contentType, type, url, dataType, headers, xhrFields}`

Author: aleen42

js/jquery.ztree.core.js

@@ -1045,7 +1045,6 @@
         nObj.append(html.join(''));
       },
       asyncNode: function (setting, node, isSilent, callback) {
-        var i, l;
         var isParent = data.nodeIsParent(setting, node);
         if (node && !isParent) {
           tools.apply(callback);
@@ -1058,80 +1057,38 @@
         }
         if (node) {
           node.isAjaxing = true;
-          var icoObj = $$(node, consts.id.ICON, setting);
-          icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
-        }
-
-        var tmpParam = {};
-        var autoParam = tools.apply(setting.async.autoParam, [setting.treeId, node], setting.async.autoParam);
-        for (i = 0, l = autoParam.length; node && i < l; i++) {
-          var pKey = autoParam[i].split("="), spKey = pKey;
-          if (pKey.length > 1) {
-            spKey = pKey[1];
-            pKey = pKey[0];
-          }
-          tmpParam[spKey] = node[pKey];
-        }
-        var otherParam = tools.apply(setting.async.otherParam, [setting.treeId, node], setting.async.otherParam);
-        if (tools.isArray(otherParam)) {
-          for (i = 0, l = otherParam.length; i < l; i += 2) {
-            tmpParam[otherParam[i]] = otherParam[i + 1];
-          }
-        } else {
-          for (var p in otherParam) {
-            tmpParam[p] = otherParam[p];
+          if (setting.async.loadingIcon) {
+            var icoObj = $$(node, consts.id.ICON, setting);
+            icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
           }
         }
 
         var _tmpV = data.getRoot(setting)._ver;
-        $.ajax({
-          contentType: setting.async.contentType,
-          cache: false,
-          type: setting.async.type,
-          url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
-          data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
-          dataType: setting.async.dataType,
-          headers: setting.async.headers,
-          xhrFields: setting.async.xhrFields,
-          success: function (msg) {
-            if (_tmpV != data.getRoot(setting)._ver) {
-              return;
-            }
-            var newNodes = [];
-            try {
-              if (!msg || msg.length == 0) {
-                newNodes = [];
-              } else if (typeof msg == "string") {
-                newNodes = eval("(" + msg + ")");
-              } else {
-                newNodes = msg;
-              }
-            } catch (err) {
-              newNodes = msg;
-            }
+        setting.async.load(setting.treeId, node).then(function (newNodes) {
+          if (_tmpV != data.getRoot(setting)._ver) {
+            return;
+          }
 
-            if (node) {
-              node.isAjaxing = null;
-              node.zAsync = true;
-            }
-            view.setNodeLineIcos(setting, node);
-            if (newNodes && newNodes !== "") {
-              newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
-              view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
-            } else {
-              view.addNodes(setting, node, -1, [], !!isSilent);
-            }
-            setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
-            tools.apply(callback);
-          },
-          error: function (XMLHttpRequest, textStatus, errorThrown) {
-            if (_tmpV != data.getRoot(setting)._ver) {
-              return;
-            }
-            if (node) node.isAjaxing = null;
-            view.setNodeLineIcos(setting, node);
-            setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+          if (node) {
+            node.isAjaxing = null;
+            node.zAsync = true;
+          }
+          view.setNodeLineIcos(setting, node);
+          if (newNodes && newNodes !== "") {
+            newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+            view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+          } else {
+            view.addNodes(setting, node, -1, [], !!isSilent);
+          }
+          setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, newNodes]);
+          tools.apply(callback);
+        }, function (errorThrown) {
+          if (_tmpV != data.getRoot(setting)._ver) {
+            return;
           }
+          if (node) node.isAjaxing = null;
+          view.setNodeLineIcos(setting, node);
+          setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
         });
         return true;
       },
@@ -1342,7 +1299,7 @@
           fontStyle.push(f, ":", fontcss[f], ";");
         }
         html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,
-          nodeClasses.add ? ' ' + nodeClasses.add.join(' ') : '', 
+          nodeClasses.add ? ' ' + nodeClasses.add.join(' ') : '',
           "' treeNode", consts.id.A,
           node.click ? " onclick=\"" + node.click + "\"" : "",
           ((url != null && url.length > 0) ? " href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
@@ -2006,7 +1963,7 @@
       var children = data.nodeChildren(setting, root);
       if (children && children.length > 0) {
         view.createNodes(setting, 0, children, null, -1);
-      } else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+      } else if (setting.async.enable && setting.async.load && setting.async.load.then) {
         view.asyncNode(setting);
       }
       return zTreeTools;
@@ -2016,4 +1973,4 @@
   var zt = $.fn.zTree,
     $$ = tools.$,
     consts = zt.consts;
-})(jQuery);
+})(jQuery);