uil 4.2.2 → 4.2.3
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/README.md +1 -1
- package/build/uil.js +82 -104
- package/build/uil.min.js +1 -1
- package/build/uil.module.js +88 -137
- package/package.json +1 -1
package/build/uil.module.js
CHANGED
|
@@ -969,7 +969,7 @@ const T = {
|
|
|
969
969
|
if( o.fontSelect ) color.textSelect = o.fontSelect;
|
|
970
970
|
if( o.groupBorder ) color.gborder = o.groupBorder;
|
|
971
971
|
|
|
972
|
-
if( o.transparent ) o.bg = 'none'
|
|
972
|
+
//if( o.transparent ) o.bg = 'none'
|
|
973
973
|
//if( o.bg ) color.background = color.backgroundOver = o.bg
|
|
974
974
|
if( o.bgOver ) color.backgroundOver = o.bgOver;
|
|
975
975
|
|
|
@@ -993,8 +993,8 @@ const T = {
|
|
|
993
993
|
sy: 3,
|
|
994
994
|
|
|
995
995
|
content:'none',
|
|
996
|
-
background: 'rgba(50,50,50,0.
|
|
997
|
-
backgroundOver: 'rgba(50,50,50,0.
|
|
996
|
+
background: 'rgba(50,50,50,0.15)',
|
|
997
|
+
backgroundOver: 'rgba(50,50,50,0.3)',
|
|
998
998
|
|
|
999
999
|
title : '#CCC',
|
|
1000
1000
|
titleoff : '#BBB',
|
|
@@ -1002,26 +1002,22 @@ const T = {
|
|
|
1002
1002
|
textOver : '#EEE',
|
|
1003
1003
|
textSelect : '#FFF',
|
|
1004
1004
|
|
|
1005
|
-
//inputBg: 'rgba(0,0,0,0.25)',
|
|
1006
|
-
//itemBg:'rgba(0,0,0,0.25)',
|
|
1007
|
-
|
|
1008
1005
|
back:'rgba(0,0,0,0.2)',
|
|
1009
1006
|
backoff:'rgba(0,0,0,0.3)',
|
|
1010
|
-
//inputOver: 'rgba(0,0,0,0.2)',
|
|
1011
1007
|
|
|
1012
1008
|
// input and button border
|
|
1013
1009
|
border : '#4c4c4c',
|
|
1014
1010
|
borderSize : 1,
|
|
1015
|
-
gborder : 'none',
|
|
1016
1011
|
|
|
1012
|
+
gborder : 'none',
|
|
1017
1013
|
groups : 'none',
|
|
1014
|
+
|
|
1018
1015
|
button : '#3c3c3c',
|
|
1019
1016
|
overoff : '#5c5c5c',
|
|
1020
1017
|
over : '#024699',
|
|
1021
1018
|
select : '#308AFF',
|
|
1022
1019
|
action: '#FF3300',
|
|
1023
1020
|
|
|
1024
|
-
|
|
1025
1021
|
//fontFamily: 'Tahoma',
|
|
1026
1022
|
fontFamily: 'Consolas, monospace',
|
|
1027
1023
|
//fontFamily: "'Roboto Mono', 'Source Code Pro', Menlo, Courier, monospace",
|
|
@@ -1029,7 +1025,7 @@ const T = {
|
|
|
1029
1025
|
fontShadow: 'none',//'#000',
|
|
1030
1026
|
fontSize:12,
|
|
1031
1027
|
|
|
1032
|
-
radius:
|
|
1028
|
+
radius:4,
|
|
1033
1029
|
hide: 'rgba(0,0,0,0)',
|
|
1034
1030
|
|
|
1035
1031
|
},
|
|
@@ -1038,14 +1034,9 @@ const T = {
|
|
|
1038
1034
|
|
|
1039
1035
|
css : {
|
|
1040
1036
|
|
|
1041
|
-
//unselect: '-o-user-select:none; -ms-user-select:none; -khtml-user-select:none; -webkit-user-select:none; -moz-user-select:none;',
|
|
1042
1037
|
basic: 'position:absolute; pointer-events:none; box-sizing:border-box; margin:0; padding:0; overflow:hidden; ' + '-o-user-select:none; -ms-user-select:none; -khtml-user-select:none; -webkit-user-select:none; -moz-user-select:none;',
|
|
1043
|
-
button:'display:flex;
|
|
1044
|
-
middle:'display:flex; align-items:center;'
|
|
1045
|
-
|
|
1046
|
-
/*txt: T.css.basic + 'font-family:'+ T.colors.fontFamily +'; font-size:'+T.colors.fontSize+'px; color:'+T.colors.text+'; padding:2px 10px; left:0; top:2px; height:16px; width:100px; overflow:hidden; white-space: nowrap;',
|
|
1047
|
-
txtselect: T.css.txt + 'display:flex; justify-content:left; align-items:center; text-align:left;' +'padding:2px 5px; border:1px dashed ' + T.colors.border + '; background:'+ T.colors.txtselectbg+';',
|
|
1048
|
-
item: T.css.txt + 'position:relative; background:rgba(0,0,0,0.2); margin-bottom:1px;',*/
|
|
1038
|
+
button:'display:flex; align-items:center; justify-content:center; text-align:center;',
|
|
1039
|
+
middle:'display:flex; align-items:center; justify-content:left; text-align:left; flex-direction: row-reverse;'
|
|
1049
1040
|
},
|
|
1050
1041
|
|
|
1051
1042
|
// svg path
|
|
@@ -1057,6 +1048,7 @@ const T = {
|
|
|
1057
1048
|
|
|
1058
1049
|
group:'M 7 7 L 7 8 8 8 8 7 7 7 M 5 7 L 5 8 6 8 6 7 5 7 M 3 7 L 3 8 4 8 4 7 3 7 M 7 5 L 7 6 8 6 8 5 7 5 M 6 6 L 6 5 5 5 5 6 6 6 M 7 3 L 7 4 8 4 8 3 7 3 M 6 4 L 6 3 5 3 5 4 6 4 M 3 5 L 3 6 4 6 4 5 3 5 M 3 3 L 3 4 4 4 4 3 3 3 Z',
|
|
1059
1050
|
arrow:'M 3 8 L 8 5 3 2 3 8 Z',
|
|
1051
|
+
|
|
1060
1052
|
arrowDown:'M 5 8 L 8 3 2 3 5 8 Z',
|
|
1061
1053
|
arrowUp:'M 5 2 L 2 7 8 7 5 2 Z',
|
|
1062
1054
|
|
|
@@ -1123,16 +1115,13 @@ const T = {
|
|
|
1123
1115
|
else size += 'px';
|
|
1124
1116
|
|
|
1125
1117
|
|
|
1126
|
-
let align = 'display:flex; justify-content:left; align-items:center; text-align:left;'
|
|
1118
|
+
//let align = 'display:flex; justify-content:left; align-items:center; text-align:left;'
|
|
1127
1119
|
|
|
1128
|
-
T.css.txt = T.css.basic +
|
|
1120
|
+
T.css.txt = T.css.basic + T.css.middle + ' font-family:'+ font +'; font-weight:'+weight+'; font-size:'+size+'; color:'+cc.text+'; padding:0px 8px; left:0; top:2px; height:16px; width:100px; overflow:hidden; white-space: nowrap; letter-spacing: normal;';
|
|
1129
1121
|
if( shadow !== 'none' ) T.css.txt += ' text-shadow: 1px 1px 1px '+shadow+';';
|
|
1130
1122
|
|
|
1131
1123
|
T.css.txtselect = T.css.txt + 'padding:0px 4px; border:1px dashed ' + cc.border + ';';
|
|
1132
|
-
|
|
1133
|
-
T.css.item = T.css.txt + ' position:relative; margin-bottom:1px; display:block; padding:2px 4px;';//
|
|
1134
|
-
|
|
1135
|
-
//console.log( T.css.txt )
|
|
1124
|
+
T.css.item = T.css.txt + 'padding:0px 4px; position:relative; margin-bottom:1px; ';
|
|
1136
1125
|
|
|
1137
1126
|
},
|
|
1138
1127
|
|
|
@@ -4484,63 +4473,17 @@ class Group extends Proto {
|
|
|
4484
4473
|
|
|
4485
4474
|
const cc = this.colors;
|
|
4486
4475
|
|
|
4487
|
-
this.isLine = o.line !== undefined ? o.line : false;
|
|
4488
|
-
|
|
4489
|
-
|
|
4490
|
-
|
|
4491
4476
|
this.useFlex = true;
|
|
4492
4477
|
let flexible = this.useFlex ? 'display:flex; flex-flow: row wrap;' : '';
|
|
4493
4478
|
|
|
4494
|
-
this.c[2] = this.dom( 'div', this.css.basic + flexible + 'width:100%; left:0; height:auto; overflow:hidden; top:'+(this.h
|
|
4479
|
+
this.c[2] = this.dom( 'div', this.css.basic + flexible + 'width:100%; left:0; height:auto; overflow:hidden; top:'+(this.h)+'px');
|
|
4495
4480
|
this.c[3] = this.dom( 'path', this.css.basic + 'position:absolute; width:6px; height:6px; left:0; top:'+fltop+'px;', { d:this.svgs.g1, fill:cc.text, stroke:'none'});
|
|
4496
|
-
//this.c[3] = this.dom( 'path', this.css.basic + 'position:absolute; width:10px; height:10px; left:0; top:'+fltop+'px;', { d:this.svgs.group, fill:cc.text, stroke:'none'})
|
|
4497
|
-
//this.c[3] = this.dom( 'path', this.css.basic + 'position:absolute; width:10px; height:10px; left:0; top:'+fltop+'px;', { d:this.svgs.group, fill:cc.text, stroke:'none'})
|
|
4498
|
-
//this.c[4] = this.dom( 'path', this.css.basic + 'position:absolute; width:10px; height:10px; left:'+(this.decal-1)+'px; top:'+fltop+'px;', { d:this.svgs.arrow, fill:cc.text, stroke:'none'})
|
|
4499
4481
|
|
|
4500
|
-
|
|
4501
|
-
|
|
4502
|
-
// bottom line
|
|
4503
|
-
if( this.isLine ) this.c[5] = this.dom( 'div', this.css.basic + 'background:rgba(255, 255, 255, 0.2); width:100%; left:0; height:1px; bottom:0px');
|
|
4504
|
-
//else this.c[5] = this.dom( 'div', this.css.basic + 'width:100%; left:0; height:auto; top:'+(this.h-1)+'px')
|
|
4505
|
-
|
|
4506
|
-
let s = this.s;
|
|
4507
|
-
s[0].height = this.h + 'px';
|
|
4482
|
+
this.s;
|
|
4508
4483
|
this.c[1].name = 'group';
|
|
4509
4484
|
|
|
4510
|
-
if( cc.groups !== 'none' ){
|
|
4511
|
-
|
|
4512
|
-
s[1].background = cc.groups;
|
|
4513
|
-
s[1].border = cc.borderSize+'px solid '+ cc.border;
|
|
4514
|
-
s[1].borderRadius = this.radius+'px';
|
|
4515
|
-
|
|
4516
|
-
//s[5].border = '2px solid ' + '#000'
|
|
4517
|
-
//s[1].marginRight = 10+'px';
|
|
4518
|
-
}
|
|
4519
|
-
|
|
4520
|
-
//this.c[1].innerHTML = this.dd + this.name
|
|
4521
|
-
|
|
4522
|
-
//s[1].padding = '0px ' + (10+this.decal)+'px';
|
|
4523
|
-
|
|
4524
|
-
s[1].lineHeight = this.h-4;
|
|
4525
|
-
s[1].color = cc.text;
|
|
4526
|
-
//s[1].fontWeight = 'bold';
|
|
4527
|
-
|
|
4528
|
-
|
|
4529
|
-
|
|
4530
|
-
|
|
4531
|
-
|
|
4532
4485
|
this.init();
|
|
4533
4486
|
|
|
4534
|
-
if( this.radius !== 0 ){
|
|
4535
|
-
//s[0].borderRadius = this.radius+'px'
|
|
4536
|
-
|
|
4537
|
-
s[1].borderRadius = this.radius+'px';
|
|
4538
|
-
s[2].borderRadius = this.radius+'px';
|
|
4539
|
-
}
|
|
4540
|
-
|
|
4541
|
-
|
|
4542
|
-
//s[1].paddingLeft = (10+this.decal)+'px'
|
|
4543
|
-
|
|
4544
4487
|
this.setBG( o.bg );
|
|
4545
4488
|
|
|
4546
4489
|
if( o.open ) this.open();
|
|
@@ -4549,22 +4492,33 @@ class Group extends Proto {
|
|
|
4549
4492
|
|
|
4550
4493
|
setBG ( bg ) {
|
|
4551
4494
|
|
|
4552
|
-
this.colors;
|
|
4553
|
-
|
|
4495
|
+
const cc = this.colors;
|
|
4554
4496
|
const s = this.s;
|
|
4555
4497
|
|
|
4556
|
-
|
|
4498
|
+
if( bg !== undefined ) cc.groups = bg;
|
|
4499
|
+
if(cc.groups === 'none') cc.groups = cc.background;
|
|
4500
|
+
cc.background = 'none';
|
|
4557
4501
|
|
|
4558
|
-
|
|
4559
|
-
s[1].background =
|
|
4560
|
-
s[2].background =
|
|
4502
|
+
s[0].background = 'none';
|
|
4503
|
+
s[1].background = cc.groups;
|
|
4504
|
+
s[2].background = cc.groups;
|
|
4561
4505
|
|
|
4562
|
-
|
|
4563
|
-
|
|
4506
|
+
if( cc.gborder !== 'none' ){
|
|
4507
|
+
s[1].border = cc.borderSize+'px solid '+ cc.gborder;
|
|
4508
|
+
}
|
|
4564
4509
|
|
|
4510
|
+
if( this.radius !== 0 ){
|
|
4565
4511
|
|
|
4512
|
+
s[1].borderRadius = this.radius+'px';
|
|
4513
|
+
s[2].borderRadius = this.radius+'px';
|
|
4566
4514
|
|
|
4567
|
-
|
|
4515
|
+
}
|
|
4516
|
+
|
|
4517
|
+
/*let i = this.uis.length;
|
|
4518
|
+
while(i--){
|
|
4519
|
+
this.uis[i].setBG( 'none' );
|
|
4520
|
+
//this.uis[i].setBG( this.colors.background );
|
|
4521
|
+
}*/
|
|
4568
4522
|
|
|
4569
4523
|
}
|
|
4570
4524
|
|
|
@@ -4768,13 +4722,14 @@ class Group extends Proto {
|
|
|
4768
4722
|
super.open();
|
|
4769
4723
|
|
|
4770
4724
|
this.setSvg( this.c[3], 'd', this.svgs.g2 );
|
|
4771
|
-
|
|
4772
|
-
//this.setSvg( this.c[4], 'd', this.svgs.arrowDown )
|
|
4773
4725
|
this.rSizeContent();
|
|
4774
4726
|
|
|
4775
4727
|
this.h - this.baseH;
|
|
4776
4728
|
|
|
4777
4729
|
const s = this.s;
|
|
4730
|
+
const cc = this.colors;
|
|
4731
|
+
|
|
4732
|
+
s[2].top = (this.h-1) + 'px';
|
|
4778
4733
|
|
|
4779
4734
|
if(this.radius){
|
|
4780
4735
|
|
|
@@ -4786,10 +4741,15 @@ class Group extends Proto {
|
|
|
4786
4741
|
s[2].borderBottomLeftRadius = this.radius+'px';
|
|
4787
4742
|
s[2].borderBottomRightRadius = this.radius+'px';
|
|
4788
4743
|
}
|
|
4789
|
-
|
|
4790
4744
|
|
|
4745
|
+
if( cc.gborder !== 'none' ){
|
|
4791
4746
|
|
|
4747
|
+
s[2].border = cc.borderSize+'px solid '+ cc.gborder;
|
|
4748
|
+
s[2].borderTop = 'none';
|
|
4749
|
+
s[1].borderBottom = cc.borderSize+'px solid rgba(0,0,0,0)';
|
|
4792
4750
|
|
|
4751
|
+
}
|
|
4752
|
+
|
|
4793
4753
|
this.parentHeight();
|
|
4794
4754
|
|
|
4795
4755
|
}
|
|
@@ -4802,11 +4762,21 @@ class Group extends Proto {
|
|
|
4802
4762
|
|
|
4803
4763
|
this.setSvg( this.c[3], 'd', this.svgs.g1 );
|
|
4804
4764
|
|
|
4805
|
-
//this.setSvg( this.c[4], 'd', this.svgs.arrow )
|
|
4806
4765
|
this.h = this.baseH;
|
|
4807
4766
|
|
|
4808
4767
|
const s = this.s;
|
|
4768
|
+
const cc = this.colors;
|
|
4769
|
+
|
|
4809
4770
|
s[0].height = this.h + 'px';
|
|
4771
|
+
//s[1].height = (this.h-2) + 'px'
|
|
4772
|
+
s[2].top = this.h + 'px';
|
|
4773
|
+
|
|
4774
|
+
if( cc.gborder !== 'none' ){
|
|
4775
|
+
|
|
4776
|
+
s[2].border = 'none';
|
|
4777
|
+
s[1].border = cc.borderSize+'px solid '+ cc.gborder;
|
|
4778
|
+
}
|
|
4779
|
+
|
|
4810
4780
|
if(this.radius) s[1].borderRadius = this.radius+'px';
|
|
4811
4781
|
|
|
4812
4782
|
this.parentHeight();
|
|
@@ -4861,14 +4831,9 @@ class Group extends Proto {
|
|
|
4861
4831
|
|
|
4862
4832
|
s[1].width = this.w + 'px';
|
|
4863
4833
|
s[2].width = this.w + 'px';
|
|
4864
|
-
//s[1].width = (this.w - this.decal) + 'px'
|
|
4865
|
-
//s[2].width = (this.w - this.decal) + 'px'
|
|
4866
|
-
|
|
4867
4834
|
s[1].left = (this.decal) + 'px';
|
|
4868
4835
|
s[2].left = (this.decal) + 'px';
|
|
4869
4836
|
|
|
4870
|
-
|
|
4871
|
-
|
|
4872
4837
|
if( this.isOpen ) this.rSizeContent();
|
|
4873
4838
|
|
|
4874
4839
|
}
|
|
@@ -5390,9 +5355,10 @@ class List extends Proto {
|
|
|
5390
5355
|
this.tmpImage = {};
|
|
5391
5356
|
this.tmpUrl = [];
|
|
5392
5357
|
|
|
5393
|
-
|
|
5358
|
+
this.m = o.m !== undefined ? o.m : 5;
|
|
5359
|
+
|
|
5394
5360
|
|
|
5395
|
-
let align = o.align || '
|
|
5361
|
+
let align = o.align || 'left';
|
|
5396
5362
|
|
|
5397
5363
|
// scroll size
|
|
5398
5364
|
let ss = o.scrollSize || 10;
|
|
@@ -5415,7 +5381,7 @@ class List extends Proto {
|
|
|
5415
5381
|
let cc = this.colors;
|
|
5416
5382
|
|
|
5417
5383
|
this.c[2] = this.dom( 'div', this.css.basic + 'top:0; display:none; border-radius:'+this.radius+'px;' );
|
|
5418
|
-
this.c[3] = this.dom( 'div', this.css.item + 'position:absolute; text-align:'+align+'; line-height:'+(this.h-4)+'px; top:1px; background:'+cc.button+'; height:'+(this.h-2)+'px; border:1px solid '+cc.border+'; border-radius:'+this.radius+'px;' );
|
|
5384
|
+
this.c[3] = this.dom( 'div', this.css.item + 'padding:0px '+this.m+'px; margin-bottom:0px; position:absolute; justify-content:'+align+'; text-align:'+align+'; line-height:'+(this.h-4)+'px; top:1px; background:'+cc.button+'; height:'+(this.h-2)+'px; border:1px solid '+cc.border+'; border-radius:'+this.radius+'px;' );
|
|
5419
5385
|
this.c[4] = this.dom( 'path', this.css.basic + 'position:absolute; width:6px; height:6px; top:'+fltop+'px;', { d:this.svgs.g1, fill:cc.text, stroke:'none'});
|
|
5420
5386
|
|
|
5421
5387
|
this.scrollerBack = this.dom( 'div', this.css.basic + 'right:0px; width:'+ss+'px; background:'+cc.back+'; display:none;');
|
|
@@ -5427,12 +5393,12 @@ class List extends Proto {
|
|
|
5427
5393
|
this.list = [];
|
|
5428
5394
|
this.refObject = null;
|
|
5429
5395
|
|
|
5430
|
-
if(o.list){
|
|
5396
|
+
if( o.list ){
|
|
5431
5397
|
if( o.list instanceof Array ){
|
|
5432
5398
|
this.list = o.list;
|
|
5433
|
-
} else {
|
|
5399
|
+
} else if( o.list instanceof Object ){
|
|
5434
5400
|
this.refObject = o.list;
|
|
5435
|
-
for( let g in this.refObject ) this.list.push(g);
|
|
5401
|
+
for( let g in this.refObject ) this.list.push( g );
|
|
5436
5402
|
}
|
|
5437
5403
|
}
|
|
5438
5404
|
|
|
@@ -5442,7 +5408,7 @@ class List extends Proto {
|
|
|
5442
5408
|
|
|
5443
5409
|
this.baseH = this.h;
|
|
5444
5410
|
|
|
5445
|
-
this.itemHeight = o.itemHeight || (this.h-3);
|
|
5411
|
+
this.itemHeight = o.itemHeight || this.h;//(this.h-3);
|
|
5446
5412
|
|
|
5447
5413
|
// force full list
|
|
5448
5414
|
this.full = o.full || false;
|
|
@@ -5463,7 +5429,6 @@ class List extends Proto {
|
|
|
5463
5429
|
this.c[2].style.top = 'auto';
|
|
5464
5430
|
this.c[3].style.top = 'auto';
|
|
5465
5431
|
this.c[4].style.top = 'auto';
|
|
5466
|
-
//this.c[5].style.top = 'auto';
|
|
5467
5432
|
|
|
5468
5433
|
this.c[2].style.bottom = this.h-2 + 'px';
|
|
5469
5434
|
this.c[3].style.bottom = '1px';
|
|
@@ -5521,13 +5486,6 @@ class List extends Proto {
|
|
|
5521
5486
|
|
|
5522
5487
|
}
|
|
5523
5488
|
|
|
5524
|
-
/*send ( v ) {
|
|
5525
|
-
|
|
5526
|
-
super.send( v );
|
|
5527
|
-
|
|
5528
|
-
//Proto.prototype.send.call( this, v );
|
|
5529
|
-
}*/
|
|
5530
|
-
|
|
5531
5489
|
// image list
|
|
5532
5490
|
|
|
5533
5491
|
preloadImage () {
|
|
@@ -5717,9 +5675,9 @@ class List extends Proto {
|
|
|
5717
5675
|
this.value = this.list[ this.current.id ];
|
|
5718
5676
|
|
|
5719
5677
|
if( this.isSelectable ) this.selected();
|
|
5720
|
-
|
|
5721
|
-
//this.
|
|
5722
|
-
this.send( this.
|
|
5678
|
+
|
|
5679
|
+
//this.send( this.refObject !== null ? this.refObject[ this.list[this.current.id]] : this.value );
|
|
5680
|
+
this.send( this.value );
|
|
5723
5681
|
|
|
5724
5682
|
if( !this.listOnly ) {
|
|
5725
5683
|
this.close();
|
|
@@ -5894,8 +5852,8 @@ class List extends Proto {
|
|
|
5894
5852
|
for( let i=0; i<this.length; i++ ){
|
|
5895
5853
|
|
|
5896
5854
|
n = this.list[i];
|
|
5897
|
-
item = this.dom( 'div', this.css.item + 'width:'+this.ww+'px; height:'+this.itemHeight+'px; line-height:'+(this.itemHeight-
|
|
5898
|
-
item.name = 'item'+i;
|
|
5855
|
+
item = this.dom( 'div', this.css.item + 'padding:0px '+(this.m+1)+'px; width:'+this.ww+'px; height:'+this.itemHeight+'px; line-height:'+(this.itemHeight-2)+'px; color:'+this.colors.text+'; background:'+this.colors.back+';' );
|
|
5856
|
+
item.name = 'item'+ i;
|
|
5899
5857
|
item.id = i;
|
|
5900
5858
|
item.select = false;
|
|
5901
5859
|
item.posy = (this.itemHeight+1)*i;
|
|
@@ -5912,6 +5870,8 @@ class List extends Proto {
|
|
|
5912
5870
|
let c = new Image();
|
|
5913
5871
|
c.src = this.tmpCanvas.toDataURL();
|
|
5914
5872
|
|
|
5873
|
+
//item.style.marginLeft = (this.imageSize[0]+8)+'px'
|
|
5874
|
+
|
|
5915
5875
|
|
|
5916
5876
|
/*let c = document.createElement('canvas')
|
|
5917
5877
|
|
|
@@ -5920,7 +5880,11 @@ class List extends Proto {
|
|
|
5920
5880
|
let ctx = c.getContext("2d")
|
|
5921
5881
|
ctx.fillStyle = this.canvasBg
|
|
5922
5882
|
ctx.fillRect(0, 0, this.imageSize[0], this.imageSize[1])*/
|
|
5923
|
-
|
|
5883
|
+
|
|
5884
|
+
//c.style.cssText = 'position:relative; pointer-events:none; display:inline-block; float:left; margin-left:0px; margin-right:5px; top:2px'
|
|
5885
|
+
// c.style.cssText =' flex-shrink: 0;'
|
|
5886
|
+
|
|
5887
|
+
c.style.cssText ='margin-right:4px;';
|
|
5924
5888
|
|
|
5925
5889
|
|
|
5926
5890
|
//c.style.cssText = 'display:flex; align-content: flex-start; flex-wrap: wrap;'
|
|
@@ -5931,12 +5895,12 @@ class List extends Proto {
|
|
|
5931
5895
|
|
|
5932
5896
|
}
|
|
5933
5897
|
|
|
5934
|
-
if(this.dragout){
|
|
5898
|
+
if( this.dragout ){
|
|
5935
5899
|
|
|
5936
5900
|
item.img = this.tmpImage[n];
|
|
5937
5901
|
|
|
5938
5902
|
item.style.pointerEvents = 'auto';
|
|
5939
|
-
item.draggable="true";
|
|
5903
|
+
item.draggable = "true";
|
|
5940
5904
|
|
|
5941
5905
|
item.addEventListener('dragstart', this.dragstart || function(){ /*console.log('drag start')*/});
|
|
5942
5906
|
item.addEventListener('drag', this.drag || function(){ /*console.log('drag start')*/});
|
|
@@ -5956,6 +5920,7 @@ class List extends Proto {
|
|
|
5956
5920
|
}
|
|
5957
5921
|
|
|
5958
5922
|
drawImage( name, image, x,y,w,h ){
|
|
5923
|
+
|
|
5959
5924
|
this.tmpCtx.clearRect(0, 0, this.imageSize[0], this.imageSize[1]);
|
|
5960
5925
|
this.tmpCtx.drawImage(image, x, y, w, h, 0, 0, this.imageSize[0], this.imageSize[1]);
|
|
5961
5926
|
this.tmpImage[name].src = this.tmpCanvas.toDataURL();
|
|
@@ -5986,18 +5951,20 @@ class List extends Proto {
|
|
|
5986
5951
|
|
|
5987
5952
|
setTopItem (){
|
|
5988
5953
|
|
|
5989
|
-
if(this.staticTop) return;
|
|
5954
|
+
if( this.staticTop ) return;
|
|
5990
5955
|
|
|
5991
|
-
if( this.isWithImage ){
|
|
5956
|
+
if( this.isWithImage ){
|
|
5992
5957
|
|
|
5993
|
-
if(
|
|
5958
|
+
if(!this.preLoadComplete ) return;
|
|
5994
5959
|
|
|
5995
5960
|
if(!this.c[3].children.length){
|
|
5996
5961
|
this.canvas = document.createElement('canvas');
|
|
5997
5962
|
this.canvas.width = this.imageSize[0];
|
|
5998
5963
|
this.canvas.height = this.imageSize[1];
|
|
5999
|
-
this.canvas.style.cssText =
|
|
5964
|
+
this.canvas.style.cssText ='margin-right:4px;';
|
|
6000
5965
|
this.ctx = this.canvas.getContext("2d");
|
|
5966
|
+
this.c[3].style.textAlign = 'left';
|
|
5967
|
+
this.c[3].style.justifyContent = 'left';
|
|
6001
5968
|
this.c[3].appendChild( this.canvas );
|
|
6002
5969
|
}
|
|
6003
5970
|
|
|
@@ -6014,13 +5981,11 @@ class List extends Proto {
|
|
|
6014
5981
|
this.canvas = document.createElement('canvas');
|
|
6015
5982
|
this.canvas.width = this.imageSize[0];
|
|
6016
5983
|
this.canvas.height = this.imageSize[1];
|
|
6017
|
-
|
|
6018
|
-
this.canvas.style.cssText = 'position:relative; pointer-events:none; display:inline-block; float:left; margin-left:0px; margin-right:5px; top:2px';
|
|
6019
|
-
//this.canvas.style.cssText = 'position:absolute; top:'+h+'px; left:5px;'
|
|
5984
|
+
this.canvas.style.cssText ='margin-right:4px;';
|
|
6020
5985
|
this.ctx = this.canvas.getContext("2d");
|
|
6021
5986
|
this.c[3].style.textAlign = 'left';
|
|
5987
|
+
this.c[3].style.justifyContent = 'left';
|
|
6022
5988
|
this.c[3].appendChild( this.canvas );
|
|
6023
|
-
|
|
6024
5989
|
}
|
|
6025
5990
|
|
|
6026
5991
|
this.ctx.drawImage( this.tmpImage[ this.value ], 0, 0 );
|
|
@@ -7323,11 +7288,6 @@ class Bitmap extends Proto {
|
|
|
7323
7288
|
let up = false;
|
|
7324
7289
|
|
|
7325
7290
|
let name = this.testZone( e );
|
|
7326
|
-
//let sel = false;
|
|
7327
|
-
|
|
7328
|
-
|
|
7329
|
-
|
|
7330
|
-
//console.log(name)
|
|
7331
7291
|
|
|
7332
7292
|
if( name === 'over' ){
|
|
7333
7293
|
this.cursor('pointer');
|
|
@@ -7366,7 +7326,7 @@ class Bitmap extends Proto {
|
|
|
7366
7326
|
|
|
7367
7327
|
if( this.img !== null ){
|
|
7368
7328
|
if( this.objectLink !== null ) this.objectLink[ this.val ] = v;
|
|
7369
|
-
if( this.callback ) this.callback(
|
|
7329
|
+
if( this.callback ) this.callback( this.value, this.img, this.name );
|
|
7370
7330
|
}
|
|
7371
7331
|
|
|
7372
7332
|
}
|
|
@@ -7388,15 +7348,6 @@ class Bitmap extends Proto {
|
|
|
7388
7348
|
|
|
7389
7349
|
if( this.stat !== n ){
|
|
7390
7350
|
|
|
7391
|
-
/*if( n===1 ) this.isActif = false
|
|
7392
|
-
|
|
7393
|
-
if( n===3 ){
|
|
7394
|
-
if( !this.isActif ){ this.isActif = true; n=4; this.onActif( this ); }
|
|
7395
|
-
else { this.isActif = false; }
|
|
7396
|
-
}
|
|
7397
|
-
|
|
7398
|
-
if( n===2 && this.isActif ) n = 4;*/
|
|
7399
|
-
|
|
7400
7351
|
this.stat = n;
|
|
7401
7352
|
|
|
7402
7353
|
switch( n ){
|
|
@@ -8175,7 +8126,7 @@ const add = function () {
|
|
|
8175
8126
|
|
|
8176
8127
|
o = a[2];
|
|
8177
8128
|
o.name = a[1];
|
|
8178
|
-
if( type === 'list' ){ o.list = a[0][a[1]]; }
|
|
8129
|
+
if( type === 'list' && !o.list ){ o.list = a[0][a[1]]; }
|
|
8179
8130
|
else o.value = a[0][a[1]];
|
|
8180
8131
|
|
|
8181
8132
|
}
|
|
@@ -9015,6 +8966,6 @@ class Gui {
|
|
|
9015
8966
|
|
|
9016
8967
|
}
|
|
9017
8968
|
|
|
9018
|
-
const REVISION = '4.2.
|
|
8969
|
+
const REVISION = '4.2.3';
|
|
9019
8970
|
|
|
9020
8971
|
export { Files, Gui, Proto, REVISION, Tools, add };
|