zimjs 16.3.9 → 16.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/zim.js +59 -43
package/package.json
CHANGED
package/src/zim.js
CHANGED
|
@@ -26909,8 +26909,8 @@ list.items[1].label.text = "Some very long but important option!";
|
|
|
26909
26909
|
|
|
26910
26910
|
list.on("resize", ()=>{
|
|
26911
26911
|
const point = list.resizeHandle.localToGlobal(0,0);
|
|
26912
|
-
|
|
26913
|
-
|
|
26912
|
+
win.resize(list.x+listWidth+windowWidth-point.x);
|
|
26913
|
+
win.x = point.x;
|
|
26914
26914
|
});
|
|
26915
26915
|
|
|
26916
26916
|
const win = new Window({
|
|
@@ -33121,7 +33121,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
33121
33121
|
//-61
|
|
33122
33122
|
|
|
33123
33123
|
/*--
|
|
33124
|
-
zim.Slider = function(min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, style, group, inherit)
|
|
33124
|
+
zim.Slider = function(min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, addZero, style, group, inherit)
|
|
33125
33125
|
|
|
33126
33126
|
Slider
|
|
33127
33127
|
zim class - extends a zim.Container which extends a createjs.Container
|
|
@@ -33201,6 +33201,7 @@ rangeWidth - (default 3 pixels wider than the barWidth on both sides) set the th
|
|
|
33201
33201
|
rangeMin - (default min) set the minimum value of the range
|
|
33202
33202
|
rangeMax - (default (max-min)/2) set the maximum value of the range
|
|
33203
33203
|
rangeAve - (default null) set the range average value - this may relocate rangeMin and rangeMax settings
|
|
33204
|
+
addZero - (default false) add zero on end of decimals for useLabels true
|
|
33204
33205
|
style - (default true) set to false to ignore styles set with the STYLE - will receive original parameter defaults
|
|
33205
33206
|
group - (default null) set to String (or comma delimited String) so STYLE can set default styles to the group(s) (like a CSS class)
|
|
33206
33207
|
inherit - (default null) used internally but can receive an {} of styles directly
|
|
@@ -33266,8 +33267,8 @@ dispatches a "change" event when button is slid on slider (but not when setting
|
|
|
33266
33267
|
ALSO: see the CreateJS Easel Docs for Container events such as:
|
|
33267
33268
|
added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmove, pressup, removed, rollout, rollover
|
|
33268
33269
|
--*///+62
|
|
33269
|
-
zim.Slider = function(min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, style, group, inherit) {
|
|
33270
|
-
var sig = "min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, style, group, inherit";
|
|
33270
|
+
zim.Slider = function(min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, addZero, style, group, inherit) {
|
|
33271
|
+
var sig = "min, max, step, button, barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, currentValue, expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, addZero, style, group, inherit";
|
|
33271
33272
|
var duo; if (duo = zob(zim.Slider, arguments, sig, this)) return duo;
|
|
33272
33273
|
z_d("62");
|
|
33273
33274
|
this.zimContainer_constructor(null,null,null,null,false);
|
|
@@ -33317,6 +33318,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
33317
33318
|
if (zot(rangeMin)) rangeMin = DS.rangeMin!=null?DS.rangeMin:currentValue;
|
|
33318
33319
|
if (zot(rangeMax)) rangeMax = DS.rangeMax!=null?DS.rangeMax:(max-min)/2;
|
|
33319
33320
|
if (zot(rangeAve)) rangeAve = DS.rangeAve!=null?DS.rangeAve:null;
|
|
33321
|
+
if (zot(addZero)) addZero = DS.addZero!=null?DS.addZero:false;
|
|
33320
33322
|
var stage;
|
|
33321
33323
|
var that = this;
|
|
33322
33324
|
this.update = function() {};
|
|
@@ -33514,9 +33516,9 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
33514
33516
|
y = start+spacing*i;
|
|
33515
33517
|
g.mt(0, y).lt(x, y);
|
|
33516
33518
|
if (useLabels && ((semiTicks && tickLarge) || !semiTicks)) {
|
|
33517
|
-
dd = Math.max(zim.countDecimals(step0), zim.countDecimals(min), zim.countDecimals(max));
|
|
33519
|
+
dd = Math.max(zim.countDecimals(step0), zim.countDecimals(min), zim.countDecimals(max));
|
|
33518
33520
|
new zim.Label({
|
|
33519
|
-
text:zim.decimals(max-(max-min)/Math.abs(stepsTotal)*i,dd+1),
|
|
33521
|
+
text:zim.decimals(max-(max-min)/Math.abs(stepsTotal)*i,dd+1,addZero),
|
|
33520
33522
|
size:DS.size?DS.size:10,
|
|
33521
33523
|
color:labelColor,
|
|
33522
33524
|
align:"left",
|
|
@@ -33550,7 +33552,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
33550
33552
|
if (useLabels && ((semiTicks && tickLarge) || !semiTicks)) {
|
|
33551
33553
|
dd = Math.max(zim.countDecimals(step0), zim.countDecimals(min), zim.countDecimals(max));
|
|
33552
33554
|
new zim.Label({
|
|
33553
|
-
text:zim.decimals(min+(max-min)/Math.abs(stepsTotal)*i,dd+1),
|
|
33555
|
+
text:zim.decimals(min+(max-min)/Math.abs(stepsTotal)*i,dd+1,addZero),
|
|
33554
33556
|
size:DS.size?DS.size:10,
|
|
33555
33557
|
color:labelColor,
|
|
33556
33558
|
align:"center",
|
|
@@ -33808,7 +33810,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
33808
33810
|
|
|
33809
33811
|
|
|
33810
33812
|
this.clone = function(exact) {
|
|
33811
|
-
return that.cloneProps(new zim.Slider((exact||!zim.isPick(oa[0]))?that.min:oa[0], (exact||!zim.isPick(oa[1]))?that.max:oa[1], (exact||!zim.isPick(oa[2]))?that.step:oa[2], button.clone(), barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, (exact||!zim.isPick(oa[3]))?that.currentValue:oa[3], expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, style, this.group, inherit));
|
|
33813
|
+
return that.cloneProps(new zim.Slider((exact||!zim.isPick(oa[0]))?that.min:oa[0], (exact||!zim.isPick(oa[1]))?that.max:oa[1], (exact||!zim.isPick(oa[2]))?that.step:oa[2], button.clone(), barLength, barWidth, barColor, vertical, useTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, inside, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, damp, (exact||!zim.isPick(oa[3]))?that.currentValue:oa[3], expand, expandVertical, expandBar, expandBarVertical, useLabels, labelMargin, labelColor, range, rangeColor, rangeWidth, rangeMin, rangeMax, rangeAve, addZero, style, this.group, inherit));
|
|
33812
33814
|
};
|
|
33813
33815
|
|
|
33814
33816
|
if (range) {
|
|
@@ -34397,7 +34399,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
34397
34399
|
//-62.5
|
|
34398
34400
|
|
|
34399
34401
|
/*--
|
|
34400
|
-
zim.Dial = function(min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, style, group, inherit);
|
|
34402
|
+
zim.Dial = function(min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, addZero, style, group, inherit);
|
|
34401
34403
|
|
|
34402
34404
|
Dial
|
|
34403
34405
|
zim class - extends a zim.Container which extends a createjs.Container
|
|
@@ -34473,6 +34475,7 @@ damp - (default null) set to value such as .1 to damp the slider currentValue
|
|
|
34473
34475
|
currentValue - |ZIM VEE| (default min value) - set the currentValue at start
|
|
34474
34476
|
useLabels - (default false) - add Labels to ticks if useTicks is true - can apply STYLE
|
|
34475
34477
|
labelMargin - (default 10) - distance from ticks to Label if useLabels is true
|
|
34478
|
+
addZero - (default false) add zero on end of decimals for useLabels true
|
|
34476
34479
|
style - (default true) set to false to ignore styles set with the STYLE - will receive original parameter defaults
|
|
34477
34480
|
group - (default null) set to String (or comma delimited String) so STYLE can set default styles to the group(s) (like a CSS class)
|
|
34478
34481
|
inherit - (default null) used internally but can receive an {} of styles directly
|
|
@@ -34533,8 +34536,8 @@ dispatches a "change" event when dial changes value (but not when setting curren
|
|
|
34533
34536
|
ALSO: see the CreateJS Easel Docs for Container events such as:
|
|
34534
34537
|
added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmove, pressup, removed, rollout, rollover
|
|
34535
34538
|
--*///+63
|
|
34536
|
-
zim.Dial = function(min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, style, group, inherit) {
|
|
34537
|
-
var sig = "min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, style, group, inherit";
|
|
34539
|
+
zim.Dial = function(min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, addZero, style, group, inherit) {
|
|
34540
|
+
var sig = "min, max, step, width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, currentValue, useLabels, labelMargin, addZero, style, group, inherit";
|
|
34538
34541
|
var duo; if (duo = zob(zim.Dial, arguments, sig, this)) return duo;
|
|
34539
34542
|
z_d("63");
|
|
34540
34543
|
this.zimContainer_constructor(null,null,null,null,false);
|
|
@@ -34582,6 +34585,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
34582
34585
|
if (zot(currentValue)) currentValue = DS.currentValue!=null?DS.currentValue:null;
|
|
34583
34586
|
if (zot(useLabels)) useLabels = DS.useLabels!=null?DS.useLabels:false;
|
|
34584
34587
|
if (zot(labelMargin)) labelMargin = DS.labelMargin!=null?DS.labelMargin:10;
|
|
34588
|
+
if (zot(addZero)) addZero = DS.addZero!=null?DS.addZero:false;
|
|
34585
34589
|
if (limit == false) damp = null;
|
|
34586
34590
|
|
|
34587
34591
|
var that = this;
|
|
@@ -34657,10 +34661,11 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
34657
34661
|
tick.regX = .5;
|
|
34658
34662
|
tick.rotation = (360-360*gap)/(ticksTotal-(gap?1:0)) * i + 360*gap/2;
|
|
34659
34663
|
ticks.addChild(tick);
|
|
34664
|
+
|
|
34660
34665
|
if (useLabels && ((semiTicks && tickLarge) || !semiTicks)) {
|
|
34661
|
-
var dd = Math.max(zim.countDecimals(step0), zim.countDecimals(min), zim.countDecimals(max));
|
|
34666
|
+
var dd = Math.max(zim.countDecimals(step0), zim.countDecimals(min), zim.countDecimals(max));
|
|
34662
34667
|
new zim.Label({
|
|
34663
|
-
text:zim.decimals(min+(max-min)/Math.abs(stepsTotal||ticksTotal)*i,dd+1,
|
|
34668
|
+
text:zim.decimals(min+(max-min)/Math.abs(stepsTotal||ticksTotal)*i,dd+1,addZero),
|
|
34664
34669
|
size:DS.size?DS.size:10,
|
|
34665
34670
|
align:"center",
|
|
34666
34671
|
valign:"center"
|
|
@@ -35077,7 +35082,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
35077
35082
|
|
|
35078
35083
|
if (style!==false) zim.styleTransforms(this, DS);
|
|
35079
35084
|
this.clone = function(exact) {
|
|
35080
|
-
return that.cloneProps(new zim.Dial((exact||!zim.isPick(oa[0]))?that.min:oa[0], (exact||!zim.isPick(oa[1]))?that.max:oa[1], (exact||!zim.isPick(oa[2]))?that.step:oa[2], width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, (exact||!zim.isPick(oa[3]))?that.currentValue:oa[3], useLabels, labelMargin, style, this.group, inherit));
|
|
35085
|
+
return that.cloneProps(new zim.Dial((exact||!zim.isPick(oa[0]))?that.min:oa[0], (exact||!zim.isPick(oa[1]))?that.max:oa[1], (exact||!zim.isPick(oa[2]))?that.step:oa[2], width, backgroundColor, indicatorColor, indicatorScale, indicatorType, useTicks, innerTicks, tickColor, tickStep, semiTicks, tickScale, semiTickScale, innerCircle, innerScale, innerColor, inner2Color, accentSize, accentOffset, accentColor, accentBackgroundColor, accentDifference, sound, linear, gap, limit, keyArrows, keyArrowsStep, keyArrowsH, keyArrowsV, continuous, continuousMin, continuousMax, damp, (exact||!zim.isPick(oa[3]))?that.currentValue:oa[3], useLabels, labelMargin, addZero, style, this.group, inherit));
|
|
35081
35086
|
};
|
|
35082
35087
|
|
|
35083
35088
|
this.dispose = function(a,b,disposing) {
|
|
@@ -58084,7 +58089,7 @@ const page1 = new Page(W, H, green);
|
|
|
58084
58089
|
const page2 = new Page(W, H, purple, pink);
|
|
58085
58090
|
const page3 = new Page(W, H, yellow);
|
|
58086
58091
|
|
|
58087
|
-
const pages = new Pages([page1, page2, page3], "
|
|
58092
|
+
const pages = new Pages([page1, page2, page3], "bubbleZIM", 1).addTo();
|
|
58088
58093
|
new Arrow({pages:pages, direction:LEFT})
|
|
58089
58094
|
.rot(180)
|
|
58090
58095
|
.pos(50,50,LEFT,BOTTOM);
|
|
@@ -60377,6 +60382,8 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60377
60382
|
return that;
|
|
60378
60383
|
};
|
|
60379
60384
|
|
|
60385
|
+
var fl;
|
|
60386
|
+
|
|
60380
60387
|
|
|
60381
60388
|
this.resize = function(w, h) {
|
|
60382
60389
|
|
|
@@ -60414,9 +60421,12 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60414
60421
|
var colCount = 0;
|
|
60415
60422
|
var point,newX;
|
|
60416
60423
|
|
|
60424
|
+
if (flip.type == "series") flip.index = 0;
|
|
60425
|
+
fl = zim.Pick.choose(flip);
|
|
60426
|
+
|
|
60417
60427
|
zim.loop(this, function(o, i) {
|
|
60418
|
-
if (bottomFull ||
|
|
60419
|
-
o.pos(totalX+(o.marginRight?o.marginRight:0), totalY+(o.marginTop?o.marginTop:0), zim.RIGHT,
|
|
60428
|
+
if (bottomFull || fl) {
|
|
60429
|
+
o.pos(totalX+(o.marginRight?o.marginRight:0), totalY+(o.marginTop?o.marginTop:0), zim.RIGHT, fl?zim.TOP:zim.BOTTOM);
|
|
60420
60430
|
} else {
|
|
60421
60431
|
o.pos(totalX+(o.marginLeft?o.marginLeft:0), totalY+(o.marginTop?o.marginTop:0));
|
|
60422
60432
|
}
|
|
@@ -60424,7 +60434,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60424
60434
|
b = o.boundsToGlobal();
|
|
60425
60435
|
var pointTL = that.globalToLocal(b.x, b.y);
|
|
60426
60436
|
var pointBR = that.globalToLocal(b.x+b.width, b.y+b.height);
|
|
60427
|
-
if (bottomFull ||
|
|
60437
|
+
if (bottomFull || fl) {
|
|
60428
60438
|
point = that.globalToLocal(b.x, b.y);
|
|
60429
60439
|
// o.wrapHeight = buildHeight-totalY-point.y;
|
|
60430
60440
|
} else {
|
|
@@ -60445,7 +60455,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60445
60455
|
if (co) {
|
|
60446
60456
|
newX = co*colCount;
|
|
60447
60457
|
} else {
|
|
60448
|
-
if (bottomFull ||
|
|
60458
|
+
if (bottomFull || fl) {
|
|
60449
60459
|
newX = widthVoid - point.x + (o.marginLeft?o.marginLeft:0) + spacingH;
|
|
60450
60460
|
} else {
|
|
60451
60461
|
newX = point.x + (o.marginRight?o.marginRight:0) + spacingH;
|
|
@@ -60463,6 +60473,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60463
60473
|
ro = zim.Pick.choose(rowSize);
|
|
60464
60474
|
pv = zim.Pick.choose(percentVoidH);
|
|
60465
60475
|
ov = zim.Pick.choose(offsetVoidH);
|
|
60476
|
+
|
|
60466
60477
|
colCount = 0;
|
|
60467
60478
|
//if (i<t-1) {
|
|
60468
60479
|
that.items2D.push(zim.copy(currentCols));
|
|
@@ -60471,8 +60482,9 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60471
60482
|
//}
|
|
60472
60483
|
currentCols = [];
|
|
60473
60484
|
|
|
60474
|
-
|
|
60475
|
-
|
|
60485
|
+
|
|
60486
|
+
if (bottomFull || fl) {
|
|
60487
|
+
o.pos(totalX+(o.marginRight?o.marginRight:0), totalY+(o.marginTop?o.marginTop:0), zim.RIGHT, fl?zim.TOP:zim.BOTTOM);
|
|
60476
60488
|
} else {
|
|
60477
60489
|
o.pos(totalX+(o.marginLeft?o.marginLeft:0), totalY+(o.marginTop?o.marginTop:0));
|
|
60478
60490
|
}
|
|
@@ -60490,7 +60502,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60490
60502
|
newX = 0;
|
|
60491
60503
|
} else {
|
|
60492
60504
|
newX = (o.marginLeft?o.marginLeft:0) + o.wrapWidth + (o.marginRight?o.marginRight:0) + zim.Pick.choose(spacingH);
|
|
60493
|
-
if (bottomFull ||
|
|
60505
|
+
if (bottomFull || fl) {
|
|
60494
60506
|
point.x = widthVoid - ((o.marginRight?o.marginRight:0) + o.wrapWidth);
|
|
60495
60507
|
} else {
|
|
60496
60508
|
point.x = (o.marginLeft?o.marginLeft:0) + o.wrapWidth;
|
|
@@ -60585,7 +60597,6 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60585
60597
|
var al = zim.Pick.choose(align);
|
|
60586
60598
|
var sp = zim.Pick.choose(spread);
|
|
60587
60599
|
var st = zim.Pick.choose(stretch);
|
|
60588
|
-
var fl = zim.Pick.choose(flip);
|
|
60589
60600
|
var ai = zim.Pick.choose(alignInner);
|
|
60590
60601
|
var vi = zim.Pick.choose(valignInner);
|
|
60591
60602
|
|
|
@@ -60601,8 +60612,8 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60601
60612
|
var alignCheck = false;
|
|
60602
60613
|
var lastX,diffX;
|
|
60603
60614
|
|
|
60604
|
-
if (co) { // columns
|
|
60605
|
-
if (bottomFull ||
|
|
60615
|
+
if (co) { // columns
|
|
60616
|
+
if (bottomFull || fl) objects.reverse();
|
|
60606
60617
|
var gap = widthVoid%co;
|
|
60607
60618
|
var voidLoc = widthVoid/2+ov/100*widthVoid;
|
|
60608
60619
|
var added = 0;
|
|
@@ -60649,7 +60660,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60649
60660
|
}
|
|
60650
60661
|
}
|
|
60651
60662
|
|
|
60652
|
-
} else if (sp || st) { // spread or stretch
|
|
60663
|
+
} else if (sp || st) { // spread or stretch
|
|
60653
60664
|
// equal space between
|
|
60654
60665
|
var spacing, extra;
|
|
60655
60666
|
if (sp) spacing = objects.length?((widthVoid-lineObjectWidths)/(objects.length+1)):0;
|
|
@@ -60665,7 +60676,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60665
60676
|
lastSpacing = spacing;
|
|
60666
60677
|
|
|
60667
60678
|
var widthTotal = 0;
|
|
60668
|
-
if (bottomFull ||
|
|
60679
|
+
if (bottomFull || fl) objects.reverse();
|
|
60669
60680
|
zim.loop(objects, function (obj, i) {
|
|
60670
60681
|
am = 0;
|
|
60671
60682
|
lastX = obj.x;
|
|
@@ -60707,8 +60718,8 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60707
60718
|
} else {
|
|
60708
60719
|
// shifts for normal wrapping
|
|
60709
60720
|
if (al=="center") {
|
|
60710
|
-
zim.loop(objects, function (obj) {
|
|
60711
|
-
am = ((bottomFull||
|
|
60721
|
+
zim.loop(objects, function (obj) {
|
|
60722
|
+
am = ((bottomFull||fl?0:width)-lastPoint.x)/2;
|
|
60712
60723
|
if (sp || st) {
|
|
60713
60724
|
if (obj.marginLeft) am+=obj.marginLeft;
|
|
60714
60725
|
if (obj.marginRight) am-=obj.marginRight;
|
|
@@ -60716,7 +60727,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60716
60727
|
obj.mov(am);
|
|
60717
60728
|
obj.centerX+=am;
|
|
60718
60729
|
});
|
|
60719
|
-
} else if ((bottomFull||
|
|
60730
|
+
} else if ((bottomFull||fl) && al=="left") {
|
|
60720
60731
|
extra = objects[objects.length-1].marginLeft;
|
|
60721
60732
|
zim.loop(objects, function (obj) {
|
|
60722
60733
|
am = -lastPoint.x+(extra?extra:0);
|
|
@@ -60726,7 +60737,7 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60726
60737
|
obj.mov(am);
|
|
60727
60738
|
obj.centerX+=am;
|
|
60728
60739
|
});
|
|
60729
|
-
} else if (!(bottomFull||
|
|
60740
|
+
} else if (!(bottomFull||fl) && al=="right") {
|
|
60730
60741
|
extra = objects[objects.length-1].marginRight;
|
|
60731
60742
|
zim.loop(objects, function (obj) {
|
|
60732
60743
|
am = width-lastPoint.x-(extra?extra:0);
|
|
@@ -60763,15 +60774,15 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60763
60774
|
} else {
|
|
60764
60775
|
if (obj.centerX > voidThresh) obj.mov(voidMove);
|
|
60765
60776
|
}
|
|
60766
|
-
} else if (!(bottomFull||
|
|
60777
|
+
} else if (!(bottomFull||fl) && al=="right") {
|
|
60767
60778
|
if (obj.centerX < width-voidThresh) obj.mov(-voidMove);
|
|
60768
|
-
} else if (!(bottomFull||
|
|
60779
|
+
} else if (!(bottomFull||fl) && al=="center") {
|
|
60769
60780
|
// might want to center each side on their side...
|
|
60770
60781
|
if (obj.centerX > width/2+ov/100*widthVoid) obj.mov(voidMove/2);
|
|
60771
60782
|
else obj.mov(-voidMove/2);
|
|
60772
|
-
} else if ((bottomFull||
|
|
60783
|
+
} else if ((bottomFull||fl) && al=="right") {
|
|
60773
60784
|
if (obj.centerX > widthVoid-voidThresh) obj.mov(voidMove);
|
|
60774
|
-
} else if ((bottomFull||
|
|
60785
|
+
} else if ((bottomFull||fl) && al=="center") {
|
|
60775
60786
|
if (obj.centerX > widthVoid/2+ov/100*widthVoid) obj.mov(voidMove);
|
|
60776
60787
|
} else { // lefts
|
|
60777
60788
|
if (obj.centerX > voidThresh) obj.mov(voidMove);
|
|
@@ -60798,6 +60809,9 @@ alpha, cursor, shadow, name, mouseChildren, mouseEnabled, parent, numChildren, e
|
|
|
60798
60809
|
obj.mov(0, -(maxY-obj.wrapHeight)+(obj.marginTop?obj.marginTop:0));
|
|
60799
60810
|
});
|
|
60800
60811
|
}
|
|
60812
|
+
|
|
60813
|
+
fl = zim.Pick.choose(flip);
|
|
60814
|
+
|
|
60801
60815
|
} // end alignObjects
|
|
60802
60816
|
|
|
60803
60817
|
|
|
@@ -65977,7 +65991,7 @@ zim.TextureActivesManager = function(stage, toggleKey, damp) {
|
|
|
65977
65991
|
width:200,
|
|
65978
65992
|
height:80,
|
|
65979
65993
|
titleBar:"TextureActives",
|
|
65980
|
-
|
|
65994
|
+
draggable:true,
|
|
65981
65995
|
close:true
|
|
65982
65996
|
}).pos(50,50,RIGHT,BOTTOM);
|
|
65983
65997
|
var slider = this.slider = new zim.Slider({min:0, max:100, damp:true})
|
|
@@ -74024,7 +74038,6 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
74024
74038
|
call:done,
|
|
74025
74039
|
params:e
|
|
74026
74040
|
});
|
|
74027
|
-
|
|
74028
74041
|
}
|
|
74029
74042
|
function done(e) {
|
|
74030
74043
|
if (!that.complete && that.test()) {
|
|
@@ -74039,7 +74052,7 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
74039
74052
|
that.mySownCheck = dCheck = false;
|
|
74040
74053
|
onOthers();
|
|
74041
74054
|
// e.target.mouseEnabled = true;
|
|
74042
|
-
e.target.dragPaused = false;
|
|
74055
|
+
e.target.dragPaused = false;
|
|
74043
74056
|
}
|
|
74044
74057
|
if (!swap) {
|
|
74045
74058
|
if (that.moveEvent) tile.off("pressmove", that.moveEvent);
|
|
@@ -74168,6 +74181,9 @@ added, click, dblclick, mousedown, mouseout, mouseover, pressdown (ZIM), pressmo
|
|
|
74168
74181
|
|
|
74169
74182
|
this.inactive = false;
|
|
74170
74183
|
this.scramble = function(time, wait, num) {
|
|
74184
|
+
|
|
74185
|
+
that.myDownCheck = false;
|
|
74186
|
+
|
|
74171
74187
|
if (zot(wait)) wait = 0;
|
|
74172
74188
|
if (zot(time)) time = 0;
|
|
74173
74189
|
if (zot(num) || time==0) num = 1;
|
|
@@ -82665,7 +82681,7 @@ zim.Frame = function(scaling, width, height, color, outerColor, ready, assets, p
|
|
|
82665
82681
|
assetHolder.type = "Sound";
|
|
82666
82682
|
assetHolder.src = loaded.src;
|
|
82667
82683
|
assetHolder.item = loaded.item;
|
|
82668
|
-
if (assetHolder.playParams) {
|
|
82684
|
+
if (assetHolder.playParams) {
|
|
82669
82685
|
assetHolder.sound = assetHolder.play.apply(null, assetHolder.playParams);
|
|
82670
82686
|
if (assetHolder.volume != null) assetHolder.sound.volume = assetHolder.volume;
|
|
82671
82687
|
if (assetHolder.pan != null) assetHolder.sound.pan = assetHolder.pan;
|
|
@@ -84048,7 +84064,7 @@ loop - dispatched when the sound loops (but not at end of last loop - that is co
|
|
|
84048
84064
|
file = that.file = zim.Pick.choose(file);
|
|
84049
84065
|
|
|
84050
84066
|
var sound = that.sound = zim.asset(file, null, null, maxNum);
|
|
84051
|
-
if (sound.type == "AC") {
|
|
84067
|
+
if (sound.type == "AC") {
|
|
84052
84068
|
sound.on("complete", function () {
|
|
84053
84069
|
that.src = sound.src;
|
|
84054
84070
|
that.item = sound.item;
|
|
@@ -84559,7 +84575,7 @@ new SVG(zid("svgTagID")).center().drag();
|
|
|
84559
84575
|
END EXAMPLE
|
|
84560
84576
|
|
|
84561
84577
|
EXAMPLE
|
|
84562
|
-
Find the SVG in an assets/ folder
|
|
84578
|
+
// Find the SVG in an assets/ folder
|
|
84563
84579
|
PATH = "assets/"
|
|
84564
84580
|
// Tile a lazy-loaded SVG with dimensions - otherwise Tile would give a console warning
|
|
84565
84581
|
new Tile(new SVG("file.svg", 100, 100), 4, 4)).center();
|
|
@@ -84582,7 +84598,7 @@ EXAMPLE
|
|
|
84582
84598
|
// see the Docs under SVGContainer for more complex examples and added information
|
|
84583
84599
|
// note the h t t p : should be edited to not have spaces - just avoiding Doc auto linking
|
|
84584
84600
|
const svg = `<svg width="150" height="200" xmlns="h t t p ://www.w3.org/2000/svg">
|
|
84585
|
-
<path id="lineAB" d="M 0 0 l 150 200" stroke=red stroke-width="3" fill="none" />
|
|
84601
|
+
<path id="lineAB" d="M 0 0 l 150 200" stroke="red" stroke-width="3" fill="none" />
|
|
84586
84602
|
</svg>`;
|
|
84587
84603
|
new SVG(svg, null, null, false).center();
|
|
84588
84604
|
END EXAMPLE
|