Merge branch 'master' into types2

# Conflicts:
#	CHANGELOG.md
#	Gruntfile.coffee
#	dist/modules/jquery.fancytree.logger.js
#	src/jquery.fancytree.columnview.js
#	src/jquery.fancytree.js
#	src/jquery.fancytree.select.js

Author: mar10

CHANGELOG.md

@@ -3,16 +3,20 @@
   * Auto-apply tree.types.icon, .iconTooltip, tooltip
 
 # 2.30.1-0 / Unreleased
-  * Apply and enforce 'prettier' codestyle
+  * [Changed] Apply and enforce 'prettier' codestyle
+  * [Changed] #897 Set font for table extension
   * [Fixed] #894: Fancytree assertion failed: scrollParent should be a simple element or `window`, not document or body.
   * [Fixed] #896 _requireExtension: order managment
-  * [Changed] #897 Set font for table extension
+  * [Fixed] #899 Creating duplicate icon when removing node using extension columnview
+  * [Fixed] #900 ColumnView Extension - Toggle between parent and children not working
 
 # 2.30.0 / 2018-09-02
   * [Changed] ext-edit trigger 'clickActive' now only triggers if no modifier keys
     (shift, meta, control, ...) are pressed.<br>
     Trigger 'shift+click' now only triggers if no other modifier key (control, ...)
     is pressed.
+  * [Changed] #879 Rename ext-debug to ext-logger
+    (jquery.fancytree.debug.js => jquery.fancytree.logger.js)
   * [Added] ext-multi is now deployed with jquery.fancytree-all.js (still experimental)
   * [Added] tree.activateKey(key, opts) now has an `opts` argument
   * [Added] `nodata` option (bool, string, or callback)
@@ -25,8 +29,6 @@
   * [Fixed] #877 postProcess may now also return the object form `{..., children: []}`
   * [Fixed] #884 ReferenceError: jQuery is not defined at _simpleDeepMerge
   * [Fixed] autoScroll, node.scrollIntoView(), and .makeVisible() now work for tables as well.
-  * [Changed] #879 Rename ext-debug to ext-logger
-    (jquery.fancytree.debug.js => jquery.fancytree.logger.js)
 
 # 2.29.1 / 2018-06-27
   * [Fixed] #848 Drag End Error with dnd5 extension (again):

Gruntfile.coffee

@@ -240,6 +240,7 @@ module.exports = (grunt) ->
               "src/jquery.fancytree.js"
               "src/jquery.fancytree.*.js"
               "test/test-*.js"
+              "demo/sample.js"
               ]
         fix:
             options:
@@ -248,6 +249,7 @@ module.exports = (grunt) ->
               "src/jquery.fancytree.js"
               "src/jquery.fancytree.*.js"
               "test/test-*.js"
+              "demo/sample.js"
               ]
 
     exec:

demo/sample-ext-columnview.html

@@ -21,10 +21,10 @@
 <style type="text/css">
 	table.fancytree-ext-columnview {
 		border-collapse: collapse;
-		width: 100%;
+    width: 100%;
 	}
-	table.fancytree-container tbody tr td{
-		max-width: 300px; /* width does not work */
+	table.fancytree-container tbody tr:first-child td {
+    height: 200px;
 	}
 	span.fancytree-node{
 		white-space: nowrap; /* prevent long lines to wrap */
@@ -46,23 +46,28 @@
 	span.selTag{
 		border: 1px outset #dec;
 		display: inline-block;
-		padding: 0 5px;
+		padding: 1px 3px;
 		margin: 1px 5px;
 		background-color: #dec;
 		border-radius: 5px;
 		cursor: pointer;
+    vertical-align: bottom;
+    position: relative;
 	}
 	span.selTag button.close{
 		border: 1px solid transparent;
-		border-radius: 4px;
+		border-radius: 5px;
 		padding: 0px 1px 2px 1px;
-		margin-left: 8px;
+    position: absolute;
+    top: 0;
+    right: 0;
 		background-color: transparent;
 		visibility: hidden;
 	}
 	span.selTag:hover button.close{
 		border-color: gray;
 		background-color: #f99;
+		opacity: 0.8;
 		visibility: visible;
 	}
 </style>
@@ -76,7 +81,10 @@
 			extensions: ["columnview"],
 			checkbox: true,
 			source: {
-				url: "ajax-tree-plain.json"
+				url: "ajax-tree-products.json"
+			},
+			init: function(event, data) {
+				data.tree.findFirst("C64").setActive();
 			},
 			lazyLoad: function(event, data) {
 				data.result = {url: "ajax-sub2.json"};
@@ -123,7 +131,10 @@ <h1>Example: 'columnview' extension</h1>
 			Display tree data in a column view as known from Apple Macintosh / OSX.
 		</p>
 		<p>
-			<b>Status</b>: experimental
+			<b>Status</b>: experimental.
+			<b>Details:</b>
+			<a href="https://github.com/mar10/fancytree/wiki/ExtColumnView"
+				target="_blank" class="external">ext-columnview</a>.
 		</p>
 	</div>
 	<div>
@@ -133,15 +144,16 @@ <h1>Example: 'columnview' extension</h1>
 	<!-- Add a <table> element where the tree should appear: -->
 	<table id="columnview">
 		<colgroup>
-		<col width="300px"></col>
-		<col width="300px"></col>
-		<col width="300px"></col>
+		<col width="33%"></col>
+		<col width="33%"></col>
+		<col width="33%"></col>
 		</colgroup>
 		<thead>
 			<tr> <th>1</th> <th>2</th> <th>3</th> </tr>
 		</thead>
 		<tbody>
-			<tr> <td>?</td> <td>?</td> <td>?</td> </tr>
+      <tr> <td>?</td> <td>?</td> <td>?</td> </tr>
+      <!-- The following rows are only used for the custom select badge functionality: -->
 			<tr> <td id="tags" colspan="3">Selected nodes: </td> </tr>
 			<tr> <td id="preview" colspan="3">preview</td> </tr>
 		</tbody>