@lijuhong1981/jsgif 1.0.5 → 1.0.7

package/index.js

@@ -1,4 +1,5 @@
 import Check from "@lijuhong1981/jscheck";
+import { Destroyable, destroyHTMLElement, destroyObject } from "@lijuhong1981/jsdestroy";
 import { fetchArrayBuffer } from "@lijuhong1981/jsload";
 
 // 转流数组
@@ -17,8 +18,9 @@ function bitsToNum(ba) {
     }, 0);
 };
 
-class Stream {
+class Stream extends Destroyable {
     constructor(data) {
+        super();
         this.data = data;
         this.len = data.length;
         this.pos = 0;
@@ -151,6 +153,7 @@ function GifPlayer(options = {}) {
         LAST_DISPOSA_METHOD = null;
         CURRENT_FRAME_INDEX = -1;
         TRANSPARENCY = null;
+        STREAM && STREAM.destroy();
     };
 
     function readSubBlocks() {
@@ -458,9 +461,13 @@ function GifPlayer(options = {}) {
         CANVAS_CTX.drawImage(TEMP_CANVAS, 0, 0);
     }
 
-    function doCurrentFrame() {
+    function drawCurrentFrame() {
         const frame = FRAME_LIST[currentFrameIndex];
         drawFrame(frame);
+    }
+
+    function doFrame() {
+        drawCurrentFrame();
         if (typeof options.onFrameChanged === 'function') {
             options.onFrameChanged(currentFrameIndex, frame);
         }
@@ -468,7 +475,7 @@ function GifPlayer(options = {}) {
             if (!isPlaying)
                 return;
             currentFrameIndex = getNextFrameIndex();
-            doCurrentFrame();
+            doFrame();
         }, frame.delayTime * options.timeScale * 10);
     }
 
@@ -479,7 +486,7 @@ function GifPlayer(options = {}) {
 
         isPlaying = true;
 
-        doCurrentFrame();
+        doFrame();
 
         return player;
     }
@@ -494,6 +501,7 @@ function GifPlayer(options = {}) {
         isPlaying = false;
 
         currentFrameIndex = 0;
+        drawCurrentFrame();
 
         return player;
     }
@@ -505,8 +513,8 @@ function GifPlayer(options = {}) {
             try {
                 if (data instanceof ArrayBuffer)
                     data = new Uint8Array(data);
-                STREAM = new Stream(data);
                 reset();
+                STREAM = new Stream(data);
                 parseHeader();
                 parseBlock();
                 drawAtlasImage();
@@ -531,48 +539,72 @@ function GifPlayer(options = {}) {
         });
     }
 
+    function destroyGif() {
+        stopGif();
+        destroyHTMLElement(CANVAS);
+        destroyHTMLElement(TEMP_CANVAS);
+        destroyHTMLElement(ATLAS_CANVAS);
+        reset();
+        destroyObject(player);
+    }
+
     Object.defineProperties(player, {
         loadData: {
             value: loadData,
         },
         loadUrl: {
+            configurable: true,
+            writable: true,
             value: loadUrl,
         },
         play: {
+            configurable: true,
+            writable: true,
             value: playGif,
         },
         pause: {
+            configurable: true,
+            writable: true,
             value: pauseGif,
         },
         stop: {
+            configurable: true,
+            writable: true,
             value: stopGif,
         },
         canvas: {
+            configurable: true,
             get: function () {
                 return CANVAS;
             },
         },
         atlasCanvas: {
+            configurable: true,
             get: function () {
                 return ATLAS_CANVAS;
             },
         },
         frameWidth: {
+            configurable: true,
             get: function () {
                 return CANVAS.width;
             }
         },
         frameHeight: {
+            configurable: true,
             get: function () {
                 return CANVAS.height;
             }
         },
         framesNumber: {
+            configurable: true,
             get: function () {
                 return FRAME_LIST.length;
             }
         },
         currentFrameIndex: {
+            configurable: true,
+            writable: true,
             set: function (value) {
                 if (!FRAME_LIST[value])
                     throw new Error('illegal index: ' + value);
@@ -583,11 +615,14 @@ function GifPlayer(options = {}) {
             }
         },
         frameList: {
+            configurable: true,
             get: function () {
                 return FRAME_LIST;
             }
         },
         reverse: {
+            configurable: true,
+            writable: true,
             set: function (value) {
                 Check.typeOf.bool('reverse', value);
                 options.reverse = value;
@@ -597,6 +632,8 @@ function GifPlayer(options = {}) {
             }
         },
         timeScale: {
+            configurable: true,
+            writable: true,
             set: function (value) {
                 Check.typeOf.number.greaterThan('timeScale', value, 0);
                 options.timeScale = value;
@@ -606,6 +643,8 @@ function GifPlayer(options = {}) {
             }
         },
         onFrameChanged: {
+            configurable: true,
+            writable: true,
             set: function (value) {
                 options.onFrameChanged = value;
             },
@@ -613,6 +652,18 @@ function GifPlayer(options = {}) {
                 return options.onFrameChanged;
             }
         },
+        isDestroyed: {
+            configurable: true,
+            writable: true,
+            value: function () {
+                return false;
+            },
+        },
+        destroy: {
+            configurable: true,
+            writable: true,
+            value: destroyGif,
+        },
     });
 
     return player;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsgif",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "> TODO: description",
   "author": "lijuhong1981",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",
@@ -17,5 +17,6 @@
   },
   "bugs": {
     "url": "https://github.com/lijuhong1981/jslibs/issues"
-  }
+  },
+  "gitHead": "41eaaf2e07770b704c80b27f40b0f033e80dfe9e"
 }