zimjs 18.0.7 → 18.0.9

package/package.json

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

package/src/zim.js

@@ -15968,7 +15968,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
     if (zot(c)) c = DS.c!=null?DS.c:a;
     if (b==-1) b = Math.sqrt(Math.pow(a,2)+Math.pow(c,2));
     if (c==-1) c = Math.sqrt(Math.pow(a,2)+Math.pow(b,2));
-	if (zot(corner)) corner = DS.corner!=null?DS.corner:0;
+    if (zot(corner)) corner = DS.corner!=null?DS.corner:0;
     if (zot(center)) center = DS.center!=null?DS.center:true;
     if (zot(adjust)) adjust = DS.adjust!=null?DS.adjust:0;
     if (zot(borderColor)) borderColor = DS.borderColor!=null?DS.borderColor:null;
@@ -15981,7 +15981,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
 
     // PICK
     var oa = remember(a, b, c, color, borderColor, borderWidth);
-	this.veeObj = {a:oa[0], b:oa[1], c:oa[2], color:oa[3], borderColor:oa[4], borderWidth:oa[5]};
+    this.veeObj = {a:oa[0], b:oa[1], c:oa[2], color:oa[3], borderColor:oa[4], borderWidth:oa[5]};
     function remember() {return arguments;} // for cloning PICK
     a = zim.Pick.choose(a);
     b = zim.Pick.choose(b);
@@ -15999,7 +15999,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
     that._borderWidth = borderWidth;
     that._dashed = dashed;
     if (that._dashed && !Array.isArray(that._dashed)) that._dashed = [10, 10];
-	that._corner = corner;
+    that._corner = corner;
 
 
     var lines = [a,b,c];
@@ -16020,12 +16020,12 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
 
     var g = tri.graphics;
     that.drawShape = function() {
-		var corners = [];		
-		if (Array.isArray(that._corner)) corners = that._corner;
-		else corners.push(that._corner, that._corner, that._corner);
-		for(var i=0; i<3; i++) {
-			if (corners[i] < 0 || typeof corners[i] != "number") corners[i] = 0;
-		}
+        var corners = [];		
+        if (Array.isArray(that._corner)) corners = that._corner;
+        else corners.push(that._corner, that._corner, that._corner);
+        for(var i=0; i<3; i++) {
+            if (corners[i] < 0 || typeof corners[i] != "number") corners[i] = 0;
+        }
 		
         g.c();
         that.colorCommand = g.f(that._color).command;
@@ -16040,11 +16040,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
                 if (that._dashed) that.borderDashedCommand = g.sd(Array.isArray(that._dashed)?that._dashed:[10, 10], that._dashedOffset).command;
             }
         }
-		
-		// g.mt(5,100)
-		// g.at(100,100, 0,0, 15).at(0,0, 0,100, 5).at(0,100,100,100, 5)
-		
-        
+		       
         that.one={x:0,y:0};        
         that.two={x:a,y:0};
 
@@ -16074,13 +16070,13 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
 			
         that.three={x:a-backX,y:0-upY};
 				
-		var sX = a*corners[0]/((corners[0]+corners[1])||1);
-		g
-			.mt(sX,0)
-			.at(a,0, a-backX,0-upY, corners[1])
-			.at(a-backX,0-upY, 0,0, corners[2])
-			.at(0,0, a,0, corners[0])
-			.lt(sX,0);
+        var sX = a*corners[0]/((corners[0]+corners[1])||1);
+        g
+            .mt(sX,0)
+            .at(a,0, a-backX,0-upY, corners[1])
+            .at(a-backX,0-upY, 0,0, corners[2])
+            .at(0,0, a,0, corners[0])
+            .lt(sX,0);
 			
 		g.cp();
 
@@ -25400,7 +25396,7 @@ wait - (default null) - String word for button to show when button is pressed an
 	LOADING: this can be used as a loading message - so change the button to "LOADING"
 	When the asset has loaded, use the clearWait() method to return to the normal button or toggled button state
 	CONFIRMING: this can also be used to confirm user action rather than a full new confirm panel
-	Set wait:"CONFIRM", set the waitBackgroundColor and rollWaitBackground parameters to red and the waitTime parameter to 4
+	Set wait:"CONFIRM", set the waitBackgroundColor and rollWaitBackgroundColor parameters to red and the waitTime parameter to 4
 	In a button mousedown (must use mousedown - not click or tap if ACTIONEVENT is mousedown - the default),
 	check if the waiting property is true to test for confirmation
 	The waiting property will not be true for the first button press but will be true during the wait period
@@ -48196,7 +48192,7 @@ rollIcon - references the rollIcon (if set)
 toggleObj - references the toggle object (string or display object if set)
 rollToggle - references the rollToggle (if set)
 toggled - true if button is in toggled state, false if button is in original state
-enabled - default is true - set to false to disable
+enabled - default is true - set to false to disable (the HTML aspect of the Loader will remail - so use loader.removeFrom() or loader.dispose() if you do not need it gain)
 rollPersist - default is false - set to true to keep rollover state when button is pressed even if rolling off
 focus - get or set the focus property of the Button used for tabOrder
 
@@ -56595,7 +56591,7 @@ RETURNS an index Number (or undefined) | col | row | an Array of [index, col, ro
 // SUBSECTION ANIMATE, WIGGLE, LOOP
 
 /*--
-obj.animate = function(props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp)
+obj.animate = function(props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick)
 
 animate
 zim DisplayObject method
@@ -56811,6 +56807,18 @@ const line = new Squiggle().center();
 new Circle(10, red).addTo().animate({path:line}, 1);
 END EXAMPLE
 
+EXAMPLE
+// animate across colors
+const colors = series("#f0f","#0f0","#00f","#f00","#ff0").mix();
+new Rectangle(W,H,colors)
+	.addTo()
+	.animate({
+		props:{color:colors},
+		loopPick:true,
+		rewindPick:true
+	});
+END EXAMPLE
+
 PARAMETERS
 ** supports DUO - parameters or single object with properties below
 ** supports VEE - parameters marked with ZIM VEE mean a zim Pick() object or Pick Literal can be passed
@@ -56958,6 +56966,7 @@ call - (default null) the function to call when the animation is done
 params - (default target) a single parameter for the call function (eg. use object literal or array)
 wait - |ZIM VEE| (default 0) seconds to wait before doing animation
 	can be negative for series to start animation before previous animation ends
+	also see the waiting property
 waitedCall - (default null) calls function after wait is done if there is a wait
 waitedParams - (default target) parameters to send waitedCall function
 loop - (default false) set to true to loop animation
@@ -56980,7 +56989,6 @@ rewindEase - (default null) overwrite the ease for the rewind direction
 	so setting rewindEase:"bounceOut" will bounce back at the start of the animation
 	note - setting ease:"bounceOut" will bounce at the end of the animation
 	this allows for a normal start with a bounce and then a normal start at rewind and a bounce
-
 startCall - (default null) calls function at the start of actual animation and after any wait (and waitedCall)
 	this is basically the same as the waitedCall but will also be called at the start of animation when there is no waitedCall
 startParams - (default target) parameters to send startCall function
@@ -57102,6 +57110,12 @@ timeUnit - (default TIME) override the TIME setting to "seconds" / "s" or "milli
 timeCheck - (default true) set to false to not have animate() warn of potentially wrong time units - see also TIMECHECK
 noAnimateCall - (default true) set to false to not call the callback function if ANIMATE is set to false
 pathDamp - (default .15) damping for drag along path
+rewindPick - (default false) set to true to pick from props as it rewinds
+	this will be moved to the other rewind parameters in ZIM 019 
+	also see loopPick - using both loopPick and rewindPick will act like a series
+	where if the property has a series it will animate one after the other 
+	do not use if the property is just a regular value as it will appear to stop the animation.
+	Can use a series, results of a function, min max or array for random picks
 
 PROPERTIES - zim.animate() adds the following properties to any object it animates:
 	animating - read-only - true when animating (including when waiting) 
@@ -57172,8 +57186,8 @@ EVENTS - zim animate() will add an "animation" event to the target IF the events
 
 RETURNS the target for chaining (or null if no target is provided and run on zim with series)
 --*///+45
-	zim.animate = function(target, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp) {
-		var sig = "target, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp";
+	zim.animate = function(target, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick) {
+		var sig = "target, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick";
 
 		if (target && (target.props || target.obj)) {
 			var duo; if (duo = zob(zim.animate, arguments, sig)) return duo;
@@ -57194,8 +57208,8 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 		// last param is noWarning - sent internal as false by wiggle for instance
 		var timeType = getTIME(null, timeUnit, null, null, zot(timeCheck)?false:!timeCheck);
 
-		if (loopCount || loopCall || loopWait) loop = true;
-		if (rewindTime || rewindCall || rewindTime || rewindEase || rewindWait) rewind = true;
+		if (loopCall || loopWait || loopPick || loopCount) loop = true;
+		if (rewindCall || rewindWait || rewindPick || rewindTime || rewindEase) rewind = true;
 
 		var i, prop, currentCount;
 		var startArguments = arguments;
@@ -57345,7 +57359,6 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 			sequenceTarget.animating = true;
 		}
 		function sequenceDone() {
-			sequenceTarget.animating = false;
 			if (call) call(params||sequenceTarget);
 		}
 
@@ -57393,7 +57406,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 				if (i==0 && sequence!=0) seqTime = timeType=="s"?.02:20; // patched in 10.7.0 and 10.7.1
 								
 				// zim.animate(tar, tar.zimObj, time, ease, (i==target.length-1?call:null), (i==target.length-1?params:null)
-				zim.animate(tar, tar.zimObj, time, ease, (i==target.length-1?sequenceDone:null), null, wait, waitedCall, waitedParams, null, null, null, null, null, null, null, loopPick, null, null, null, null, null, null, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, null, sequenceCall, sequenceParams, null, null, ticker, zim.copy(cjsProps), css, protect, override, null, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, seqTime, rrr, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp); // do not send from!
+				zim.animate(tar, tar.zimObj, time, ease, (i==target.length-1?sequenceDone:null), null, wait, waitedCall, waitedParams, null, null, null, null, null, null, null, loopPick, null, null, null, null, null, null, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, null, sequenceCall, sequenceParams, null, null, ticker, zim.copy(cjsProps), css, protect, override, null, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, seqTime, rrr, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick); // do not send from!
 	
 			}
 			return sequenceTarget;
@@ -57741,7 +57754,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 			}
 		}
 
-		props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp
+		// props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick
 
 
 		// -----------------------------
@@ -57751,7 +57764,6 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 		if (!target.tweenStates) target.tweenStates = {all:true};	
 
 		var fromCheck = false;
-
 									
 		// Handle notes
 		if (obj.note) {
@@ -58695,7 +58707,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 			sequenceWait:sequenceWait
 		}
 
-		function doLoopCall() {
+		function doLoopCall() {			
 			if (wait3>0) target.waiting = false;
 			if (!cjsProps.loop) return; // added Cat 03 - was being called even if not looping
 			if (sequenceCall && typeof sequenceCall == 'function') {				
@@ -58722,12 +58734,24 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 					adjustedScale = zim.Pick.choose(savedPicks.scale, null, target);
 				}
 
+			
+
 				if (!from) {
+
 					if (tween.step && tween.step.prev && tween.step.prev.props) {
 						for (var i in tween.step.prev.props) {
 							if (extraTypes.indexOf(i) >= 0) continue; // skip for extras
 							var p = zim.Pick.choose(savedPicks[i], null, target);
 
+							// handle color at loop - ZIM 018
+							if (i=="colorRange") i = "color"
+							var p = zim.Pick.choose(savedPicks[i], null, target);
+							if (i=="color") i = "colorRange";
+							if (target.setColorRange && i=="colorRange") {
+								target.setColorRange(target.color, p);
+								continue;
+							}
+
 							// also handle relative
 							if (typeof p == "string" && i != "transform") {
 								if (p.substr(0,1) != "+" && p.substr(0,1) != "-") {
@@ -58742,7 +58766,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 
 							// ZIM ZIM 02 patch to make non-rewind work with loopPick
 							// the difference seems to be using tween.step.prev for rewind and tween.step for non-rewind
-							// we had tween.step.prev for both since the beggining - we must not have tested on a non-rewind
+							// we had tween.step.prev for both since the begining - we must not have tested on a non-rewind
 							if (rewind) {
 								if (!zot(savedPicks[i])) tween.step.prev.props[i] = p;
 								if (i=="scaleX" && !zot(adjustedScale)) tween.step.prev.props.scaleX = adjustedScale;
@@ -58797,7 +58821,7 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 			params6 = cjsProps.startParams;
 			delete cjsProps.startParams;
 		}
-		function doStartCall(tween) {
+		function doStartCall(tween) {				
 			if (tween.startCalled) return;
 			tween.startCalled = true;
 			if (call6 && typeof call6 == 'function') {(call6)(params6||target);}
@@ -58939,11 +58963,65 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 
 		// REWIND TWEENS
 		
-		function doRewindCall() {
+		function doRewindCall() {	
+			// ADDED in ZIM 018
+
+			if (!from && rewindPick) {
+
+				var adjustedScale;
+				if (!zot(savedPicks.scale)) {
+					adjustedScale = zim.Pick.choose(savedPicks.scale, null, target);
+				}
+
+				if (tween.step && tween.step.props) {
+					for (var i in tween.step.props) {
+						if (extraTypes.indexOf(i) >= 0) continue; // skip for extras
+
+						// handle color at rewind - ZIM 018
+						if (i=="colorRange") i = "color"
+						var p = zim.Pick.choose(savedPicks[i], null, target);
+						if (i=="color") i = "colorRange";
+						if (target.setColorRange && i=="colorRange") {
+							target.setColorRange(p, target.color);
+							continue;
+						}
+
+						// also handle relative
+						if (typeof p == "string" && i != "transform") {
+							if (p.substr(0,1) != "+" && p.substr(0,1) != "-") {
+								var newStart;
+								if (target.zimLastObj && !zot(target.zimLastObj[i])) newStart = target.zimLastObj[i];
+								else newStart = target[i];
+								p = newStart + Number(p.replace(/\s/g,""));
+							}
+						}
+						// end handle relative
+						
+						// target.zimLastObj[i] = rewind?target.zimTweenOriginals[i]:p;
+						target.zimLastObj[i] = p;
+								
+						if (!zot(savedPicks[i])) {
+							tween.step.props[i] = p; // sets the rewind property
+							tween._stepHead.props[i] = p; // sets the start of a loop to end of rewind
+						}
+						if (i=="scaleX" && !zot(adjustedScale)) {
+							tween.step.props.scaleX = adjustedScale;
+							tween._stepHead.props.scaleX = adjustedScale;
+						}
+						if (i=="scaleY" && !zot(adjustedScale)) {
+							tween.step.props.scaleY = adjustedScale;
+							tween._stepHead.props.scaleY = adjustedScale;
+						}
+						
+					}
+				}
+			}		
+			// END ADDED in ZIM 018				
+			
 			if (wait2>0) target.waiting = false;
 			if (call2 && typeof call2 == 'function') {(call2)(params2);}
 		}
-		function doRewindWaitCall() {
+		function doRewindWaitCall() {				
 			if (wait2>0) target.waiting = true;
 			if (call5 && typeof call5 == 'function') {(call5)(params5);}
 		}
@@ -58967,23 +59045,28 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 		}
 		
 		var startTest = false;
-		var obj2;
+		var obj2;	
+
 		function tween1(lastTween) {	
 			if (!startTest)	{
-				obj2 = getStart();	
-				startTest = true;
-			}		
-			if (target.set && !from) target.set(set);				
+				obj2 = getStart();				
+				startTest = true;				
+			} 
+			
+			if (target.set && !from) target.set(set);	
 			tween = target.zimTweens[id] =  target.zimTween = createjs.Tween.get(target, cjsProps)
-				.call(doStartCall)	
+				.call(doStartCall)				
 				.to(obj, t, finalEase)				
 				.call(doRewindWaitCall)
 				.wait(wait2, true)
 				.call(doRewindCall)
-				.to(obj2, t2, finalEase2)
+				// this is hard coded... need to inject a different obj2 into createjs tween
+				// and activate the code in doStartCall that makes loop start at end of new rewind
+				.to(obj2, t2, finalEase2) 
 				.call(doneAnimating)
 				.wait(wait3, true)
 				.call(doLoopCall);
+				
 			tween.timeScale = target.futureRate;
 			if (lastTween) transferIds(lastTween, tween);
 			setZimTweenProps();
@@ -59420,20 +59503,20 @@ RETURNS the target for chaining (or null if no target is provided and run on zim
 				return;
 			}
 			if (cjsProps.loop) {
-				if (count > 0) {
+				if (count > 0) {					
 					if (currentCount < count) {
 						if (wait3>0) target.waiting = true;
 						doLoopWaitCall();
 						currentCount++;
 						return;
 					} else {
-						if (rewind) {
+						if (rewind) {							
 							if (target.set) target.set(startObj);							
 						} else {							
 							if (target.set) target.set(obj);
 						}
 					}
-				} else {									
+				} else {							
 					if (wait3>0) target.waiting = true;
 					doLoopWaitCall();
 					return;
@@ -62394,7 +62477,7 @@ zim global variable
 
 DESCRIPTION
 
-WARNING - currently, this does not work - see seedRandom() in CODE module.
+WARNING - currently, this does not work - instead, see seedRandom() in CODE module.
 
 If set, the ZIM rand() function will be seeded with its value.
 This means that rand() will repeat in order its random results.
@@ -62442,7 +62525,7 @@ zim global variable
 
 DESCRIPTION
 
-WARNING - currently, this does not work - see seedRandom() in CODE module.
+WARNING - currently, this does not work - instead, see seedRandom() in CODE module.
 but there is no equivilant to SEEDRANDOMCOUNT yet - we are working on it.
 
 The current order number used for rand() if SEEDRAND is set or the rand() seedRand parameter is set
@@ -63264,7 +63347,8 @@ arrowDisableColor - (default grey) the disabled backgroundColor of the ZIM Arrow
 continuous - (default false) when default swiping is on, set to true to make pages continuous
 	so last page goes forward to first page and first page goes backwards to last page 
 	
-METHODS
+METHODS 
+** these return the Pages object for chaining unless another value is specified
 addPage(page, swipeArray) - lets you alternatively add pages after you create the object
 removePage(page) - lets you remove a page (if on this page, call a go() first and remove on the page event)
 setSwipeArray(page, swipeArray) - lets you set the swipe array for a page
@@ -63280,7 +63364,7 @@ settle() - removes all pages except the currentPage
 setArrows(index) - disables or enables Arrow buttons held in arrows property - called automatically by Arrow buttons
 disable() - stops swipe from activating and sets active = false
 enable() - enables swipe action and sets active = true
-dispose() - clears listeners and pages
+dispose() - clears listeners and pages - returns true if successful
 
 PROPERTIES
 type - holds the class name as a String
@@ -63500,6 +63584,7 @@ you can define multiple pages objects add and remove pages objects as needed
 			} else {
 				if (page.parent) page.parent.removeChild(page);
 			}
+			return that;
 		};
 
 		this.removePage = function(page) {
@@ -63513,19 +63598,23 @@ you can define multiple pages objects add and remove pages objects as needed
 				if (p.page == page || p == page) that.pages.splice(i, 1);
 			}, true);
 			page.zimSwipeArray = null;
+			return that;
 		};
 
 		this.setSwipeArray = function(page, swipeArray) {
 			if (zot(swipeArray)) swipeArray = [];
 			var data = {page:page, swipe:swipeArray};
 			data.page.zimSwipeArray = (data.swipe) ? data.swipe : [];
+			return that;
 		};
 
 		this.pause = function() {
 			paused = true;
+			return that;
 		};
 		this.unpause = function() {
 			if (paused) that.go(pauseInfo[0], pauseInfo[1], pauseInfo[2], pauseInfo[3], pauseInfo[4]);
+			return that;
 		};
 
 		var goCheck = true;
@@ -63836,6 +63925,7 @@ you can define multiple pages objects add and remove pages objects as needed
 				that.setArrows(pages.index);
 				if (holder.stage) holder.stage.update();
 			}
+			return that;
 		};
 		
 		if (holder && holder.shape) {			
@@ -63848,6 +63938,7 @@ you can define multiple pages objects add and remove pages objects as needed
 			hW = holder.getBounds().width;
 			hH = holder.getBounds().height;
 			if (transition!="none" || transitionTable!=[]) makeTransitionAssets();
+			return that;
 		};
 
 		this.puff = function(time) {
@@ -63862,20 +63953,24 @@ you can define multiple pages objects add and remove pages objects as needed
 					that.settle();
 				}, time*(timeType=="s"?1000:1));
 			}
+			return that;
 		};
 
 		this.settle = function() {
 			that.removeAllChildren();
 			that.addChild(currentPage);
 			that.dispatchEvent("puffed");
+			return that;
 		};
 
 		this.disable = function() {
 			that.active = false;
+			return that;
 		};
 
 		this.enable = function() {
 			that.active = true;
+			return that;
 		};
 		
 		this.arrows = {};
@@ -63901,6 +63996,7 @@ you can define multiple pages objects add and remove pages objects as needed
 				}
 			});
 			if (that.stage) that.stage.update();
+			return that;
 		}
 		// function arrowsOn(b) {
 		// 	b.enabled = true;
@@ -66311,8 +66407,10 @@ setSpacing(h,v) - set arrays of horizontal and vertical spacing
 	ZIM Tile() makes spacing arrays for horizontal and vertical spacing based on ZIM VEE calculations from the spacingH and spacingV parameters
 	to change spacing afterwards, new arrays can be provided to setSpacing()
 	the arrays must have col-1 and row-1 items - although h or v can be left null or undefined to keep existing spacing
-remake(items) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
+remake(items, newSpacingH, newSpacingV, newCount) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
 	can also change rows and cols and remake()
+	optionally pass in new spacing parameters and/or a newCount 
+	Note: if the items length is different than the previous items length then the count will be automatically made cols*rows - unless newCount is provided
 resize(width, height) - resize the tile with new width and/or height if the width and/or height parameters were set - returns tile for chaining
 hasProp(property as String) - returns true if property exists on object else returns false
 clone(exact) - makes a copy with properties such as x, y, etc. also copied
@@ -66542,6 +66640,8 @@ note: the item is not the event object target - as that is the tile
 		// remember any set widths and heights in case
 		// zik is used for colSize and rowSize
 		var widthHeights;
+		var widthO;
+		var heightO;
 
 		function makeTile() {
 
@@ -66633,11 +66733,11 @@ note: the item is not the event object target - as that is the tile
 					heightUncompressedMax+=val;
 				}
 			}
-
+			widthO = widthUncompressedMax;
+			heightO = heightUncompressedMax;
 		}
 		makeTile();
-		var widthO = widthUncompressedMax;
-		var heightO = heightUncompressedMax;
+		
 
 		var overallWidth;
 		var overallHeight;
@@ -66727,11 +66827,13 @@ note: the item is not the event object target - as that is the tile
 							rowTops[i] = 0;
 						}
 					}
+					
 
 					if (i==0) {
 
 						// ~~~~~~~~~~~~~~~~~~~  HORIZONTAL ALIGN ~~~~~~~~~~~~~~~
 
+						
 						if (!zot(width)) {
 							if (that.squeezeH=="full") {
 								spreadXspacing = rowObjects.length>1?((width - widthTotals[j]) / (rowObjects.length-1)):0;
@@ -66769,16 +66871,16 @@ note: the item is not the event object target - as that is the tile
 					} else {
 						// tile.x = colTotal + (tile.regX-b.x);
 					}
-					tile.pos(colTotal, null);
+					tile.pos(colTotal, null);			
 
-					if (!that.squeezeH && VEEAlign) {						
+					if (!that.squeezeH && VEEAlign) {
 						if (zot(width) && (align=="center" || align=="middle")) {
 							tile.x += (widthMax[i]-tile.fW)/2;
 						} else if (zot(width) && align=="right") {
 							tile.x += widthMax[i]-tile.fW;
 						}
-					} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)						
-						if (zot(width) && (that.align=="center" || that.align=="middle")) {
+					} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)
+						if (zot(width) && (that.align=="center" || that.align=="middle")) {							
 							tile.x += (widthMax[i]-tile.fW)/2;
 						} else if (zot(width) && that.align=="right") {
 							tile.x += widthMax[i]-tile.fW;
@@ -66822,7 +66924,7 @@ note: the item is not the event object target - as that is the tile
 					} else {
 						colTotal += widthMax[i]+(!zot(width)?spreadXspacing:spacingHList[i]);
 					}
-
+					
 					tile.x += left;
 					tile.y += rowTops[i];
 
@@ -66881,9 +66983,41 @@ note: the item is not the event object target - as that is the tile
 			return that.items2D[ro][co];
 		};
 
-		this.remake = function(items) {
+		this.remake = function(items, newSpacingH, newSpacingV, newCount) {
+
+			// a little complicated so we just remake the spacings if provided or items length has gotten bigger
+			// if items length is different we create a new count - can override with newCount
+			if (zot(newCount) && items.length != that.items.length) count = that.cols*that.rows;
+			if (!zot(newSpacingH) || !zot(newSpacingV) || items.length > that.items.length) {
+				if (!zot(newSpacingH)) spacingH = sH;
+				if (!zot(newSpacingV)) spacingV = sV;
+				spacingHList = [];
+				spacingVList = [];
+				spacingHTotal = 0;
+				spacingVTotal = 0;
+				mCols = (count && count<that.cols)?count-1:that.cols-1;
+				for (i=0; i<mCols; i++) {
+					var s = zik(spacingH);
+					spacingHList.push(s);
+					spacingHTotal += s;
+				}
+				mRows = (count && Math.ceil(count/that.cols)<that.rows)?Math.ceil(count/that.cols)-1:that.rows-1;
+				for (i=0; i<mRows; i++) {
+					var s = zik(spacingV);
+					spacingVList.push(s);
+					spacingVTotal += s;
+				}
+				spacingHOList = zim.copy(spacingHList);
+				spacingVOList = zim.copy(spacingVList);;
+				spacingHOTotal = spacingHTotal;
+				spacingVOTotal = spacingVTotal;
+				spacingHAve = that.cols-1>0?spacingHTotal/(that.cols-1):0
+				spacingVAve = that.rows-1>0?spacingVTotal/(that.rows-1):0
+			}
+
 			if (!zot(items)) that.items = items;
 			makeTile();
+			
 			resize(width, height);
 			makeAdditions(true);
 			return that;
@@ -70280,7 +70414,7 @@ This has world-wide wonderful applications!
 TextureActives applies the interactivity to TextureActive objects
 and has an addMesh() method to register three.js meshes with their TextureActive 
 A TextureActives object must be made after the TextureActive objects are made 
-and after a three.js renderer, scene, camera and constrols are made.
+and after a three.js renderer, scene, camera and controls are made.
 But it can be made before the meshes that use the TextureActive objects are made.
 Then either a Three.makePanel() or a textureActives.addMesh() method can be used to add TextureActive objects.
 
@@ -70304,6 +70438,10 @@ https://zimjs.com/015/textureactive5.html - Physics
 https://zimjs.com/015/textureactive_hud.html - HUD affecting three object
 https://zimjs.com/015/textureactive_hud_raw.html - same but without ZIM Three 
 
+SEE:
+TextureActive Studio
+https://zimjs.com/studio
+
 XR
 TextureActive will detect if XR (AR/VR) is being used and will use the suitable Raycaster
 Additional classes are provided with the ZIM Three helper library for controllers, movement and teleport 
@@ -74376,7 +74514,6 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
 			if (target.type == "Pen") target.write = false;
 			mouseEvent = stage.on("stagemousedown", function(e) {
 				var pp;
-				if (target.type == "Pen" && target.draggingCheck) zogb();
 				var con;
 				if (!mouseOutside && that.boundary && !that.boundary.type=="Blob") con = that.boundary;
 				else if (!mouseOutside && container && container.boundsToGlobal) con = container.boundsToGlobal();
@@ -74385,9 +74522,11 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
 					if (
 						pp.x < con.x || pp.x > con.x+con.width ||
 						pp.y < con.y || pp.y > con.y+con.height
-					) return;
+					) {
+						moveCheck = false;
+						return;
+					}
 				}
-				// }
 				if (that.boundary && that.boundary.type=="Blob" && (type=="pressmove" || type=="pressdrag")) {
 					pp = {x:e.stageX/zim.scaX, y:e.stageY/zim.scaY};
 					if (!that.boundary.shape.hitTestPoint(pp.x,pp.y)) return;
@@ -80694,7 +80833,7 @@ layers - (default TOP) where to place the current particle being emitted - value
 animation - |ZIM VEE| (default null) a zim animate config object to apply to the particle
 	This is the whole zim DUO object to pass to animate - including a props parameter that holds the animation object
 	To pass in two or more animations on the same particle then use {noPick:[{animation1}, {animation2}, {etc.}]}
-random - (default null) an object holding properties to animate, each property holding a ZIM VEE Value object for Pick.choose() to pick from per particle
+random - (default null) an object holding properties to set, each property holding a ZIM VEE Value object for Pick.choose() to pick from per particle
 	eg: {color:[red, white, green], scale:{min:1, max:2}} // scale is a convienence property for both scaleX and scaleY
 horizontal - (default false) start the particles across the emitter's width at the top of the emitter (unless vertical is set to true)
 vertical - (default false) start the particles across the emitter's height at the left of the emitter (unless horizontal is set to true)
@@ -83182,7 +83321,6 @@ dispatches an "undo" and a "redo" whenever undo and redo happens
 			that.stop = function() {that.stopCheck(true);};
 			that.infinite = false;
 			that.stopCheck = function(override) {
-		
 				if (!override) {
 					if (that.infinite) return;
 					if (that.zimDragCheck) return;
@@ -91399,6 +91537,7 @@ new Circle(100, blue.darken(.5)).center();
 new Circle(100, blue.toColor(red, .2)).center();
 END EXAMPLE
 	--*///+83.55
+	// note - first 9 or 10 colors are used in THEME
 	zim.colorsHex = ["#fb4758","#fa8072","#f58e25","#ebcb35","#acd241","#50c4b7","#993399","#e472c4","#d1a170","#112233","#000000","#111111","#222222","#333333","#444444","#555555","#555555","#666666","#777777","#888888","#999999","#aaaaaa","#bbbbbb","#cccccc","#dddddd","#eeeeee","#ffffff","rgba(0,0,0,.01)","rgba(0,0,0,0)"];
 	zim.colors = ["red","salmon","orange","yellow","green","blue","purple","pink","brown","interstellar","black","darker","licorice","dark","charcoal","grey","gray","granite","tin","pewter","silver","fog","mist","light","moon","lighter","white","faint","clear"];
 	for (z_i=0; z_i<zim.colors.length; z_i++) {
@@ -92297,7 +92436,7 @@ function zimify(obj, a, b, c, d, list) {
 		hitTestGrid:function(width, height, cols, rows, x, y, offsetX, offsetY, spacingX, spacingY, local, type) {
 			return zim.hitTestGrid(this, width, height, cols, rows, x, y, offsetX, offsetY, spacingX, spacingY, local, type);
 		},
-		animate:function(props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp) {
+		animate:function(props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick) {
 			if (props && (props.props || props.obj) && isDUO(arguments)) {
 				// run this if duo but only if props object has a props or obj object
 				// can you believe that sentence makes sense
@@ -92306,7 +92445,7 @@ function zimify(obj, a, b, c, d, list) {
 				// it can only be a configuration object if there is a props or obj property
 				arguments[0].target = this; return zim.animate(arguments[0]);
 			}
-			else {return zim.animate(this, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp);}
+			else {return zim.animate(this, props, time, ease, call, params, wait, waitedCall, waitedParams, loop, loopCount, loopWait, loopCall, loopParams, loopWaitCall, loopWaitParams, loopPick, rewind, rewindWait, rewindCall, rewindParams, rewindWaitCall, rewindWaitParams, rewindTime, rewindEase, startCall, startParams, animateCall, animateParams, sequence, sequenceCall, sequenceParams, sequenceReverse, sequenceRatio, ticker, cjsProps, css, protect, override, from, set, id, events, sequenceTarget, dynamic, drag, clamp, startPaused, clean, obj, seriesWait, sequenceWait, rate, pauseOnBlur, easeAmount, easeFrequency, timeUnit, timeCheck, noAnimateCall, pathDamp, rewindPick);}
 		},
 		pauseAnimate:function(){return this;},
 		stopAnimate:function(){return this;},
@@ -92690,39 +92829,63 @@ EXAMPLE
 	const data = {size:10, season:"summer"};
 	// addWires returns the object data - which will now have the wired method
 	// now, when the slider or tabs change the data object will be updated
-	// note: we want the slider to be set to the object's start value so set the setSource to "target"
+	// note: we want the slider to be set to the object's start value so set the setSource to true
 	// note: we want the text of the tabs not the default index so need to provide input property
-	addWires(data).wired(slider, "size", null, "target").wired({source:tabs, prop:"season", input:"text"});
+	addWires(data).wired(slider, "size", null, true).wired({source:tabs, prop:"season", input:"text"});
+	S.on("stagemouseup", ()=>{zog(data);});
 END EXAMPLE
 
 PARAMETERS
 obj - the object to receive the wire and wired methods
 
-RETURNS - obj for chainging
+RETURNS - obj for chaining
 --*///+83.365
 zim.addWires = function(obj) {
-	if (isDUO(arguments)) {arguments[0].obj = this; return zim.addWires(arguments[0]);}
+	// if (isDUO(arguments)) {arguments[0].obj = this; return zim.addWires(arguments[0]);}
 	z_d("83.365");
 	obj.wire = function() {
+		if (isDUO(arguments)) {arguments[0].obj = this; return zim.wire(arguments[0]);}
 		Array.prototype.unshift.call(arguments, obj);
 		zim.wire.apply(null, arguments);
 		return obj;
 	};
 	obj.noWire = function() {
+		if (isDUO(arguments)) {arguments[0].obj = this; return zim.noWire(arguments[0]);}
 		Array.prototype.unshift.call(arguments, obj);
 		zim.noWire.apply(null, arguments);
 		return obj;
 	};
 	obj.wired = function() {
+		if (isDUO(arguments)) {arguments[0].obj = this; return zim.wired(arguments[0]);}
 		Array.prototype.unshift.call(arguments, obj);
 		zim.wired.apply(null, arguments);
 		return obj;
 	};
 	obj.noWired = function() {
+		if (isDUO(arguments)) {arguments[0].obj = this; return zim.noWired(arguments[0]);}
 		Array.prototype.unshift.call(arguments, obj);
 		zim.noWired.apply(null, arguments);
 		return obj;
 	};
+
+
+	// wire:function(target, prop, twoWay, setSource, filter, call, input) {
+	// 		if (isDUO(arguments)) {arguments[0].obj = this; return zim.wire(arguments[0]);}
+	// 		else {return zim.wire(this, target, prop, twoWay, setSource, filter, call, input);}
+	// 	},
+	// 	noWire:function(target, prop, input) {
+	// 		if (isDUO(arguments)) {arguments[0].obj = this; return zim.noWire(arguments[0]);}
+	// 		else {return zim.noWire(this, target, prop, input);}
+	// 	},
+	// 	wired:function(source, prop, twoWay, setSource, filter, call, input) {	
+	// 		if (isDUO(arguments)) {arguments[0].obj = this; return zim.wired(arguments[0]);}
+	// 		else {return zim.wired(this, source, prop, twoWay, setSource, filter, call, input);}
+	// 	},
+	// 	noWired:function(source, prop, input) {
+	// 		if (isDUO(arguments)) {arguments[0].obj = this; return zim.noWired(arguments[0]);}
+	// 		else {return zim.noWired(this, source, prop, input);}
+	// 	},
+
 	return obj;
 };//-83.365
 
@@ -94532,9 +94695,9 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
 		    zim.THEME = window.THEME = {name:theme, lightenRatio:lightenRatio, tint:tint, tintRatio:tintRatio, exclude:exclude};
 		    var colors = {};
 			var c;
-			var cn = zim.colors.slice(0,8); 
-			// ["red", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
-			var gn = zim.colors.slice(8,25); 
+			var cn = zim.colors.slice(0,9); 
+			// ["red", "salmon", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
+			var gn = zim.colors.slice(9,26); 
 			// ["black","licorice","darker","dark","charcoal","grey","gray","granite","tin","pewter","silver","fog","mist","light","moon","lighter","white"];
 			if (theme == "zim") {
 				zim.loop(zim.colors, function(color, i) {
@@ -94549,12 +94712,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
  				   colors[color] = zim.colorsHex[i+8];
  			   	});	 
 			} else if (theme == "future") {
-				c = ["f25019","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
+				c = ["f25019","f88e82","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
 				zim.loop(cn, function(color, i) {
 					colors[color] = "#"+c[i];
 				});		
 				zim.loop(gn, function(color, i) {					
-					colors[color] = zim.colorsHex[i+8].toColor("#1dcfae",.4-i*.025); 
+					colors[color] = zim.colorsHex[i+9].toColor("#1dcfae",.4-i*.025); 
  			   	});	  
 		   } else if (theme == "invert") {
 			   colors = {};
@@ -94568,34 +94731,34 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
 					colors[color] = "#"+c[i];
 				});	
 			} else if (theme == "neon") {
-				c = ["FF3624","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
+				c = ["FF3624","fd6f6f","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
 				zim.loop(cn, function(color, i) {
 					colors[color] = "#"+c[i];
 				});		
 				zim.loop(gn, function(color, i) {
-					colors[color] = zim.colorsHex[i+8].toColor("#000",.9);
+					colors[color] = zim.colorsHex[i+9].toColor("#000",.9);
 				});	
 				colors["light"] = zim.lighter;	  
 				colors["moon"] = zim.lighter;	  
 				colors["lighter"] = zim.white;	  
 				colors["white"] = zim.white;	  
 		  	} else if (theme == "seventies") {
-				c = ["e5771e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
+				c = ["e5771e","d66a5e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
 				zim.loop(cn, function(color, i) {
 					colors[color] = "#"+c[i];
 				});	
 				zim.loop(gn, function(color, i) {
 					// colors[color] = zim.colorsHex[i+8].toColor("#568203",1-i*.06);
-					colors[color] = zim.colorsHex[i+8].toColor(i<8?"#344f00":"#f4a127",.8-i*.04);
+					colors[color] = zim.colorsHex[i+9].toColor(i<8?"#344f00":"#f4a127",.8-i*.04);
 				});	 
 			} else if (theme == "warm") {
-				c = ["965746","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
+				c = ["965746","dd5c4d","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
 				zim.loop(cn, function(color, i) {
 					colors[color] = "#"+c[i];
 				});	
 				zim.loop(gn, function(color, i) {
 					// colors[color] = zim.colorsHex[i+8].toColor("#965746",.1);
-					colors[color] = zim.colorsHex[i+8].toColor(i<8?"#4e352e":"#745c58",.8-i*.05);
+					colors[color] = zim.colorsHex[i+9].toColor(i<8?"#4e352e":"#745c58",.8-i*.05);
 				});				
 		   	} else if (theme.constructor == {}.constructor) {
 		        colors = theme;
@@ -94606,12 +94769,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
 			zim.loop(exclude, function(item) {
 				if (item.toLowerCase()=="colors") {
 					zim.loop(zim.colors, function(color, i) {
-						if (i >= 8) return 1;
+						if (i >= 9) return 1;
 						exclude.push(color);
 					});
 				} else if (item.toLowerCase()=="greys" || item.toLowerCase()=="grays") {
 					zim.loop(zim.colors, function(color, i) {
-						if (i < 8) return;
+						if (i < 9) return;
 						exclude.push(color);
 					});
 				}
@@ -98093,4 +98256,3 @@ export let Style = zim.Style;
 export let assets = zim.assets;
 export let assetIDs = zim.assetIDs;
 export let ZIMON = zim.ZIMON;
-

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

@@ -3138,17 +3138,17 @@ declare namespace zim {
 	export class Pages extends Container {
 		constructor(config_or_pages?: DisplayObject[] | { page: DisplayObject, swipe?: DisplayObject[] }[], transition?: string, speed?: number, transitionTable?: any[][], holder?: Stage | Container, arrowDisableColor?: color, style?: boolean, group?: string, inherit?: {})
 		constructor(config: { pages?: DisplayObject[] | { page: DisplayObject, swipe?: DisplayObject[] }[], transition?: string, speed?: number, transitionTable?: any[][], holder?: Stage | Container, arrowDisableColor?: color, style?: boolean, group?: string, inherit?: {} })
-		addPage(page: DisplayObject, swipeArray?: string[]): void
-		removePage(page: DisplayObject): void
-		setSwipeArray(page: DisplayObject, swipeArray?: string[]): void
-		go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number): void
-		resize(): void
-		pause(): void
-		unpause(): void
-		puff(time: number): void
-		settle(): void
-		disable(): void
-		enable(): void
+		addPage(page: DisplayObject, swipeArray?: string[]): this
+		removePage(page: DisplayObject): this
+		setSwipeArray(page: DisplayObject, swipeArray?: string[]): this
+		go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number): this
+		resize(): this
+		pause(): this
+		unpause(): this
+		puff(time: number): this
+		settle(): this
+		disable(): this
+		enable(): this
 		dispose(): boolean
 		readonly type: string
 		speed: number