zimjs 18.0.6 → 18.0.8
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 +110 -53
- package/ts-src/typings/zim/index.d.ts +11 -11
package/package.json
CHANGED
package/src/zim.js
CHANGED
|
@@ -15968,7 +15968,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
15968
15968
|
if (zot(c)) c = DS.c!=null?DS.c:a;
|
|
15969
15969
|
if (b==-1) b = Math.sqrt(Math.pow(a,2)+Math.pow(c,2));
|
|
15970
15970
|
if (c==-1) c = Math.sqrt(Math.pow(a,2)+Math.pow(b,2));
|
|
15971
|
-
|
|
15971
|
+
if (zot(corner)) corner = DS.corner!=null?DS.corner:0;
|
|
15972
15972
|
if (zot(center)) center = DS.center!=null?DS.center:true;
|
|
15973
15973
|
if (zot(adjust)) adjust = DS.adjust!=null?DS.adjust:0;
|
|
15974
15974
|
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
|
|
|
15981
15981
|
|
|
15982
15982
|
// PICK
|
|
15983
15983
|
var oa = remember(a, b, c, color, borderColor, borderWidth);
|
|
15984
|
-
|
|
15984
|
+
this.veeObj = {a:oa[0], b:oa[1], c:oa[2], color:oa[3], borderColor:oa[4], borderWidth:oa[5]};
|
|
15985
15985
|
function remember() {return arguments;} // for cloning PICK
|
|
15986
15986
|
a = zim.Pick.choose(a);
|
|
15987
15987
|
b = zim.Pick.choose(b);
|
|
@@ -15999,7 +15999,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
15999
15999
|
that._borderWidth = borderWidth;
|
|
16000
16000
|
that._dashed = dashed;
|
|
16001
16001
|
if (that._dashed && !Array.isArray(that._dashed)) that._dashed = [10, 10];
|
|
16002
|
-
|
|
16002
|
+
that._corner = corner;
|
|
16003
16003
|
|
|
16004
16004
|
|
|
16005
16005
|
var lines = [a,b,c];
|
|
@@ -16020,12 +16020,12 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16020
16020
|
|
|
16021
16021
|
var g = tri.graphics;
|
|
16022
16022
|
that.drawShape = function() {
|
|
16023
|
-
|
|
16024
|
-
|
|
16025
|
-
|
|
16026
|
-
|
|
16027
|
-
|
|
16028
|
-
|
|
16023
|
+
var corners = [];
|
|
16024
|
+
if (Array.isArray(that._corner)) corners = that._corner;
|
|
16025
|
+
else corners.push(that._corner, that._corner, that._corner);
|
|
16026
|
+
for(var i=0; i<3; i++) {
|
|
16027
|
+
if (corners[i] < 0 || typeof corners[i] != "number") corners[i] = 0;
|
|
16028
|
+
}
|
|
16029
16029
|
|
|
16030
16030
|
g.c();
|
|
16031
16031
|
that.colorCommand = g.f(that._color).command;
|
|
@@ -16040,11 +16040,7 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16040
16040
|
if (that._dashed) that.borderDashedCommand = g.sd(Array.isArray(that._dashed)?that._dashed:[10, 10], that._dashedOffset).command;
|
|
16041
16041
|
}
|
|
16042
16042
|
}
|
|
16043
|
-
|
|
16044
|
-
// g.mt(5,100)
|
|
16045
|
-
// g.at(100,100, 0,0, 15).at(0,0, 0,100, 5).at(0,100,100,100, 5)
|
|
16046
|
-
|
|
16047
|
-
|
|
16043
|
+
|
|
16048
16044
|
that.one={x:0,y:0};
|
|
16049
16045
|
that.two={x:a,y:0};
|
|
16050
16046
|
|
|
@@ -16074,13 +16070,13 @@ zim.Triangle = function(a, b, c, color, borderColor, borderWidth, corner, center
|
|
|
16074
16070
|
|
|
16075
16071
|
that.three={x:a-backX,y:0-upY};
|
|
16076
16072
|
|
|
16077
|
-
|
|
16078
|
-
|
|
16079
|
-
|
|
16080
|
-
|
|
16081
|
-
|
|
16082
|
-
|
|
16083
|
-
|
|
16073
|
+
var sX = a*corners[0]/((corners[0]+corners[1])||1);
|
|
16074
|
+
g
|
|
16075
|
+
.mt(sX,0)
|
|
16076
|
+
.at(a,0, a-backX,0-upY, corners[1])
|
|
16077
|
+
.at(a-backX,0-upY, 0,0, corners[2])
|
|
16078
|
+
.at(0,0, a,0, corners[0])
|
|
16079
|
+
.lt(sX,0);
|
|
16084
16080
|
|
|
16085
16081
|
g.cp();
|
|
16086
16082
|
|
|
@@ -25400,7 +25396,7 @@ wait - (default null) - String word for button to show when button is pressed an
|
|
|
25400
25396
|
LOADING: this can be used as a loading message - so change the button to "LOADING"
|
|
25401
25397
|
When the asset has loaded, use the clearWait() method to return to the normal button or toggled button state
|
|
25402
25398
|
CONFIRMING: this can also be used to confirm user action rather than a full new confirm panel
|
|
25403
|
-
Set wait:"CONFIRM", set the waitBackgroundColor and
|
|
25399
|
+
Set wait:"CONFIRM", set the waitBackgroundColor and rollWaitBackgroundColor parameters to red and the waitTime parameter to 4
|
|
25404
25400
|
In a button mousedown (must use mousedown - not click or tap if ACTIONEVENT is mousedown - the default),
|
|
25405
25401
|
check if the waiting property is true to test for confirmation
|
|
25406
25402
|
The waiting property will not be true for the first button press but will be true during the wait period
|
|
@@ -47691,6 +47687,11 @@ zim.Carousel3D = function(width, height, items, widthFactor, heightFactor, curve
|
|
|
47691
47687
|
new zim.Page(200,200,blue).reg(CENTER), new zim.Page(200,200,green).reg(CENTER), new zim.Page(200,200,orange).reg(CENTER),
|
|
47692
47688
|
new zim.Page(200,200,red).reg(CENTER), new zim.Page(200,200,pink).reg(CENTER), new zim.Page(200,200,yellow).reg(CENTER)
|
|
47693
47689
|
];
|
|
47690
|
+
if (items[0] && typeof(items[0]) == "string") {
|
|
47691
|
+
zim.loop(items, function(item, i) {
|
|
47692
|
+
items[i] = new zim.Pic(item);
|
|
47693
|
+
});
|
|
47694
|
+
}
|
|
47694
47695
|
if (zot(widthFactor)) widthFactor = DS.widthFactor!=null?DS.widthFactor:1;
|
|
47695
47696
|
if (zot(heightFactor)) heightFactor = DS.heightFactor!=null?DS.heightFactor:1;
|
|
47696
47697
|
if (zot(curve)) curve = DS.curve!=null?DS.curve:.5;
|
|
@@ -48191,7 +48192,7 @@ rollIcon - references the rollIcon (if set)
|
|
|
48191
48192
|
toggleObj - references the toggle object (string or display object if set)
|
|
48192
48193
|
rollToggle - references the rollToggle (if set)
|
|
48193
48194
|
toggled - true if button is in toggled state, false if button is in original state
|
|
48194
|
-
enabled - default is true - set to false to disable
|
|
48195
|
+
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)
|
|
48195
48196
|
rollPersist - default is false - set to true to keep rollover state when button is pressed even if rolling off
|
|
48196
48197
|
focus - get or set the focus property of the Button used for tabOrder
|
|
48197
48198
|
|
|
@@ -63259,7 +63260,8 @@ arrowDisableColor - (default grey) the disabled backgroundColor of the ZIM Arrow
|
|
|
63259
63260
|
continuous - (default false) when default swiping is on, set to true to make pages continuous
|
|
63260
63261
|
so last page goes forward to first page and first page goes backwards to last page
|
|
63261
63262
|
|
|
63262
|
-
METHODS
|
|
63263
|
+
METHODS
|
|
63264
|
+
** these return the Pages object for chaining unless another value is specified
|
|
63263
63265
|
addPage(page, swipeArray) - lets you alternatively add pages after you create the object
|
|
63264
63266
|
removePage(page) - lets you remove a page (if on this page, call a go() first and remove on the page event)
|
|
63265
63267
|
setSwipeArray(page, swipeArray) - lets you set the swipe array for a page
|
|
@@ -63275,7 +63277,7 @@ settle() - removes all pages except the currentPage
|
|
|
63275
63277
|
setArrows(index) - disables or enables Arrow buttons held in arrows property - called automatically by Arrow buttons
|
|
63276
63278
|
disable() - stops swipe from activating and sets active = false
|
|
63277
63279
|
enable() - enables swipe action and sets active = true
|
|
63278
|
-
dispose() - clears listeners and pages
|
|
63280
|
+
dispose() - clears listeners and pages - returns true if successful
|
|
63279
63281
|
|
|
63280
63282
|
PROPERTIES
|
|
63281
63283
|
type - holds the class name as a String
|
|
@@ -63495,6 +63497,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63495
63497
|
} else {
|
|
63496
63498
|
if (page.parent) page.parent.removeChild(page);
|
|
63497
63499
|
}
|
|
63500
|
+
return that;
|
|
63498
63501
|
};
|
|
63499
63502
|
|
|
63500
63503
|
this.removePage = function(page) {
|
|
@@ -63508,19 +63511,23 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63508
63511
|
if (p.page == page || p == page) that.pages.splice(i, 1);
|
|
63509
63512
|
}, true);
|
|
63510
63513
|
page.zimSwipeArray = null;
|
|
63514
|
+
return that;
|
|
63511
63515
|
};
|
|
63512
63516
|
|
|
63513
63517
|
this.setSwipeArray = function(page, swipeArray) {
|
|
63514
63518
|
if (zot(swipeArray)) swipeArray = [];
|
|
63515
63519
|
var data = {page:page, swipe:swipeArray};
|
|
63516
63520
|
data.page.zimSwipeArray = (data.swipe) ? data.swipe : [];
|
|
63521
|
+
return that;
|
|
63517
63522
|
};
|
|
63518
63523
|
|
|
63519
63524
|
this.pause = function() {
|
|
63520
63525
|
paused = true;
|
|
63526
|
+
return that;
|
|
63521
63527
|
};
|
|
63522
63528
|
this.unpause = function() {
|
|
63523
63529
|
if (paused) that.go(pauseInfo[0], pauseInfo[1], pauseInfo[2], pauseInfo[3], pauseInfo[4]);
|
|
63530
|
+
return that;
|
|
63524
63531
|
};
|
|
63525
63532
|
|
|
63526
63533
|
var goCheck = true;
|
|
@@ -63831,6 +63838,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63831
63838
|
that.setArrows(pages.index);
|
|
63832
63839
|
if (holder.stage) holder.stage.update();
|
|
63833
63840
|
}
|
|
63841
|
+
return that;
|
|
63834
63842
|
};
|
|
63835
63843
|
|
|
63836
63844
|
if (holder && holder.shape) {
|
|
@@ -63843,6 +63851,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63843
63851
|
hW = holder.getBounds().width;
|
|
63844
63852
|
hH = holder.getBounds().height;
|
|
63845
63853
|
if (transition!="none" || transitionTable!=[]) makeTransitionAssets();
|
|
63854
|
+
return that;
|
|
63846
63855
|
};
|
|
63847
63856
|
|
|
63848
63857
|
this.puff = function(time) {
|
|
@@ -63857,20 +63866,24 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63857
63866
|
that.settle();
|
|
63858
63867
|
}, time*(timeType=="s"?1000:1));
|
|
63859
63868
|
}
|
|
63869
|
+
return that;
|
|
63860
63870
|
};
|
|
63861
63871
|
|
|
63862
63872
|
this.settle = function() {
|
|
63863
63873
|
that.removeAllChildren();
|
|
63864
63874
|
that.addChild(currentPage);
|
|
63865
63875
|
that.dispatchEvent("puffed");
|
|
63876
|
+
return that;
|
|
63866
63877
|
};
|
|
63867
63878
|
|
|
63868
63879
|
this.disable = function() {
|
|
63869
63880
|
that.active = false;
|
|
63881
|
+
return that;
|
|
63870
63882
|
};
|
|
63871
63883
|
|
|
63872
63884
|
this.enable = function() {
|
|
63873
63885
|
that.active = true;
|
|
63886
|
+
return that;
|
|
63874
63887
|
};
|
|
63875
63888
|
|
|
63876
63889
|
this.arrows = {};
|
|
@@ -63896,6 +63909,7 @@ you can define multiple pages objects add and remove pages objects as needed
|
|
|
63896
63909
|
}
|
|
63897
63910
|
});
|
|
63898
63911
|
if (that.stage) that.stage.update();
|
|
63912
|
+
return that;
|
|
63899
63913
|
}
|
|
63900
63914
|
// function arrowsOn(b) {
|
|
63901
63915
|
// b.enabled = true;
|
|
@@ -66306,8 +66320,10 @@ setSpacing(h,v) - set arrays of horizontal and vertical spacing
|
|
|
66306
66320
|
ZIM Tile() makes spacing arrays for horizontal and vertical spacing based on ZIM VEE calculations from the spacingH and spacingV parameters
|
|
66307
66321
|
to change spacing afterwards, new arrays can be provided to setSpacing()
|
|
66308
66322
|
the arrays must have col-1 and row-1 items - although h or v can be left null or undefined to keep existing spacing
|
|
66309
|
-
remake(items) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
|
|
66323
|
+
remake(items, newSpacingH, newSpacingV, newCount) - pass in an array of items to tile - see items property for editing current list - returns tile for chaining
|
|
66310
66324
|
can also change rows and cols and remake()
|
|
66325
|
+
optionally pass in new spacing parameters and/or a newCount
|
|
66326
|
+
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
|
|
66311
66327
|
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
|
|
66312
66328
|
hasProp(property as String) - returns true if property exists on object else returns false
|
|
66313
66329
|
clone(exact) - makes a copy with properties such as x, y, etc. also copied
|
|
@@ -66537,6 +66553,8 @@ note: the item is not the event object target - as that is the tile
|
|
|
66537
66553
|
// remember any set widths and heights in case
|
|
66538
66554
|
// zik is used for colSize and rowSize
|
|
66539
66555
|
var widthHeights;
|
|
66556
|
+
var widthO;
|
|
66557
|
+
var heightO;
|
|
66540
66558
|
|
|
66541
66559
|
function makeTile() {
|
|
66542
66560
|
|
|
@@ -66628,11 +66646,11 @@ note: the item is not the event object target - as that is the tile
|
|
|
66628
66646
|
heightUncompressedMax+=val;
|
|
66629
66647
|
}
|
|
66630
66648
|
}
|
|
66631
|
-
|
|
66649
|
+
widthO = widthUncompressedMax;
|
|
66650
|
+
heightO = heightUncompressedMax;
|
|
66632
66651
|
}
|
|
66633
66652
|
makeTile();
|
|
66634
|
-
|
|
66635
|
-
var heightO = heightUncompressedMax;
|
|
66653
|
+
|
|
66636
66654
|
|
|
66637
66655
|
var overallWidth;
|
|
66638
66656
|
var overallHeight;
|
|
@@ -66722,11 +66740,13 @@ note: the item is not the event object target - as that is the tile
|
|
|
66722
66740
|
rowTops[i] = 0;
|
|
66723
66741
|
}
|
|
66724
66742
|
}
|
|
66743
|
+
|
|
66725
66744
|
|
|
66726
66745
|
if (i==0) {
|
|
66727
66746
|
|
|
66728
66747
|
// ~~~~~~~~~~~~~~~~~~~ HORIZONTAL ALIGN ~~~~~~~~~~~~~~~
|
|
66729
66748
|
|
|
66749
|
+
|
|
66730
66750
|
if (!zot(width)) {
|
|
66731
66751
|
if (that.squeezeH=="full") {
|
|
66732
66752
|
spreadXspacing = rowObjects.length>1?((width - widthTotals[j]) / (rowObjects.length-1)):0;
|
|
@@ -66764,16 +66784,16 @@ note: the item is not the event object target - as that is the tile
|
|
|
66764
66784
|
} else {
|
|
66765
66785
|
// tile.x = colTotal + (tile.regX-b.x);
|
|
66766
66786
|
}
|
|
66767
|
-
tile.pos(colTotal, null);
|
|
66787
|
+
tile.pos(colTotal, null);
|
|
66768
66788
|
|
|
66769
|
-
if (!that.squeezeH && VEEAlign) {
|
|
66789
|
+
if (!that.squeezeH && VEEAlign) {
|
|
66770
66790
|
if (zot(width) && (align=="center" || align=="middle")) {
|
|
66771
66791
|
tile.x += (widthMax[i]-tile.fW)/2;
|
|
66772
66792
|
} else if (zot(width) && align=="right") {
|
|
66773
66793
|
tile.x += widthMax[i]-tile.fW;
|
|
66774
66794
|
}
|
|
66775
|
-
} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)
|
|
66776
|
-
if (zot(width) && (that.align=="center" || that.align=="middle")) {
|
|
66795
|
+
} else if (!that.squeezeH) { // this allows for dynamic setting of align (for non-VEE, non squeezeH)
|
|
66796
|
+
if (zot(width) && (that.align=="center" || that.align=="middle")) {
|
|
66777
66797
|
tile.x += (widthMax[i]-tile.fW)/2;
|
|
66778
66798
|
} else if (zot(width) && that.align=="right") {
|
|
66779
66799
|
tile.x += widthMax[i]-tile.fW;
|
|
@@ -66817,7 +66837,7 @@ note: the item is not the event object target - as that is the tile
|
|
|
66817
66837
|
} else {
|
|
66818
66838
|
colTotal += widthMax[i]+(!zot(width)?spreadXspacing:spacingHList[i]);
|
|
66819
66839
|
}
|
|
66820
|
-
|
|
66840
|
+
|
|
66821
66841
|
tile.x += left;
|
|
66822
66842
|
tile.y += rowTops[i];
|
|
66823
66843
|
|
|
@@ -66876,9 +66896,41 @@ note: the item is not the event object target - as that is the tile
|
|
|
66876
66896
|
return that.items2D[ro][co];
|
|
66877
66897
|
};
|
|
66878
66898
|
|
|
66879
|
-
this.remake = function(items) {
|
|
66899
|
+
this.remake = function(items, newSpacingH, newSpacingV, newCount) {
|
|
66900
|
+
|
|
66901
|
+
// a little complicated so we just remake the spacings if provided or items length has gotten bigger
|
|
66902
|
+
// if items length is different we create a new count - can override with newCount
|
|
66903
|
+
if (zot(newCount) && items.length != that.items.length) count = that.cols*that.rows;
|
|
66904
|
+
if (!zot(newSpacingH) || !zot(newSpacingV) || items.length > that.items.length) {
|
|
66905
|
+
if (!zot(newSpacingH)) spacingH = sH;
|
|
66906
|
+
if (!zot(newSpacingV)) spacingV = sV;
|
|
66907
|
+
spacingHList = [];
|
|
66908
|
+
spacingVList = [];
|
|
66909
|
+
spacingHTotal = 0;
|
|
66910
|
+
spacingVTotal = 0;
|
|
66911
|
+
mCols = (count && count<that.cols)?count-1:that.cols-1;
|
|
66912
|
+
for (i=0; i<mCols; i++) {
|
|
66913
|
+
var s = zik(spacingH);
|
|
66914
|
+
spacingHList.push(s);
|
|
66915
|
+
spacingHTotal += s;
|
|
66916
|
+
}
|
|
66917
|
+
mRows = (count && Math.ceil(count/that.cols)<that.rows)?Math.ceil(count/that.cols)-1:that.rows-1;
|
|
66918
|
+
for (i=0; i<mRows; i++) {
|
|
66919
|
+
var s = zik(spacingV);
|
|
66920
|
+
spacingVList.push(s);
|
|
66921
|
+
spacingVTotal += s;
|
|
66922
|
+
}
|
|
66923
|
+
spacingHOList = zim.copy(spacingHList);
|
|
66924
|
+
spacingVOList = zim.copy(spacingVList);;
|
|
66925
|
+
spacingHOTotal = spacingHTotal;
|
|
66926
|
+
spacingVOTotal = spacingVTotal;
|
|
66927
|
+
spacingHAve = that.cols-1>0?spacingHTotal/(that.cols-1):0
|
|
66928
|
+
spacingVAve = that.rows-1>0?spacingVTotal/(that.rows-1):0
|
|
66929
|
+
}
|
|
66930
|
+
|
|
66880
66931
|
if (!zot(items)) that.items = items;
|
|
66881
66932
|
makeTile();
|
|
66933
|
+
|
|
66882
66934
|
resize(width, height);
|
|
66883
66935
|
makeAdditions(true);
|
|
66884
66936
|
return that;
|
|
@@ -70275,7 +70327,7 @@ This has world-wide wonderful applications!
|
|
|
70275
70327
|
TextureActives applies the interactivity to TextureActive objects
|
|
70276
70328
|
and has an addMesh() method to register three.js meshes with their TextureActive
|
|
70277
70329
|
A TextureActives object must be made after the TextureActive objects are made
|
|
70278
|
-
and after a three.js renderer, scene, camera and
|
|
70330
|
+
and after a three.js renderer, scene, camera and controls are made.
|
|
70279
70331
|
But it can be made before the meshes that use the TextureActive objects are made.
|
|
70280
70332
|
Then either a Three.makePanel() or a textureActives.addMesh() method can be used to add TextureActive objects.
|
|
70281
70333
|
|
|
@@ -70299,6 +70351,10 @@ https://zimjs.com/015/textureactive5.html - Physics
|
|
|
70299
70351
|
https://zimjs.com/015/textureactive_hud.html - HUD affecting three object
|
|
70300
70352
|
https://zimjs.com/015/textureactive_hud_raw.html - same but without ZIM Three
|
|
70301
70353
|
|
|
70354
|
+
SEE:
|
|
70355
|
+
TextureActive Studio
|
|
70356
|
+
https://zimjs.com/studio
|
|
70357
|
+
|
|
70302
70358
|
XR
|
|
70303
70359
|
TextureActive will detect if XR (AR/VR) is being used and will use the suitable Raycaster
|
|
70304
70360
|
Additional classes are provided with the ZIM Three helper library for controllers, movement and teleport
|
|
@@ -74371,7 +74427,6 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
|
|
|
74371
74427
|
if (target.type == "Pen") target.write = false;
|
|
74372
74428
|
mouseEvent = stage.on("stagemousedown", function(e) {
|
|
74373
74429
|
var pp;
|
|
74374
|
-
if (target.type == "Pen" && target.draggingCheck) zogb();
|
|
74375
74430
|
var con;
|
|
74376
74431
|
if (!mouseOutside && that.boundary && !that.boundary.type=="Blob") con = that.boundary;
|
|
74377
74432
|
else if (!mouseOutside && container && container.boundsToGlobal) con = container.boundsToGlobal();
|
|
@@ -74380,9 +74435,11 @@ dispatches a "moving" event if target is moving and "startmoving" and "stopmovin
|
|
|
74380
74435
|
if (
|
|
74381
74436
|
pp.x < con.x || pp.x > con.x+con.width ||
|
|
74382
74437
|
pp.y < con.y || pp.y > con.y+con.height
|
|
74383
|
-
)
|
|
74438
|
+
) {
|
|
74439
|
+
moveCheck = false;
|
|
74440
|
+
return;
|
|
74441
|
+
}
|
|
74384
74442
|
}
|
|
74385
|
-
// }
|
|
74386
74443
|
if (that.boundary && that.boundary.type=="Blob" && (type=="pressmove" || type=="pressdrag")) {
|
|
74387
74444
|
pp = {x:e.stageX/zim.scaX, y:e.stageY/zim.scaY};
|
|
74388
74445
|
if (!that.boundary.shape.hitTestPoint(pp.x,pp.y)) return;
|
|
@@ -83177,7 +83234,6 @@ dispatches an "undo" and a "redo" whenever undo and redo happens
|
|
|
83177
83234
|
that.stop = function() {that.stopCheck(true);};
|
|
83178
83235
|
that.infinite = false;
|
|
83179
83236
|
that.stopCheck = function(override) {
|
|
83180
|
-
|
|
83181
83237
|
if (!override) {
|
|
83182
83238
|
if (that.infinite) return;
|
|
83183
83239
|
if (that.zimDragCheck) return;
|
|
@@ -91394,6 +91450,7 @@ new Circle(100, blue.darken(.5)).center();
|
|
|
91394
91450
|
new Circle(100, blue.toColor(red, .2)).center();
|
|
91395
91451
|
END EXAMPLE
|
|
91396
91452
|
--*///+83.55
|
|
91453
|
+
// note - first 9 or 10 colors are used in THEME
|
|
91397
91454
|
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)"];
|
|
91398
91455
|
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"];
|
|
91399
91456
|
for (z_i=0; z_i<zim.colors.length; z_i++) {
|
|
@@ -94527,9 +94584,9 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94527
94584
|
zim.THEME = window.THEME = {name:theme, lightenRatio:lightenRatio, tint:tint, tintRatio:tintRatio, exclude:exclude};
|
|
94528
94585
|
var colors = {};
|
|
94529
94586
|
var c;
|
|
94530
|
-
var cn = zim.colors.slice(0,
|
|
94531
|
-
// ["red", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
|
|
94532
|
-
var gn = zim.colors.slice(
|
|
94587
|
+
var cn = zim.colors.slice(0,9);
|
|
94588
|
+
// ["red", "salmon", "orange", "yellow", "green", "blue", "purple", "pink", "brown", "interstellar"];
|
|
94589
|
+
var gn = zim.colors.slice(9,26);
|
|
94533
94590
|
// ["black","licorice","darker","dark","charcoal","grey","gray","granite","tin","pewter","silver","fog","mist","light","moon","lighter","white"];
|
|
94534
94591
|
if (theme == "zim") {
|
|
94535
94592
|
zim.loop(zim.colors, function(color, i) {
|
|
@@ -94544,12 +94601,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94544
94601
|
colors[color] = zim.colorsHex[i+8];
|
|
94545
94602
|
});
|
|
94546
94603
|
} else if (theme == "future") {
|
|
94547
|
-
c = ["f25019","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
|
|
94604
|
+
c = ["f25019","f88e82","fd8918","ffc955","1dcfae","00a5ab","007175","00969b","d6b361"];
|
|
94548
94605
|
zim.loop(cn, function(color, i) {
|
|
94549
94606
|
colors[color] = "#"+c[i];
|
|
94550
94607
|
});
|
|
94551
94608
|
zim.loop(gn, function(color, i) {
|
|
94552
|
-
colors[color] = zim.colorsHex[i+
|
|
94609
|
+
colors[color] = zim.colorsHex[i+9].toColor("#1dcfae",.4-i*.025);
|
|
94553
94610
|
});
|
|
94554
94611
|
} else if (theme == "invert") {
|
|
94555
94612
|
colors = {};
|
|
@@ -94563,34 +94620,34 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94563
94620
|
colors[color] = "#"+c[i];
|
|
94564
94621
|
});
|
|
94565
94622
|
} else if (theme == "neon") {
|
|
94566
|
-
c = ["FF3624","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
|
|
94623
|
+
c = ["FF3624","fd6f6f","ff6f00","e2f705","a3f307","05f9e2","ED0AF5","ff33c9","e16d00"];
|
|
94567
94624
|
zim.loop(cn, function(color, i) {
|
|
94568
94625
|
colors[color] = "#"+c[i];
|
|
94569
94626
|
});
|
|
94570
94627
|
zim.loop(gn, function(color, i) {
|
|
94571
|
-
colors[color] = zim.colorsHex[i+
|
|
94628
|
+
colors[color] = zim.colorsHex[i+9].toColor("#000",.9);
|
|
94572
94629
|
});
|
|
94573
94630
|
colors["light"] = zim.lighter;
|
|
94574
94631
|
colors["moon"] = zim.lighter;
|
|
94575
94632
|
colors["lighter"] = zim.white;
|
|
94576
94633
|
colors["white"] = zim.white;
|
|
94577
94634
|
} else if (theme == "seventies") {
|
|
94578
|
-
c = ["e5771e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
|
|
94635
|
+
c = ["e5771e","d66a5e","f4a127","ffecb4","6F8212","75c8ae","5a3d2b","956e4e","4c3607"];
|
|
94579
94636
|
zim.loop(cn, function(color, i) {
|
|
94580
94637
|
colors[color] = "#"+c[i];
|
|
94581
94638
|
});
|
|
94582
94639
|
zim.loop(gn, function(color, i) {
|
|
94583
94640
|
// colors[color] = zim.colorsHex[i+8].toColor("#568203",1-i*.06);
|
|
94584
|
-
colors[color] = zim.colorsHex[i+
|
|
94641
|
+
colors[color] = zim.colorsHex[i+9].toColor(i<8?"#344f00":"#f4a127",.8-i*.04);
|
|
94585
94642
|
});
|
|
94586
94643
|
} else if (theme == "warm") {
|
|
94587
|
-
c = ["965746","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
|
|
94644
|
+
c = ["965746","dd5c4d","c07768","ffecb4","8da279","6da0b1","745c58","9a7e79","be8858"];
|
|
94588
94645
|
zim.loop(cn, function(color, i) {
|
|
94589
94646
|
colors[color] = "#"+c[i];
|
|
94590
94647
|
});
|
|
94591
94648
|
zim.loop(gn, function(color, i) {
|
|
94592
94649
|
// colors[color] = zim.colorsHex[i+8].toColor("#965746",.1);
|
|
94593
|
-
colors[color] = zim.colorsHex[i+
|
|
94650
|
+
colors[color] = zim.colorsHex[i+9].toColor(i<8?"#4e352e":"#745c58",.8-i*.05);
|
|
94594
94651
|
});
|
|
94595
94652
|
} else if (theme.constructor == {}.constructor) {
|
|
94596
94653
|
colors = theme;
|
|
@@ -94601,12 +94658,12 @@ THEME - a Theme object literal with name, lightnessRatio, tint, tintRatio and ex
|
|
|
94601
94658
|
zim.loop(exclude, function(item) {
|
|
94602
94659
|
if (item.toLowerCase()=="colors") {
|
|
94603
94660
|
zim.loop(zim.colors, function(color, i) {
|
|
94604
|
-
if (i >=
|
|
94661
|
+
if (i >= 9) return 1;
|
|
94605
94662
|
exclude.push(color);
|
|
94606
94663
|
});
|
|
94607
94664
|
} else if (item.toLowerCase()=="greys" || item.toLowerCase()=="grays") {
|
|
94608
94665
|
zim.loop(zim.colors, function(color, i) {
|
|
94609
|
-
if (i <
|
|
94666
|
+
if (i < 9) return;
|
|
94610
94667
|
exclude.push(color);
|
|
94611
94668
|
});
|
|
94612
94669
|
}
|
|
@@ -3138,17 +3138,17 @@ declare namespace zim {
|
|
|
3138
3138
|
export class Pages extends Container {
|
|
3139
3139
|
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?: {})
|
|
3140
3140
|
constructor(config: { pages?: DisplayObject[] | { page: DisplayObject, swipe?: DisplayObject[] }[], transition?: string, speed?: number, transitionTable?: any[][], holder?: Stage | Container, arrowDisableColor?: color, style?: boolean, group?: string, inherit?: {} })
|
|
3141
|
-
addPage(page: DisplayObject, swipeArray?: string[]):
|
|
3142
|
-
removePage(page: DisplayObject):
|
|
3143
|
-
setSwipeArray(page: DisplayObject, swipeArray?: string[]):
|
|
3144
|
-
go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number):
|
|
3145
|
-
resize():
|
|
3146
|
-
pause():
|
|
3147
|
-
unpause():
|
|
3148
|
-
puff(time: number):
|
|
3149
|
-
settle():
|
|
3150
|
-
disable():
|
|
3151
|
-
enable():
|
|
3141
|
+
addPage(page: DisplayObject, swipeArray?: string[]): this
|
|
3142
|
+
removePage(page: DisplayObject): this
|
|
3143
|
+
setSwipeArray(page: DisplayObject, swipeArray?: string[]): this
|
|
3144
|
+
go(newPage: DisplayObject | number, direction: string, trans?: string, ms?: number): this
|
|
3145
|
+
resize(): this
|
|
3146
|
+
pause(): this
|
|
3147
|
+
unpause(): this
|
|
3148
|
+
puff(time: number): this
|
|
3149
|
+
settle(): this
|
|
3150
|
+
disable(): this
|
|
3151
|
+
enable(): this
|
|
3152
3152
|
dispose(): boolean
|
|
3153
3153
|
readonly type: string
|
|
3154
3154
|
speed: number
|