Skip to content

Commit 03bcba6

Browse files
author
ztree
committed
* merge PullRequest(fixed 'HTMLElement undefined' error) Thanks @ChangJin0520
* merge PullRequest(Add TypeScript type definition) Thanks @Itroads * fixed awesomeStyle Thanks @Jermyk93
1 parent 7939cd8 commit 03bcba6

19 files changed

+68
-488
lines changed

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
jQuery Tree Plugin ---- zTree
22
============
3-
last verson : 3.5.41
3+
last verson : 3.5.42
44

55

66
**Donate to zTree** : http://www.treejs.cn/v3/donate.php
@@ -11,10 +11,6 @@ zTree API : http://www.treejs.cn/v3/api.php
1111

1212
zTree Demo : http://www.treejs.cn/v3/demo.php
1313

14-
### INSTALL
15-
```
16-
npm install @ztree/ztree_v3
17-
```
1814

1915
Introduction of zTree (简介)
2016
============

api/API_cn.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<div class="ieSuggest">浏览本网站建议您使用 Chrome、FireFox、Opera、IE9 等浏览器(只要不是 IE6 7 8 就行), 速度会更快,画面会更炫!</div>
3636
<div class="google_plus"><g:plusone></g:plusone></div>
3737
<div class="header-text">
38-
<h1><em>zTree v3.5.41 API 文档</em></h1><p></p>
38+
<h1><em>zTree v3.5.42 API 文档</em></h1><p></p>
3939
<p>all.js = core + excheck + exedit ( 不包括 exhide ); 发现错误请及时通知,谢谢。</p>
4040
</div>
4141
<ul class="shortcuts language" style="top:0;">

api/API_en.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="ieSuggest">If you use the Chrome / FireFox / Opera / IE9 browser will be even more dazzling effect!</div>
3535
<div class="google_plus"><g:plusone></g:plusone></div>
3636
<div class="header-text">
37-
<h1><em>zTree v3.5.41 API Document</em></h1><p></p>
37+
<h1><em>zTree v3.5.42 API Document</em></h1><p></p>
3838
<p>all.js = core + excheck + exedit ( without exhide ); if you found some mistakes please contact me.</p>
3939
</div>
4040
<ul class="shortcuts language" style="top:0;">

api/apiCss/jquery.ztree.core.js

Lines changed: 1 addition & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/awesomeStyle/awesome.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ website: http://code.google.com/p/jquerytree/
216216
display: inline-block;
217217
}
218218
.ztree li span.button.root_close::before {
219-
content: "\f115";
219+
content: "\f054";
220220
padding-top: 10px;
221221
padding-left: 2px;
222222
display: inline-block;

css/awesomeStyle/awesome.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ website: http://code.google.com/p/jquerytree/
9393
}
9494
&.switch {width:@w; height:@h}
9595
&.root_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
96-
&.root_close::before{content: @fa-folder-open-o;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
96+
&.root_close::before{content: @fa-chevron-right;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
9797
&.roots_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
9898
&.roots_close::before{content: @fa-chevron-right;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
9999
&.center_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}

js/jquery.ztree.all.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
21
/*
3-
* JQuery zTree core v3.5.41
2+
* JQuery zTree core
3+
* v3.5.42
44
* http://treejs.cn/
55
*
66
* Copyright (c) 2010 Hunter.z
77
*
88
* Licensed same as jquery - MIT License
99
* http://www.opensource.org/licenses/mit-license.php
1010
*
11-
* Date: 2020-01-06
11+
* Date: 2020-01-19
1212
*/
13+
1314
(function ($) {
1415
var settings = {}, roots = {}, caches = {},
1516
//default consts of core
@@ -1358,7 +1359,7 @@
13581359
var icon = (isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
13591360
if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
13601361
if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
1361-
icoStyle.push("width:0px;height:0px;");
1362+
icoStyle.push("display:none;");
13621363
}
13631364
}
13641365
return icoStyle.join('');
@@ -1430,8 +1431,8 @@
14301431
if (!dom) {
14311432
return;
14321433
}
1433-
// support IE 7
1434-
if (typeof Element === 'undefined') {
1434+
// support IE 7 / 8
1435+
if (typeof Element === 'undefined' || typeof HTMLElement === 'undefined') {
14351436
var contRect = setting.treeObj.get(0).getBoundingClientRect(),
14361437
findMeRect = dom.getBoundingClientRect();
14371438
if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
@@ -1985,16 +1986,18 @@
19851986
consts = zt.consts;
19861987
})(jQuery);
19871988
/*
1988-
* JQuery zTree excheck v3.5.41
1989+
* JQuery zTree excheck
1990+
* v3.5.42
19891991
* http://treejs.cn/
19901992
*
19911993
* Copyright (c) 2010 Hunter.z
19921994
*
19931995
* Licensed same as jquery - MIT License
19941996
* http://www.opensource.org/licenses/mit-license.php
19951997
*
1996-
* Date: 2020-01-06
1998+
* Date: 2020-01-19
19971999
*/
2000+
19982001
(function ($) {
19992002
//default consts of excheck
20002003
var _consts = {
@@ -2635,16 +2638,18 @@
26352638
}
26362639
})(jQuery);
26372640
/*
2638-
* JQuery zTree exedit v3.5.41
2641+
* JQuery zTree exedit
2642+
* v3.5.42
26392643
* http://treejs.cn/
26402644
*
26412645
* Copyright (c) 2010 Hunter.z
26422646
*
26432647
* Licensed same as jquery - MIT License
26442648
* http://www.opensource.org/licenses/mit-license.php
26452649
*
2646-
* Date: 2020-01-06
2650+
* Date: 2020-01-19
26472651
*/
2652+
26482653
(function ($) {
26492654
//default consts of exedit
26502655
var _consts = {
@@ -3835,4 +3840,4 @@
38353840
}
38363841
return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
38373842
}
3838-
})(jQuery);
3843+
})(jQuery);

0 commit comments

Comments
 (0)