@lijuhong1981/jsgif 1.0.10 → 1.1.0

package/index.js

@@ -1,5 +1,6 @@
 import Check from "@lijuhong1981/jscheck";
-import { Destroyable, destroyHTMLElement, destroyObject } from "@lijuhong1981/jsdestroy";
+import { defineDestroyProperties, Destroyable, destroyHTMLElement, destroyObject } from "@lijuhong1981/jsdestroy";
+import { EventRaiser } from "@lijuhong1981/events";
 import { fetchArrayBuffer } from "@lijuhong1981/jsload";
 
 // 转流数组
@@ -145,6 +146,7 @@ function GifPlayer(options = {}) {
     let TRANSPARENCY = null;
     let isPlaying = false;
     let currentFrameIndex = 0;
+    const frameChanged = new EventRaiser();
     const player = {};
 
     function reset() {
@@ -464,9 +466,7 @@ function GifPlayer(options = {}) {
     function drawCurrentFrame() {
         const frame = FRAME_LIST[currentFrameIndex];
         drawFrame(frame);
-        if (typeof options.onFrameChanged === 'function') {
-            options.onFrameChanged(currentFrameIndex, frame);
-        }
+        frameChanged.raiseEvent(currentFrameIndex, frame);
         return frame;
     }
 
@@ -507,7 +507,7 @@ function GifPlayer(options = {}) {
         return player;
     }
 
-    function loadData(data) {
+    function loadData(data, onLoad, onError) {
         Check.defined('data', data);
 
         return new Promise(function (resolve, reject) {
@@ -522,25 +522,37 @@ function GifPlayer(options = {}) {
                 stopGif();
                 if (options.autoPlay)
                     playGif();
+                if (typeof onLoad === 'function')
+                    onLoad(player);
                 resolve(player);
             } catch (error) {
+                if (typeof onError === 'function')
+                    onError(error);
                 reject(error);
             }
         });
     }
 
     // 用xhr请求本地文件
-    function loadUrl(url, requestOptions) {
+    function loadUrl(url, requestOptions, onLoad, onError) {
         Check.typeOf.string('url', url);
 
         return new Promise(function (resolve, reject) {
+
+            function rejectError() {
+                if (typeof onError === 'function')
+                    onError(error);
+                reject(error);
+            }
+
             fetchArrayBuffer(url, requestOptions).then(function (arraybuffer) {
-                loadData(arraybuffer).then(resolve).catch(reject);
-            }).catch(reject);
+                loadData(arraybuffer, onLoad, onError).then(resolve).catch(rejectError);
+            }).catch(rejectError);
         });
     }
 
     function destroyGif() {
+        frameChanged.clear();
         stopGif();
         destroyHTMLElement(CANVAS);
         destroyHTMLElement(TEMP_CANVAS);
@@ -623,22 +635,14 @@ function GifPlayer(options = {}) {
                 return options.timeScale;
             }
         },
-        onFrameChanged: {
-            set: function (value) {
-                options.onFrameChanged = value;
-            },
+        frameChanged: {
             get: function () {
-                return options.onFrameChanged;
+                return frameChanged;
             }
-        },
-        destroy: {
-            value: destroyGif,
-        },
+        }
     });
 
-    player.isDestroyed = function () {
-        return false;
-    };
+    defineDestroyProperties(player, destroyGif);
 
     return player;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsgif",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "description": "> TODO: description",
   "author": "lijuhong1981",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",