Bumping version to 2.10.2

mar10 · Jul 2, 2015 · a5d57ff · a5d57ff
1 parent ea7d364
commit a5d57ff
Show file tree

Hide file tree

Showing 23 changed files with 101 additions and 81 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery.fancytree",
   "description": "Fancytree is a JavaScript tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
-  "version": "2.10.2-0",
+  "version": "2.10.2",
   "main": [
     "dist/jquery.fancytree-all.min.js"
   ],

diff --git a/dist/jquery.fancytree-all.js b/dist/jquery.fancytree-all.js
@@ -7,8 +7,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 /** Core Fancytree module.
@@ -1494,7 +1494,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 			// If a topNode was passed, make sure that it is never scrolled
 			// outside the upper border
 			if(topNode){
-				_assert(topNode.isRoot() || $(topNode.span).is(":visible"), "topNode must be visible");
+				_assert(topNode.isRootNode() || $(topNode.span).is(":visible"), "topNode must be visible");
 				if( topNodeY < newScrollTop ){
 					newScrollTop = topNodeY - topOfs;
 					// this.debug("    scrollIntoView(), TOP newScrollTop=", newScrollTop);
@@ -2725,7 +2725,7 @@ $.extend(Fancytree.prototype,
 				// We got {foo: 'abc', children: [...]}
 				// Copy extra properties to tree.data.foo
 				_assert($.isArray(children.children), "source must contain (or be) an array of children");
-				_assert(node.isRoot(), "source may only be an object for root nodes");
+				_assert(node.isRootNode(), "source may only be an object for root nodes");
 				metaData = children;
 				children = children.children;
 				delete metaData.children;
@@ -2793,7 +2793,7 @@ $.extend(Fancytree.prototype,
 		// FT.debug("nodeRemoveChildMarkup()", node.toString());
 		// TODO: Unlink attr.ftnode to support GC
 		if(node.ul){
-			if( node.isRoot() ) {
+			if( node.isRootNode() ) {
 				$(node.ul).empty();
 			} else {
 				$(node.ul).remove();
@@ -2843,7 +2843,9 @@ $.extend(Fancytree.prototype,
 		} else{
 			node.children = null;
 		}
-		node.expanded = false;  // #449
+		if( !node.isRootNode() ) {
+			node.expanded = false;  // #449, #459
+		}
 		this.nodeRenderStatus(ctx);
 	},
 	/**Remove HTML markup for ctx.node and all its descendents.
@@ -4077,7 +4079,7 @@ $.extend($.ui.fancytree,
 	/** @lends Fancytree_Static# */
 	{
 	/** @type {string} */
-	version: "2.10.1",      // Set to semver by 'grunt release'
+	version: "2.10.2",      // Set to semver by 'grunt release'
 	/** @type {string} */
 	buildType: "production", // Set to 'production' by 'grunt build'
 	/** @type {int} */
@@ -4439,8 +4441,8 @@ $.extend($.ui.fancytree,
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 // To keep the global namespace clean, we wrap everything in a closure
@@ -4615,8 +4617,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -5067,8 +5069,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -5624,8 +5626,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -5932,8 +5934,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -6125,8 +6127,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -6258,8 +6260,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -6460,8 +6462,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -6835,8 +6837,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -7200,8 +7202,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {
@@ -7276,8 +7278,8 @@ $.ui.fancytree.registerExtension({
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/jquery.fancytree-all.min.js b/dist/jquery.fancytree-all.min.js
diff --git a/dist/jquery.fancytree.js b/dist/jquery.fancytree.js
@@ -7,8 +7,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 /** Core Fancytree module.
@@ -1494,7 +1494,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 			// If a topNode was passed, make sure that it is never scrolled
 			// outside the upper border
 			if(topNode){
-				_assert(topNode.isRoot() || $(topNode.span).is(":visible"), "topNode must be visible");
+				_assert(topNode.isRootNode() || $(topNode.span).is(":visible"), "topNode must be visible");
 				if( topNodeY < newScrollTop ){
 					newScrollTop = topNodeY - topOfs;
 					// this.debug("    scrollIntoView(), TOP newScrollTop=", newScrollTop);
@@ -2725,7 +2725,7 @@ $.extend(Fancytree.prototype,
 				// We got {foo: 'abc', children: [...]}
 				// Copy extra properties to tree.data.foo
 				_assert($.isArray(children.children), "source must contain (or be) an array of children");
-				_assert(node.isRoot(), "source may only be an object for root nodes");
+				_assert(node.isRootNode(), "source may only be an object for root nodes");
 				metaData = children;
 				children = children.children;
 				delete metaData.children;
@@ -2793,7 +2793,7 @@ $.extend(Fancytree.prototype,
 		// FT.debug("nodeRemoveChildMarkup()", node.toString());
 		// TODO: Unlink attr.ftnode to support GC
 		if(node.ul){
-			if( node.isRoot() ) {
+			if( node.isRootNode() ) {
 				$(node.ul).empty();
 			} else {
 				$(node.ul).remove();
@@ -2843,7 +2843,9 @@ $.extend(Fancytree.prototype,
 		} else{
 			node.children = null;
 		}
-		node.expanded = false;  // #449
+		if( !node.isRootNode() ) {
+			node.expanded = false;  // #449, #459
+		}
 		this.nodeRenderStatus(ctx);
 	},
 	/**Remove HTML markup for ctx.node and all its descendents.
@@ -4077,7 +4079,7 @@ $.extend($.ui.fancytree,
 	/** @lends Fancytree_Static# */
 	{
 	/** @type {string} */
-	version: "2.10.1",      // Set to semver by 'grunt release'
+	version: "2.10.2",      // Set to semver by 'grunt release'
 	/** @type {string} */
 	buildType: "production", // Set to 'production' by 'grunt build'
 	/** @type {int} */

diff --git a/dist/jquery.fancytree.min.js b/dist/jquery.fancytree.min.js
diff --git a/dist/skin-custom-1/README.md b/dist/skin-custom-1/README.md
@@ -0,0 +1,14 @@
+### Creating Custom Skins
+
+1. Create a folder like this (recommended name: 'src/skin-custom-...')
+2. For a start copy files from one of the existing skin folders (src/skin-...) 
+   to the custom folder:
+   - ui.fancytree.less  (required)
+   - icons.gif (if needed)
+   - loading.gif (if needed)
+3. cd to your fancytree folder and run `grunt dev` from the connsole.<br>
+   Note: NPM and Grunt are required. 
+   Read [how to install the toolset](https://github.com/mar10/fancytree/wiki/HowtoContribute#install-the-source-code-and-tools-for-debugging-and-contributing).
+4. Edit and save your ui.fancytree.less file.<br>
+   The `ui.fancytree.css` will be generated and updated automatically from 
+   the LESS file.
diff --git a/dist/src/jquery.fancytree.childcounter.js b/dist/src/jquery.fancytree.childcounter.js
@@ -19,8 +19,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 // To keep the global namespace clean, we wrap everything in a closure

diff --git a/dist/src/jquery.fancytree.clones.js b/dist/src/jquery.fancytree.clones.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.columnview.js b/dist/src/jquery.fancytree.columnview.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.debug.js b/dist/src/jquery.fancytree.debug.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.dnd.js b/dist/src/jquery.fancytree.dnd.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.edit.js b/dist/src/jquery.fancytree.edit.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.filter.js b/dist/src/jquery.fancytree.filter.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.glyph.js b/dist/src/jquery.fancytree.glyph.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {

diff --git a/dist/src/jquery.fancytree.gridnav.js b/dist/src/jquery.fancytree.gridnav.js
@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.10.1
- * @date 2015-06-27T22:07
+ * @version 2.10.2
+ * @date 2015-07-02T08:11
  */
 
 ;(function($, window, document, undefined) {