zimjs 18.2.2 → 18.2.4

package/package.json

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

package/src/zim.js

@@ -1743,7 +1743,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 							r = call(obj.item(i), i, total, start, end, obj, io);
 						}					
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -1780,7 +1780,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 							r = call(obj.item(i), i, total, start, end, obj, io);
 						}
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -1814,7 +1814,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						
 						r = call(props[i], obj[props[i]], i, total, start, end, obj, io);
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -1835,7 +1835,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						
 						r = call(props[i], obj[props[i]], i, total, start, end, obj, io);
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -2148,8 +2148,8 @@ pauseTimeLeft - if paused, get how much time is left once unpaused
 			obj.paused = state;
 		};
 		obj.next = function() {
-			obj.count++;
-			(call)(obj);
+			obj.count++;				
+			(call)(obj);	
 			checkTotal();
 		};
 		obj.clear = function() {
@@ -14784,9 +14784,7 @@ function makeShader(DS, width, height, fragment, uniforms, vertex, dynamic, preC
     if (preCall && typeof preCall=="function") preCall(program, gl, canvas);  // ZIM
     gl.useProgram(program);
     var vertexData = [];
-    if (postCall && typeof postCall=="function") {
-        postCall(program, gl, canvas, vertexData);   
-    }
+    if (postCall && typeof postCall=="function") postCall(program, gl, canvas, vertexData);  // ZIM
     
     if (strip) {
         if (vertexData.length == 0) vertexData = [1.0, 1.0, -1.0, 1.0, 1.0, -1.0, -1.0, -1.0]; // two triangles strips
@@ -14835,8 +14833,7 @@ function makeShader(DS, width, height, fragment, uniforms, vertex, dynamic, preC
             var mou = tether.globalToLocal(tether.stage.frame.mouseX, tether.stage.frame.mouseY);
             setUniform("4f", "iMouse", mou.x, height-mou.y, downCheck?1:0, clickCheck?1:0);
             clickCheck = false;
-        }          
-        
+        } 
         if (strip) gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
         else gl.drawArrays(gl.TRIANGLES, 0, vertexData.length);
         
@@ -30556,7 +30553,7 @@ var layer = new Layer().center();
 timeout(100, function(){zog(layer.transformControls);}); // will probably do the trick
 The transformControls property holds the following:
 
-TRANSFORM CONTROL OBJECT PROPERTIES
+TRANSFORM CONTROLS OBJECT PROPERTIES
 visible - read only whether the controls are visible
 ghost - read only as to whether the ghost outline is showing - set with showGhost and hideGhost
 ghostEnabled - read only as to whether the ghost outline will be turned on and off - set with addGhost and removeGhost
@@ -30565,7 +30562,7 @@ stretchXControls - reference to the Container that holds the left and right boxe
 stretchYControls - reference to the Container that holds the top and bottom boxes for stretching
 rotateControls - reference to the Container that holds the outer circles for rotating
 
-TRANSFORM CONTROL OBJECT METHODS
+TRANSFORM CONTROLS OBJECT METHODS
 hide() - hides the controls - returns object for chaining
 show() - shows the controls - returns object for chaining
 recordData(toJSON) - returns an object with type, x, y, scaleX, scaleY, rotation, skewX, skewY, visible PROPERTIES
@@ -37024,7 +37021,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
 				selector.mouseEnabled = false;
 			});
 			this.selector = selector;
-		} else {
+		} else {			
 			selector = this.selector = new zim.Rectangle(targetW, targetH, zim.faint, zim.faint, borderWidth, corner, dashed, {ignoreScale:!resizeScale})
 				.centerReg(that);
 			selector.loc(tile.width/2, target.y+paddingV, that, behind?0:1);
@@ -60597,7 +60594,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 	zim.loop = function(obj, call, reverse, interval, step, start, end, immediate, complete, completeParams) {
 		var sig = "obj, call, reverse, interval, step, start, end, immediate, complete, completeParams";
 		var duo; if (duo = zob(zim.loop, arguments, sig)) return duo;
-		
+
 		if (!zim.zimLoopCheck) z_d("45.3");
 		zim.zimLoopCheck = true;
 		if (zot(obj) || zot(call)) return undefined;
@@ -60656,7 +60653,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 							r = call(obj.item(i), i, total, start, end, obj, io);
 						}					
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -60693,7 +60690,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 							r = call(obj.item(i), i, total, start, end, obj, io);
 						}
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -60727,7 +60724,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						
 						r = call(props[i], obj[props[i]], i, total, start, end, obj, io);
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -60748,7 +60745,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						
 						r = call(props[i], obj[props[i]], i, total, start, end, obj, io);
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -60768,7 +60765,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						if (typeof r != 'undefined' && r != "next") return r;
 					}
 				} else {
-					zim.interval(interval, function(io) {
+					zim.interval(interval, function(io) {						
 						i = io.count;
 						if (!immediate) i--;
 						if (step) i *= step;
@@ -60776,7 +60773,7 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						
 						r = call(obj.getChildAt(i), i, total, start, end, obj, io);
 						
-						if (r == 'next') io.next();
+						if (r == 'next' && i < total-1) io.next();
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -60795,9 +60792,8 @@ RETURNS any value returned from the loop - or true if no value is returned from
 						if (!immediate) i--;
 						if (step != 1) i = -start + i*step;
 						
-						r = call(obj.getChildAt(i), i, total, start, end, obj, io);
-						
-						if (r == 'next') io.next();
+						r = call(obj.getChildAt(i), i, total, start, end, obj, io);					
+						if (r == 'next' && i < total-1) io.next();	
 						else if (typeof r != 'undefined') {
 							io.clear();
 							return r;
@@ -66673,6 +66669,8 @@ note: the item is not the event object target - as that is the tile
 
 		that.spacingH = spacingHList[0];
 		that.spacingV = spacingVList[0];
+		if (zot(that.spacingH)) that.spacingH = spacingH;
+		if (zot(that.spacingV)) that.spacingV = spacingV;
 
 		// ~~~~~~~~~~~~~~~~~~~  GET ARRAY OF ITEMS  ~~~~~~~~~~~~~~~
 		// this list could be edited later and passed back into remake()
@@ -90709,12 +90707,12 @@ SVG will give a "ready" and a "complete" event when loaded.
 These events are triggered 20 ms after making the object if the object is already preloaded.
 
 NOTE: SVG is a container with a bitmap inside (see bitmap property)
-or if the bitmap option is not selected there are other shapes inside.
+or if the bitmap option is not selected there are various shapes inside.
 This means that other objects can be added to the SVG object.
 This is like the ZIM Shapes (Rectangle, Circle, etc.) which are containers and can have objects added to them.
-If doing this, note that the container has its mouseChildren may be turned off
+If doing this, note that the container has its mouseChildren turned off
 so when dragging, for instance, the whole SVG moves rather than the bitmap inside the SVG.
-To interact with objects inside, set pic.mouseChildren = true.
+To interact with objects inside, set mySVG.mouseChildren = true.
 Generally, for clarity, avoid adding objects to Shapes, Pics SVGs unless you are used to the mouseChildren setting.
 
 NOTE: as of ZIM 5.5.0 the zim namespace is no longer required (unless zns is set to true before running zim)