@lijuhong1981/jsgif 1.0.9 → 1.0.11

package/index.js

@@ -467,10 +467,11 @@ function GifPlayer(options = {}) {
         if (typeof options.onFrameChanged === 'function') {
             options.onFrameChanged(currentFrameIndex, frame);
         }
+        return frame;
     }
 
     function doFrame() {
-        drawCurrentFrame();
+        const frame = drawCurrentFrame();
         setTimeout(function () {
             if (!isPlaying)
                 return;
@@ -506,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) {
@@ -521,21 +522,32 @@ 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);
         });
     }
 

package/package.json

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