@whitesev/domutils 1.7.1 → 1.7.3

package/dist/index.amd.js

@@ -523,7 +523,7 @@ define((function () { 'use strict';
         },
     };
 
-    const version = "1.7.1";
+    const version = "1.7.3";
 
     /* 数据 */
     const GlobalData = {
@@ -1804,7 +1804,7 @@ define((function () { 'use strict';
                  * 取消绑定的监听事件
                  * @param filter (可选)过滤函数，对元素属性上的事件进行过滤出想要删除的事件
                  */
-                off(filter) {
+                off: (filter) => {
                     that.off($elList, eventTypeList, selectorList, listenerCallBack, listenerOption, filter);
                 },
                 /**
@@ -1812,7 +1812,7 @@ define((function () { 'use strict';
                  * @param details 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
                  * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了selectorTarget的没有值
                  */
-                trigger(details, useDispatchToTriggerEvent) {
+                trigger: (details, useDispatchToTriggerEvent) => {
                     that.trigger($elList, eventTypeList, details, useDispatchToTriggerEvent);
                 },
             };
@@ -1992,18 +1992,10 @@ define((function () { 'use strict';
                 });
             });
         }
-        /**
-         * 等待文档加载完成后执行指定的函数
-         * @param callback 需要执行的函数
-         * @example
-         * DOMUtils.ready(function(){
-         *   console.log("文档加载完毕")
-         * })
-         */
-        ready(callback) {
-            if (typeof callback !== "function") {
-                return;
-            }
+        ready(...args) {
+            const callback = args[0];
+            // 异步回调
+            let resolve = void 0;
             const that = this;
             /**
              * 检测文档是否加载完毕
@@ -2028,9 +2020,17 @@ define((function () { 'use strict';
              */
             function completed() {
                 removeDomReadyListener();
-                callback();
+                if (typeof callback === "function") {
+                    callback();
+                }
+                if (typeof resolve === "function") {
+                    resolve();
+                }
             }
-            const targetList = [
+            /**
+             * 监听目标
+             */
+            const listenTargetList = [
                 {
                     target: that.windowApi.document,
                     eventType: "DOMContentLoaded",
@@ -2046,27 +2046,39 @@ define((function () { 'use strict';
              * 添加监听
              */
             function addDomReadyListener() {
-                for (let index = 0; index < targetList.length; index++) {
-                    const item = targetList[index];
-                    item.target.addEventListener(item.eventType, item.callback);
+                for (const item of listenTargetList) {
+                    that.on(item.target, item.eventType, item.callback);
                 }
             }
             /**
              * 移除监听
              */
             function removeDomReadyListener() {
-                for (let index = 0; index < targetList.length; index++) {
-                    const item = targetList[index];
-                    item.target.removeEventListener(item.eventType, item.callback);
+                for (const item of listenTargetList) {
+                    that.off(item.target, item.eventType, item.callback);
                 }
             }
-            if (checkDOMReadyState()) {
-                /* 检查document状态 */
-                CommonUtils.setTimeout(callback, 0);
+            /**
+             * 执行检查
+             */
+            function check() {
+                if (checkDOMReadyState()) {
+                    /* 检查document状态 */
+                    CommonUtils.setTimeout(completed, 0);
+                }
+                else {
+                    /* 添加监听 */
+                    addDomReadyListener();
+                }
+            }
+            if (args.length === 0) {
+                return new Promise((__resolve__) => {
+                    resolve = __resolve__;
+                    check();
+                });
             }
             else {
-                /* 添加监听 */
-                addDomReadyListener();
+                check();
             }
         }
         /**