Skip to content

Commit 1372bb0

Browse files
mar10mar10
committed
Bumping version to 2.16.1
1 parent 43e46ba commit 1372bb0

22 files changed

+119
-110
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery.fancytree",
33
"description": "Fancytree is a JavaScript tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
4-
"version": "2.16.1-0",
4+
"version": "2.16.1",
55
"main": [
66
"dist/jquery.fancytree-all.min.js"
77
],

‎dist/jquery.fancytree-all.js‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Released under the MIT license
88
* https://github.com/mar10/fancytree/wiki/LicenseInfo
99
*
10-
* @version 2.16.0
11-
* @date 2016-03-16T08:09
10+
* @version 2.16.1
11+
* @date 2016-03-18T22:15
1212
*/
1313

1414
/** Core Fancytree module.
@@ -2812,7 +2812,7 @@ $.extend(Fancytree.prototype,
28122812
if($.isArray(delay)){ // random delay range [min..max]
28132813
delay = delay[0] + Math.random() * (delay[1] - delay[0]);
28142814
}
2815-
node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
2815+
node.warn("nodeLoadChildren waiting debugDelay " + Math.round(delay) + " ms ...");
28162816
ajax.debugDelay = false;
28172817
dfd = $.Deferred(function (dfd) {
28182818
setTimeout(function () {
@@ -3857,7 +3857,8 @@ $.extend(Fancytree.prototype,
38573857
if( !node.parent ) {
38583858
_setStatusNode({
38593859
title: tree.options.strings.loading + (message ? " (" + message + ")" : ""),
3860-
icon: false,
3860+
// icon: true, // needed for 'loding' icon
3861+
checkbox: false,
38613862
tooltip: details
38623863
}, status);
38633864
}
@@ -3868,7 +3869,8 @@ $.extend(Fancytree.prototype,
38683869
case "error":
38693870
_setStatusNode({
38703871
title: tree.options.strings.loadError + (message ? " (" + message + ")" : ""),
3871-
icon: false,
3872+
// icon: false,
3873+
checkbox: false,
38723874
tooltip: details
38733875
}, status);
38743876
node._isLoading = false;
@@ -3878,7 +3880,8 @@ $.extend(Fancytree.prototype,
38783880
case "nodata":
38793881
_setStatusNode({
38803882
title: tree.options.strings.noData,
3881-
icon: false,
3883+
// icon: false,
3884+
checkbox: false,
38823885
tooltip: details
38833886
}, status);
38843887
node._isLoading = false;
@@ -4365,7 +4368,7 @@ $.extend($.ui.fancytree,
43654368
/** @lends Fancytree_Static# */
43664369
{
43674370
/** @type {string} */
4368-
version: "2.16.0", // Set to semver by 'grunt release'
4371+
version: "2.16.1", // Set to semver by 'grunt release'
43694372
/** @type {string} */
43704373
buildType: "production", // Set to 'production' by 'grunt build'
43714374
/** @type {int} */
@@ -4750,8 +4753,8 @@ $.extend($.ui.fancytree,
47504753
* Released under the MIT license
47514754
* https://github.com/mar10/fancytree/wiki/LicenseInfo
47524755
*
4753-
* @version 2.16.0
4754-
* @date 2016-03-16T08:09
4756+
* @version 2.16.1
4757+
* @date 2016-03-18T22:15
47554758
*/
47564759

47574760
// To keep the global namespace clean, we wrap everything in a closure
@@ -4949,8 +4952,8 @@ $.ui.fancytree.registerExtension({
49494952
* Released under the MIT license
49504953
* https://github.com/mar10/fancytree/wiki/LicenseInfo
49514954
*
4952-
* @version 2.16.0
4953-
* @date 2016-03-16T08:09
4955+
* @version 2.16.1
4956+
* @date 2016-03-18T22:15
49544957
*/
49554958

49564959
;(function($, window, document, undefined) {
@@ -5415,8 +5418,8 @@ $.ui.fancytree.registerExtension({
54155418
* Released under the MIT license
54165419
* https://github.com/mar10/fancytree/wiki/LicenseInfo
54175420
*
5418-
* @version 2.16.0
5419-
* @date 2016-03-16T08:09
5421+
* @version 2.16.1
5422+
* @date 2016-03-18T22:15
54205423
*/
54215424

54225425
;(function($, window, document, undefined) {
@@ -5983,8 +5986,8 @@ $.ui.fancytree.registerExtension({
59835986
* Released under the MIT license
59845987
* https://github.com/mar10/fancytree/wiki/LicenseInfo
59855988
*
5986-
* @version 2.16.0
5987-
* @date 2016-03-16T08:09
5989+
* @version 2.16.1
5990+
* @date 2016-03-18T22:15
59885991
*/
59895992

59905993
;(function($, window, document, undefined) {
@@ -6293,8 +6296,8 @@ $.ui.fancytree.registerExtension({
62936296
* Released under the MIT license
62946297
* https://github.com/mar10/fancytree/wiki/LicenseInfo
62956298
*
6296-
* @version 2.16.0
6297-
* @date 2016-03-16T08:09
6299+
* @version 2.16.1
6300+
* @date 2016-03-18T22:15
62986301
*/
62996302

63006303
;(function($, window, document, undefined) {
@@ -6577,8 +6580,8 @@ $.ui.fancytree.registerExtension({
65776580
* Released under the MIT license
65786581
* https://github.com/mar10/fancytree/wiki/LicenseInfo
65796582
*
6580-
* @version 2.16.0
6581-
* @date 2016-03-16T08:09
6583+
* @version 2.16.1
6584+
* @date 2016-03-18T22:15
65826585
*/
65836586

65846587
;(function($, window, document, undefined) {
@@ -6611,6 +6614,7 @@ $.ui.fancytree.registerExtension({
66116614
expanderClosed: "icon-caret-right",
66126615
expanderLazy: "icon-angle-right",
66136616
expanderOpen: "icon-caret-down",
6617+
nodata: "icon-meh",
66146618
noExpander: "",
66156619
dragHelper: "icon-caret-right",
66166620
dropMarker: "icon-caret-right",
@@ -6646,9 +6650,7 @@ $.ui.fancytree.registerExtension({
66466650
if( span ){
66476651
// if( node.isLoading() ){
66486652
// icon = "loading";
6649-
if( node.statusNodeType ){
6650-
icon = node.statusNodeType; // loading, error
6651-
}else if( node.expanded ){
6653+
if( node.expanded ){
66526654
icon = "expanderOpen";
66536655
}else if( node.isUndefined() ){
66546656
icon = "expanderLazy";
@@ -6674,7 +6676,9 @@ $.ui.fancytree.registerExtension({
66746676
// that might be set by opts.icon callbacks)
66756677
span = $span.children("span.fancytree-icon").get(0);
66766678
if( span ){
6677-
if( node.folder ){
6679+
if( node.statusNodeType ){
6680+
icon = _getIcon(opts, node.statusNodeType); // loading, error
6681+
}else if( node.folder ){
66786682
icon = node.expanded ? _getIcon(opts, "folderOpen") : _getIcon(opts, "folder");
66796683
}else{
66806684
icon = node.expanded ? _getIcon(opts, "docOpen") : _getIcon(opts, "doc");
@@ -6690,16 +6694,15 @@ $.ui.fancytree.registerExtension({
66906694

66916695
res = this._superApply(arguments);
66926696

6693-
if(node.parent){
6694-
span = $("span.fancytree-expander", node.span).get(0);
6695-
}else{
6696-
span = $(".fancytree-statusnode-loading, .fancytree-statusnode-error", node[this.nodeContainerAttrName])
6697-
.find("span.fancytree-expander").get(0);
6698-
}
6699-
if( status === "loading" ){
6700-
span.className = "fancytree-expander " + _getIcon(opts, "loading");
6701-
}else if( status === "error" ){
6702-
span.className = "fancytree-expander " + _getIcon(opts, "error");
6697+
if( status === "error" || status === "loading" || status === "nodata" ){
6698+
if(node.parent){
6699+
span = $("span.fancytree-expander", node.span).get(0);
6700+
span.className = "fancytree-expander " + _getIcon(opts, status);
6701+
}else{ //
6702+
span = $(".fancytree-statusnode-" + status, node[this.nodeContainerAttrName])
6703+
.find("span.fancytree-icon").get(0);
6704+
span.className = "fancytree-icon " + _getIcon(opts, status);
6705+
}
67036706
}
67046707
return res;
67056708
}
@@ -6717,8 +6720,8 @@ $.ui.fancytree.registerExtension({
67176720
* Released under the MIT license
67186721
* https://github.com/mar10/fancytree/wiki/LicenseInfo
67196722
*
6720-
* @version 2.16.0
6721-
* @date 2016-03-16T08:09
6723+
* @version 2.16.1
6724+
* @date 2016-03-18T22:15
67226725
*/
67236726

67246727
;(function($, window, document, undefined) {
@@ -6919,8 +6922,8 @@ $.ui.fancytree.registerExtension({
69196922
* Released under the MIT license
69206923
* https://github.com/mar10/fancytree/wiki/LicenseInfo
69216924
*
6922-
* @version 2.16.0
6923-
* @date 2016-03-16T08:09
6925+
* @version 2.16.1
6926+
* @date 2016-03-18T22:15
69246927
*/
69256928

69266929
;(function($, window, document, undefined) {
@@ -7305,8 +7308,8 @@ $.ui.fancytree.registerExtension({
73057308
* Released under the MIT license
73067309
* https://github.com/mar10/fancytree/wiki/LicenseInfo
73077310
*
7308-
* @version 2.16.0
7309-
* @date 2016-03-16T08:09
7311+
* @version 2.16.1
7312+
* @date 2016-03-18T22:15
73107313
*/
73117314

73127315
;(function($, window, document, undefined) {
@@ -7741,8 +7744,8 @@ $.ui.fancytree.registerExtension({
77417744
* Released under the MIT license
77427745
* https://github.com/mar10/fancytree/wiki/LicenseInfo
77437746
*
7744-
* @version 2.16.0
7745-
* @date 2016-03-16T08:09
7747+
* @version 2.16.1
7748+
* @date 2016-03-18T22:15
77467749
*/
77477750

77487751
;(function($, window, document, undefined) {
@@ -7817,8 +7820,8 @@ $.ui.fancytree.registerExtension({
78177820
* Released under the MIT license
78187821
* https://github.com/mar10/fancytree/wiki/LicenseInfo
78197822
*
7820-
* @version 2.16.0
7821-
* @date 2016-03-16T08:09
7823+
* @version 2.16.1
7824+
* @date 2016-03-18T22:15
78227825
*/
78237826

78247827
;(function($, window, document, undefined) {

‎dist/jquery.fancytree-all.min.js‎

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

‎dist/jquery.fancytree.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Released under the MIT license
88
* https://github.com/mar10/fancytree/wiki/LicenseInfo
99
*
10-
* @version 2.16.0
11-
* @date 2016-03-16T08:09
10+
* @version 2.16.1
11+
* @date 2016-03-18T22:15
1212
*/
1313

1414
/** Core Fancytree module.
@@ -2812,7 +2812,7 @@ $.extend(Fancytree.prototype,
28122812
if($.isArray(delay)){ // random delay range [min..max]
28132813
delay = delay[0] + Math.random() * (delay[1] - delay[0]);
28142814
}
2815-
node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
2815+
node.warn("nodeLoadChildren waiting debugDelay " + Math.round(delay) + " ms ...");
28162816
ajax.debugDelay = false;
28172817
dfd = $.Deferred(function (dfd) {
28182818
setTimeout(function () {
@@ -3857,7 +3857,8 @@ $.extend(Fancytree.prototype,
38573857
if( !node.parent ) {
38583858
_setStatusNode({
38593859
title: tree.options.strings.loading + (message ? " (" + message + ")" : ""),
3860-
icon: false,
3860+
// icon: true, // needed for 'loding' icon
3861+
checkbox: false,
38613862
tooltip: details
38623863
}, status);
38633864
}
@@ -3868,7 +3869,8 @@ $.extend(Fancytree.prototype,
38683869
case "error":
38693870
_setStatusNode({
38703871
title: tree.options.strings.loadError + (message ? " (" + message + ")" : ""),
3871-
icon: false,
3872+
// icon: false,
3873+
checkbox: false,
38723874
tooltip: details
38733875
}, status);
38743876
node._isLoading = false;
@@ -3878,7 +3880,8 @@ $.extend(Fancytree.prototype,
38783880
case "nodata":
38793881
_setStatusNode({
38803882
title: tree.options.strings.noData,
3881-
icon: false,
3883+
// icon: false,
3884+
checkbox: false,
38823885
tooltip: details
38833886
}, status);
38843887
node._isLoading = false;
@@ -4365,7 +4368,7 @@ $.extend($.ui.fancytree,
43654368
/** @lends Fancytree_Static# */
43664369
{
43674370
/** @type {string} */
4368-
version: "2.16.0", // Set to semver by 'grunt release'
4371+
version: "2.16.1", // Set to semver by 'grunt release'
43694372
/** @type {string} */
43704373
buildType: "production", // Set to 'production' by 'grunt build'
43714374
/** @type {int} */

‎dist/jquery.fancytree.min.js‎

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

‎dist/src/jquery.fancytree.childcounter.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* Released under the MIT license
2020
* https://github.com/mar10/fancytree/wiki/LicenseInfo
2121
*
22-
* @version 2.16.0
23-
* @date 2016-03-16T08:09
22+
* @version 2.16.1
23+
* @date 2016-03-18T22:15
2424
*/
2525

2626
// To keep the global namespace clean, we wrap everything in a closure

‎dist/src/jquery.fancytree.clones.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.16.0
13-
* @date 2016-03-16T08:09
12+
* @version 2.16.1
13+
* @date 2016-03-18T22:15
1414
*/
1515

1616
;(function($, window, document, undefined) {

‎dist/src/jquery.fancytree.columnview.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.16.0
13-
* @date 2016-03-16T08:09
12+
* @version 2.16.1
13+
* @date 2016-03-18T22:15
1414
*/
1515

1616
;(function($, window, document, undefined) {

‎dist/src/jquery.fancytree.debug.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.16.0
13-
* @date 2016-03-16T08:09
12+
* @version 2.16.1
13+
* @date 2016-03-18T22:15
1414
*/
1515

1616
;(function($, window, document, undefined) {

‎dist/src/jquery.fancytree.dnd.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.16.0
13-
* @date 2016-03-16T08:09
12+
* @version 2.16.1
13+
* @date 2016-03-18T22:15
1414
*/
1515

1616
;(function($, window, document, undefined) {

0 commit comments

Comments
 (0)