oipage 1.2.1 → 1.3.0-alpha.0

package/web/throttle/index.d.ts

@@ -1,31 +1,31 @@
-export type throttleOpportunityType = "begin" | "end" | "wide"
-
-export interface throttleOptionType {
-
-    /**
-     * 节流时长
-     */
-    time?: number
-
-    /**
-     * 是否持续节流
-     */
-    keep?: boolean
-
-    /**
-     * 执行时机
-     *
-     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
-     */
-    opportunity?: throttleOpportunityType
-
-}
-
-/**
- * 节流函数
- */
-export interface throttleType {
-    (callback: Function, option?: throttleOptionType): Function
-}
-
+export type throttleOpportunityType = "begin" | "end" | "wide"
+
+export interface throttleOptionType {
+
+    /**
+     * 节流时长
+     */
+    time?: number
+
+    /**
+     * 是否持续节流
+     */
+    keep?: boolean
+
+    /**
+     * 执行时机
+     *
+     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
+     */
+    opportunity?: throttleOpportunityType
+
+}
+
+/**
+ * 节流函数
+ */
+export interface throttleType {
+    (callback: Function, option?: throttleOptionType): Function
+}
+
 export let throttle: throttleType

package/web/throttle/index.js

@@ -1,55 +1,55 @@
 /*!
-* throttle of OIPage v1.2.1
+* throttle of OIPage v1.3.0-alpha.0
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-export function throttle(callback, _option) {
-
-    // 缺省值
-    var option = {
-        time: 200,
-        keep: false,
-        opportunity: "end"
-    };
-    
-    // 校对
-    if (_option) {
-        for (var key in _option) {
-            option[key] = _option[key];
-        }
-    }
-
-    var hadInterval = false, hadClick = false, oneClick = false, arg;
-    return function () {
-        const _this = this;
-        arg = arguments;
-
-        // 如果前置任务都完成了
-        if (!hadInterval) {
-            if (option.opportunity != 'end') {
-                callback.apply(_this, arg);
-            }
-            hadInterval = true;
-
-            var interval = setInterval(() => {
-                if (hadClick) {
-                    if (!option.keep) {
-                        callback.apply(_this, arg);
-                    }
-                } else {
-                    if (option.opportunity != 'begin') {
-                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
-                    }
-                    hadInterval = false;
-                    oneClick = false;
-                    clearInterval(interval);
-                }
-                hadClick = false;
-            }, option.time);
-        } else {
-            hadClick = true;
-            oneClick = true;
-        }
-
-    };
+export function throttle(callback, _option) {
+
+    // 缺省值
+    var option = {
+        time: 200,
+        keep: false,
+        opportunity: "end"
+    };
+    
+    // 校对
+    if (_option) {
+        for (var key in _option) {
+            option[key] = _option[key];
+        }
+    }
+
+    var hadInterval = false, hadClick = false, oneClick = false, arg;
+    return function () {
+        const _this = this;
+        arg = arguments;
+
+        // 如果前置任务都完成了
+        if (!hadInterval) {
+            if (option.opportunity != 'end') {
+                callback.apply(_this, arg);
+            }
+            hadInterval = true;
+
+            var interval = setInterval(() => {
+                if (hadClick) {
+                    if (!option.keep) {
+                        callback.apply(_this, arg);
+                    }
+                } else {
+                    if (option.opportunity != 'begin') {
+                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
+                    }
+                    hadInterval = false;
+                    oneClick = false;
+                    clearInterval(interval);
+                }
+                hadClick = false;
+            }, option.time);
+        } else {
+            hadClick = true;
+            oneClick = true;
+        }
+
+    };
 }