zimjs 18.1.0 → 18.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zimjs",
-  "version": "18.1.0",
+  "version": "18.1.2",
   "type": "module",
   "main": "./src/zim.js",
   "types": "./ts-src/typings/zim",

package/src/zim.js

@@ -770,7 +770,7 @@ RETURNS the modified Array
 		if (zot(array)) return;
 		if (!Array.isArray(array)) array = Object.values(arguments);
 		var i = array.length, j, temp;
-		if (i == 0) return array;
+		if (i <= 1) return array;
 		if (different) {
 			var sur = {};
 			var arr = [];
@@ -2094,7 +2094,7 @@ pauseTimeLeft - if paused, get how much time is left once unpaused
 		if (zot(immediate)) immediate = false;
 		if (!zot(total) && (isNaN(total) || total<=0)) return;
 		if (zot(total)) total = -1;
-		var obj = {count:0, total:total, paused:false, time:time, active:true, timeUnit:timeUnit};
+		var obj = {count:(immediate && time <= (timeType=="s"?5/1000:5)) ? -1:0, total:total, paused:false, time:time, active:true, timeUnit:timeUnit};
 
 		if (pauseOnBlur) {
 			if (zot(zim.blurCheck)) zim.setBlurDetect();
@@ -2113,7 +2113,7 @@ pauseTimeLeft - if paused, get how much time is left once unpaused
 				checkTotal();
 			}, obj.interval*(timeType=="s"?1000:1));
 		}
-		if (immediate) {
+		if (immediate && time > (timeType=="s"?5/1000:5)) {
 			setTimeout(function() {
 				(call)(obj);
 				checkTotal();
@@ -24158,7 +24158,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 		if (zot(rtl)) rtl = DS.rtl != null ? DS.rtl : false;		
 		if (zot(lineAlign)) lineAlign = DS.lineAlign != null ? DS.lineAlign : rtl?"right":"left";
 		if (zot(lineValign)) lineValign = DS.lineValign != null ? DS.lineValign : "bottom";
-		if (zot(lineWidth)) lineWidth = DS.lineWidth != null ? DS.lineWidth : "bottom";
+		if (zot(lineWidth)) lineWidth = DS.lineWidth != null ? DS.lineWidth : null;
 		if (zot(lineAlignLast)) lineAlignLast = DS.lineAlignLast != null ? DS.lineAlignLast : rtl?"right":"left";
 		if (zot(cache)) cache = DS.cache != null ? DS.cache : false;
 
@@ -25033,16 +25033,22 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
        
         var originalLabel = !zot(label) && label.type == "Label";
 		if (zot(label)) label = DS.label != null ? DS.label : new zim.Label("Will this wind be so mighty as to lay low the mountains of the Earth?");
-        if (zot(width)) width = DS.width != null ? DS.width : originalLabel ? label.width : 500; 
+		if (zot(size)) size = DS.size != null ? DS.size : originalLabel? label.size : 36;
+		if (zot(spacingH)) spacingH = DS.spacingH != null ? DS.spacingH : size/2;
+        if (zot(spacingV)) spacingV = DS.spacingV != null ? DS.spacingV : size/2;
+		if (originalLabel) {
+			var numWords = label.text.split(" ").length;
+			var paddingT = label.background?label.paddingH*numWords*2:0;
+		}
+        if (zot(width)) width = DS.width != null ? DS.width : originalLabel ? label.width*(paddingT?1.05:1.07)+paddingT : 500; 
         if (zot(itemRegX)) itemRegX = DS.itemRegX != null ? DS.itemRegX : "center";
         if (zot(itemRegY)) itemRegY = DS.itemRegY != null ? DS.itemRegY : "center";
-        if (zot(size)) size = DS.size != null ? DS.size : originalLabel? label.size : 36;
+
         if (zot(font)) font = DS.font != null ? DS.font : originalLabel? label.font : "arial";
         if (zot(color)) color = DS.color != null ? DS.color : originalLabel? label.color : "black";
         if (zot(backgroundColor)) backgroundColor = DS.backgroundColor != null ? DS.backgroundColor : originalLabel? label.backgroundColor : null;
         if (zot(itemCache)) itemCache = DS.itemCache != null ? DS.itemCache : false;
-        if (zot(spacingH)) spacingH = DS.spacingH != null ? DS.spacingH : size/2;
-        if (zot(spacingV)) spacingV = DS.spacingV != null ? DS.spacingV : size/2;
+
 
 		var that = this;		
 
@@ -48552,6 +48558,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 
 			content.cache(x, y, width, height);
 
+
 			if (data) {
 				var image = content.cacheCanvas.toDataURL('image/' + type, quality);
 				if (cached) {
@@ -57403,7 +57410,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 					var val;
 					tar.zimObj = {};
 					for (prop in obj) {
-						if (extraTypes.indexOf(prop) >= 0) val = obj[prop];
+						if (extraTypes.indexOf(prop) >= 0) val = obj[prop];						
 						else val = zim.Pick.choose(obj[prop]);
 						tar.zimObj[prop] = tar[prop];
 
@@ -79944,6 +79951,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 					tile.drag({boundary:tile, singleTouch:true});
 				}, timeType=="s"?(wait+time)*1000:wait+time);
 			}
+			return that;
 		};
 
 		this._enabled = true;
@@ -87874,7 +87882,7 @@ zim.Frame = function(scaling, width, height, color, outerColor, ready, assets, p
 			var duo; if (duo = zob(that.loadAssets, arguments, sig)) return duo;
 		}
 
-		if (!zot(path)) {
+		if (!zot(path)) {s
 			path = path.replace(/\/$/,"");
 			path = path + "/";
 			WW.PATH = path;
@@ -88374,9 +88382,9 @@ zim.Frame = function(scaling, width, height, color, outerColor, ready, assets, p
 		
 		if (WW.PATH!=null) zim.PATH = WW.PATH;
 		if (zim.PATH!=null) {
-			zim.PATH.replace(/\/$/,"");
+			zim.PATH = zim.PATH.replace(/\/$/,"");
 			zim.PATH = zim.PATH + "/";
-		}					
+		}				
 		if (second) {
 			var empty;
 			if (that.loadFailObj == "circles") empty = that.makeCircles(14);
@@ -89477,6 +89485,11 @@ keyOut(color, tolerance, replacement) - remove a certain color in the picture an
 	the default tolerance is .1 - the higher the tolerance the less sensitive the keying process - so more colors will be removed similar to the provided color
 	color and tolerance can be an array of colors and tolerances (or just one tolerance if all are the same)
 	replacement (default clear) a color to replace the keyed out color with or an optional array to match the colors array if an array is used
+destroy() - remove image references and dispose 
+	normal dispose() on a Pic() will just dispose the specific container and cloned bitmap 
+	leaving the original HTML image reference and ZIM Bitmap so that more Pic objects can be made from the loaded image 
+	destroy() will dispose the original ZIM Bitmap and set references to the HTML image to null letting HTML clear the image from memory
+
 Note: there is an outlineImage(pic, reverse) function that can be called to outline a DisplayObject - search docs for outlineImage
 
 ZIM 4TH adds all the methods listed under Container (see above), such as:
@@ -89539,7 +89552,8 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 		if (inner.type == "Bitmap" || inner.type == "Image") {
 			if (inner.type == "Bitmap") that.bitmap = inner.clone().addTo(that);
 			else that.bitmap = inner.getChildAt(0).clone().addTo(that);
-			that.id = inner.id;
+			that.id = that.bitmap.id = file;
+			zogb(that.id)
 			that.image = that.bitmap.image;
 			that.src = that.bitmap.src;
 			that.item = that.bitmap.item;
@@ -89552,7 +89566,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 		} else {
 			inner.on("complete", function () {
 				that.bitmap = inner.getChildAt(0).clone().addTo(that);
-				that.id = inner.id;
+				that.id = that.bitmap.id = file;
 				that.setBounds(null); // resets size
 				that.type = "Pic";
 				if (that.commands) {
@@ -89570,6 +89584,26 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 				if (that.stage) that.stage.update();
 			});    
 		}      
+
+		this.destroy = function() {
+			if (this.id && this.bitmap) {
+				this.image = this.bitmap.image = null;
+				var frame;
+				if (this.stage && this.stage.frame) frame = this.stage.frame;
+				else frame = WW.zdf;
+				if (frame && frame.assets) {					
+					if (frame.assets[this.id]) {
+						if (frame.assets[this.id].dispose) frame.assets[this.id].dispose();
+						delete frame.assets[this.id];
+					}
+				}
+				if (zim.assets[this.id]) {
+					if (zim.assets[this.id].dispose) zim.assets[this.id].dispose();
+					delete zim.assets[this.id];
+				}
+			}	
+			this.dispose();	
+		}
 		
 		that.keyOut = function(color, tolerance, replacement) {			
 			if (that.type=="AC"&&WW.zdf) {WW.zdf.ac("keyOut", arguments, that); return that;}
@@ -90205,7 +90239,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 
 		if (WW.PATH!=null) zim.PATH = WW.PATH;
 		if (zim.PATH!=null) {
-			zim.PATH.replace(/\/$/,"");
+			zim.PATH = zim.PATH.replace(/\/$/,"");
 			zim.PATH = zim.PATH + "/";
 		}	
 
@@ -90445,8 +90479,8 @@ zim.Dat = function(file) {
 	} else {
 		if (WW.PATH!=null) zim.PATH = WW.PATH;
 		if (zim.PATH!=null) {
-			zim.path.replace(/\/$/,"");
-			zim.path = zim.path + "/";
+			zim.PATH = zim.PATH.replace(/\/$/,"");
+			zim.PATH = zim.PATH + "/";
 		}	
 		var loader = zdf.loadAssets(file, zim.PATH);
 		loader.on("complete", function() {
@@ -94018,8 +94052,8 @@ animator - the Gifler animator
 		var f;
 		if (WW.PATH!=null) zim.PATH = WW.PATH;
 		if (zim.PATH!=null) {
-			zim.path.replace(/\/$/,"");
-			zim.path = zim.path + "/";
+			zim.PATH = zim.PATH.replace(/\/$/,"");
+			zim.PATH = zim.PATH + "/";
 		}	
 		if (file.match(/http/) || file.match(/^\//)) f = file;
 		else f = (zim.PATH?zim.PATH:"")+file;

package/ts-src/typings/zim/index.d.ts

@@ -3920,6 +3920,7 @@ declare namespace zim {
 		constructor(config_or_file?: string, width?: number, height?: number, noCors?: boolean, style?: boolean, group?: string, inherit?: {})
 		constructor(config: { file?: string, width?: number, height?: number, noCors?: boolean, style?: boolean, group?: string, inherit?: {} })
 		keyOut(color?: string, tolerance?: number, replacement?: color): this
+		destroy(): void
 		readonly file: string
 		readonly src: string
 		readonly image: HTMLImageElement