Skip to content

Commit a5d57ff

Browse files
mar10mar10
committed
Bumping version to 2.10.2
1 parent ea7d364 commit a5d57ff

23 files changed

+101
-81
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.10.2-0",
4+
"version": "2.10.2",
55
"main": [
66
"dist/jquery.fancytree-all.min.js"
77
],

‎dist/jquery.fancytree-all.js‎

Lines changed: 31 additions & 29 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.10.1
11-
* @date 2015-06-27T22:07
10+
* @version 2.10.2
11+
* @date 2015-07-02T08:11
1212
*/
1313

1414
/** Core Fancytree module.
@@ -1494,7 +1494,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
14941494
// If a topNode was passed, make sure that it is never scrolled
14951495
// outside the upper border
14961496
if(topNode){
1497-
_assert(topNode.isRoot() || $(topNode.span).is(":visible"), "topNode must be visible");
1497+
_assert(topNode.isRootNode() || $(topNode.span).is(":visible"), "topNode must be visible");
14981498
if( topNodeY < newScrollTop ){
14991499
newScrollTop = topNodeY - topOfs;
15001500
// this.debug(" scrollIntoView(), TOP newScrollTop=", newScrollTop);
@@ -2725,7 +2725,7 @@ $.extend(Fancytree.prototype,
27252725
// We got {foo: 'abc', children: [...]}
27262726
// Copy extra properties to tree.data.foo
27272727
_assert($.isArray(children.children), "source must contain (or be) an array of children");
2728-
_assert(node.isRoot(), "source may only be an object for root nodes");
2728+
_assert(node.isRootNode(), "source may only be an object for root nodes");
27292729
metaData = children;
27302730
children = children.children;
27312731
delete metaData.children;
@@ -2793,7 +2793,7 @@ $.extend(Fancytree.prototype,
27932793
// FT.debug("nodeRemoveChildMarkup()", node.toString());
27942794
// TODO: Unlink attr.ftnode to support GC
27952795
if(node.ul){
2796-
if( node.isRoot() ) {
2796+
if( node.isRootNode() ) {
27972797
$(node.ul).empty();
27982798
} else {
27992799
$(node.ul).remove();
@@ -2843,7 +2843,9 @@ $.extend(Fancytree.prototype,
28432843
} else{
28442844
node.children = null;
28452845
}
2846-
node.expanded = false; // #449
2846+
if( !node.isRootNode() ) {
2847+
node.expanded = false; // #449, #459
2848+
}
28472849
this.nodeRenderStatus(ctx);
28482850
},
28492851
/**Remove HTML markup for ctx.node and all its descendents.
@@ -4077,7 +4079,7 @@ $.extend($.ui.fancytree,
40774079
/** @lends Fancytree_Static# */
40784080
{
40794081
/** @type {string} */
4080-
version: "2.10.1", // Set to semver by 'grunt release'
4082+
version: "2.10.2", // Set to semver by 'grunt release'
40814083
/** @type {string} */
40824084
buildType: "production", // Set to 'production' by 'grunt build'
40834085
/** @type {int} */
@@ -4439,8 +4441,8 @@ $.extend($.ui.fancytree,
44394441
* Released under the MIT license
44404442
* https://github.com/mar10/fancytree/wiki/LicenseInfo
44414443
*
4442-
* @version 2.10.1
4443-
* @date 2015-06-27T22:07
4444+
* @version 2.10.2
4445+
* @date 2015-07-02T08:11
44444446
*/
44454447

44464448
// To keep the global namespace clean, we wrap everything in a closure
@@ -4615,8 +4617,8 @@ $.ui.fancytree.registerExtension({
46154617
* Released under the MIT license
46164618
* https://github.com/mar10/fancytree/wiki/LicenseInfo
46174619
*
4618-
* @version 2.10.1
4619-
* @date 2015-06-27T22:07
4620+
* @version 2.10.2
4621+
* @date 2015-07-02T08:11
46204622
*/
46214623

46224624
;(function($, window, document, undefined) {
@@ -5067,8 +5069,8 @@ $.ui.fancytree.registerExtension({
50675069
* Released under the MIT license
50685070
* https://github.com/mar10/fancytree/wiki/LicenseInfo
50695071
*
5070-
* @version 2.10.1
5071-
* @date 2015-06-27T22:07
5072+
* @version 2.10.2
5073+
* @date 2015-07-02T08:11
50725074
*/
50735075

50745076
;(function($, window, document, undefined) {
@@ -5624,8 +5626,8 @@ $.ui.fancytree.registerExtension({
56245626
* Released under the MIT license
56255627
* https://github.com/mar10/fancytree/wiki/LicenseInfo
56265628
*
5627-
* @version 2.10.1
5628-
* @date 2015-06-27T22:07
5629+
* @version 2.10.2
5630+
* @date 2015-07-02T08:11
56295631
*/
56305632

56315633
;(function($, window, document, undefined) {
@@ -5932,8 +5934,8 @@ $.ui.fancytree.registerExtension({
59325934
* Released under the MIT license
59335935
* https://github.com/mar10/fancytree/wiki/LicenseInfo
59345936
*
5935-
* @version 2.10.1
5936-
* @date 2015-06-27T22:07
5937+
* @version 2.10.2
5938+
* @date 2015-07-02T08:11
59375939
*/
59385940

59395941
;(function($, window, document, undefined) {
@@ -6125,8 +6127,8 @@ $.ui.fancytree.registerExtension({
61256127
* Released under the MIT license
61266128
* https://github.com/mar10/fancytree/wiki/LicenseInfo
61276129
*
6128-
* @version 2.10.1
6129-
* @date 2015-06-27T22:07
6130+
* @version 2.10.2
6131+
* @date 2015-07-02T08:11
61306132
*/
61316133

61326134
;(function($, window, document, undefined) {
@@ -6258,8 +6260,8 @@ $.ui.fancytree.registerExtension({
62586260
* Released under the MIT license
62596261
* https://github.com/mar10/fancytree/wiki/LicenseInfo
62606262
*
6261-
* @version 2.10.1
6262-
* @date 2015-06-27T22:07
6263+
* @version 2.10.2
6264+
* @date 2015-07-02T08:11
62636265
*/
62646266

62656267
;(function($, window, document, undefined) {
@@ -6460,8 +6462,8 @@ $.ui.fancytree.registerExtension({
64606462
* Released under the MIT license
64616463
* https://github.com/mar10/fancytree/wiki/LicenseInfo
64626464
*
6463-
* @version 2.10.1
6464-
* @date 2015-06-27T22:07
6465+
* @version 2.10.2
6466+
* @date 2015-07-02T08:11
64656467
*/
64666468

64676469
;(function($, window, document, undefined) {
@@ -6835,8 +6837,8 @@ $.ui.fancytree.registerExtension({
68356837
* Released under the MIT license
68366838
* https://github.com/mar10/fancytree/wiki/LicenseInfo
68376839
*
6838-
* @version 2.10.1
6839-
* @date 2015-06-27T22:07
6840+
* @version 2.10.2
6841+
* @date 2015-07-02T08:11
68406842
*/
68416843

68426844
;(function($, window, document, undefined) {
@@ -7200,8 +7202,8 @@ $.ui.fancytree.registerExtension({
72007202
* Released under the MIT license
72017203
* https://github.com/mar10/fancytree/wiki/LicenseInfo
72027204
*
7203-
* @version 2.10.1
7204-
* @date 2015-06-27T22:07
7205+
* @version 2.10.2
7206+
* @date 2015-07-02T08:11
72057207
*/
72067208

72077209
;(function($, window, document, undefined) {
@@ -7276,8 +7278,8 @@ $.ui.fancytree.registerExtension({
72767278
* Released under the MIT license
72777279
* https://github.com/mar10/fancytree/wiki/LicenseInfo
72787280
*
7279-
* @version 2.10.1
7280-
* @date 2015-06-27T22:07
7281+
* @version 2.10.2
7282+
* @date 2015-07-02T08:11
72817283
*/
72827284

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

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

Lines changed: 3 additions & 3 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: 9 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.10.1
11-
* @date 2015-06-27T22:07
10+
* @version 2.10.2
11+
* @date 2015-07-02T08:11
1212
*/
1313

1414
/** Core Fancytree module.
@@ -1494,7 +1494,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
14941494
// If a topNode was passed, make sure that it is never scrolled
14951495
// outside the upper border
14961496
if(topNode){
1497-
_assert(topNode.isRoot() || $(topNode.span).is(":visible"), "topNode must be visible");
1497+
_assert(topNode.isRootNode() || $(topNode.span).is(":visible"), "topNode must be visible");
14981498
if( topNodeY < newScrollTop ){
14991499
newScrollTop = topNodeY - topOfs;
15001500
// this.debug(" scrollIntoView(), TOP newScrollTop=", newScrollTop);
@@ -2725,7 +2725,7 @@ $.extend(Fancytree.prototype,
27252725
// We got {foo: 'abc', children: [...]}
27262726
// Copy extra properties to tree.data.foo
27272727
_assert($.isArray(children.children), "source must contain (or be) an array of children");
2728-
_assert(node.isRoot(), "source may only be an object for root nodes");
2728+
_assert(node.isRootNode(), "source may only be an object for root nodes");
27292729
metaData = children;
27302730
children = children.children;
27312731
delete metaData.children;
@@ -2793,7 +2793,7 @@ $.extend(Fancytree.prototype,
27932793
// FT.debug("nodeRemoveChildMarkup()", node.toString());
27942794
// TODO: Unlink attr.ftnode to support GC
27952795
if(node.ul){
2796-
if( node.isRoot() ) {
2796+
if( node.isRootNode() ) {
27972797
$(node.ul).empty();
27982798
} else {
27992799
$(node.ul).remove();
@@ -2843,7 +2843,9 @@ $.extend(Fancytree.prototype,
28432843
} else{
28442844
node.children = null;
28452845
}
2846-
node.expanded = false; // #449
2846+
if( !node.isRootNode() ) {
2847+
node.expanded = false; // #449, #459
2848+
}
28472849
this.nodeRenderStatus(ctx);
28482850
},
28492851
/**Remove HTML markup for ctx.node and all its descendents.
@@ -4077,7 +4079,7 @@ $.extend($.ui.fancytree,
40774079
/** @lends Fancytree_Static# */
40784080
{
40794081
/** @type {string} */
4080-
version: "2.10.1", // Set to semver by 'grunt release'
4082+
version: "2.10.2", // Set to semver by 'grunt release'
40814083
/** @type {string} */
40824084
buildType: "production", // Set to 'production' by 'grunt build'
40834085
/** @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/skin-custom-1/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Creating Custom Skins
2+
3+
1. Create a folder like this (recommended name: 'src/skin-custom-...')
4+
2. For a start copy files from one of the existing skin folders (src/skin-...)
5+
to the custom folder:
6+
- ui.fancytree.less (required)
7+
- icons.gif (if needed)
8+
- loading.gif (if needed)
9+
3. cd to your fancytree folder and run `grunt dev` from the connsole.<br>
10+
Note: NPM and Grunt are required.
11+
Read [how to install the toolset](https://github.com/mar10/fancytree/wiki/HowtoContribute#install-the-source-code-and-tools-for-debugging-and-contributing).
12+
4. Edit and save your ui.fancytree.less file.<br>
13+
The `ui.fancytree.css` will be generated and updated automatically from
14+
the LESS file.

‎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.10.1
23-
* @date 2015-06-27T22:07
22+
* @version 2.10.2
23+
* @date 2015-07-02T08:11
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.10.1
13-
* @date 2015-06-27T22:07
12+
* @version 2.10.2
13+
* @date 2015-07-02T08:11
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.10.1
13-
* @date 2015-06-27T22:07
12+
* @version 2.10.2
13+
* @date 2015-07-02T08:11
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.10.1
13-
* @date 2015-06-27T22:07
12+
* @version 2.10.2
13+
* @date 2015-07-02T08:11
1414
*/
1515

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

0 commit comments

Comments
 (0)