fancytree-rails 2.1.0.pre.0 → 2.3.0

data/app/assets/javascripts/fancytree/src/jquery.fancytree.gridnav.js

@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 ;(function($, window, document, undefined) {

data/app/assets/javascripts/fancytree/src/jquery.fancytree.js

@@ -7,8 +7,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 /** Core Fancytree module.
@@ -614,7 +614,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 			var i, l, child, s, state, allSelected,someSelected,
 				children = node.children;
 
-			if( children ){
+			if( children && children.length ){
 				// check all children recursively
 				allSelected = true;
 				someSelected = false;
@@ -852,6 +852,16 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 	hasFocus: function() {
 		return (this.tree.hasFocus() && this.tree.focusNode === this);
 	},
+	/** Write to browser console if debugLevel >= 1 (prepending node info)
+	 *
+	 * @param {*} msg string or object or array of such
+	 */
+	info: function(msg){
+		if( this.tree.options.debugLevel >= 1 ) {
+			Array.prototype.unshift.call(arguments, this.toString());
+			consoleApply("info", arguments);
+		}
+	},
 	/** Return true if node is active (see also FancytreeNode#isSelected).
 	 * @returns {boolean}
 	 */
@@ -1063,6 +1073,9 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 		}
 		// Unlink this node from current parent
 		if( this.parent.children.length === 1 ) {
+			if( this.parent === targetParent ){
+				return; // #258
+			}
 			this.parent.children = this.parent.lazy ? [] : null;
 			this.parent.expanded = false;
 		} else {
@@ -1196,7 +1209,7 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 		// Navigate to node
 		function _goto(n){
 			if( n ){
-				n.makeVisible();
+				try { n.makeVisible(); } catch(e) {} // #272
 				// Node may still be hidden by a filter
 				if( ! $(n.span).is(":visible") ) {
 					n.debug("Navigate: skipping hidden node");
@@ -1467,13 +1480,20 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
 	setFocus: function(flag){
 		return this.tree._callHook("nodeSetFocus", this, flag);
 	},
-	// TODO: setLazyNodeStatus
 	/**Select this node, i.e. check the checkbox.
 	 * @param {boolean} [flag=true] pass false to deselect
 	 */
 	setSelected: function(flag){
 		return this.tree._callHook("nodeSetSelected", this, flag);
 	},
+	/**Mark a lazy node as 'error', 'loading', or 'ok'.
+	 * @param {string} status 'error', 'ok'
+	 * @param {string} [message]
+	 * @param {string} [details]
+	 */
+	setStatus: function(status, message, details){
+		return this.tree._callHook("nodeSetStatus", this, status, message, details);
+	},
 	/**Rename this node.
 	 * @param {string} title
 	 */
@@ -1666,6 +1686,9 @@ function Fancytree(widget) {
 			};
 		}
 	}
+	if( this.options && $.isFunction(this.options.loaderror) ) {
+		$.error("The 'loaderror' event was renamed since 2014-07-03. Use 'loadError' (with uppercase E) instead.");
+	}
 	this.ext = {}; // Active extension instances
 	// allow to init tree.data.foo from <div data-foo=''>
 	this.data = _getElementDataAsDict(this.$div);
@@ -1883,17 +1906,17 @@ Fancytree.prototype = /** @lends Fancytree# */{
 	generateFormElements: function(selected, active) {
 		// TODO: test case
 		var nodeList,
-			selectedName = (selected !== false) ? "ft_" + this._id : selected,
+			selectedName = (selected !== false) ? "ft_" + this._id + "[]" : selected,
 			activeName = (active !== false) ? "ft_" + this._id + "_active" : active,
 			id = "fancytree_result_" + this._id,
-			$result = this.$container.find("div#" + id);
+			$result = $("#" + id);
 
 		if($result.length){
 			$result.empty();
 		}else{
 			$result = $("<div>", {
 				id: id
-			}).hide().appendTo(this.$container);
+			}).hide().insertAfter(this.$container);
 		}
 		if(selectedName){
 			nodeList = this.getSelectedNodes( this.options.selectMode === 3 );
@@ -1967,7 +1990,12 @@ Fancytree.prototype = /** @lends Fancytree# */{
 		}, true);
 		return match;
 	},
-	// TODO: getRoot()
+	/** Return the invisible system root node.
+	 * @returns {FancytreeNode}
+	 */
+	getRootNode: function() {
+		return this.rootNode;
+	},
 	/**
 	 * Return an array of selected nodes.
 	 * @param {boolean} [stopOnParents=false] only return the topmost selected
@@ -2373,7 +2401,7 @@ $.extend(Fancytree.prototype,
 	 *     data was rendered.
 	 */
 	nodeLoadChildren: function(ctx, source) {
-		var ajax, delay,
+		var ajax, delay, dfd,
 			tree = ctx.tree,
 			node = ctx.node;
 
@@ -2393,7 +2421,7 @@ $.extend(Fancytree.prototype,
 
 				node.debug("nodeLoadChildren waiting debug delay " + Math.round(delay) + "ms");
 				ajax.debugDelay = false;
-				source = $.Deferred(function (dfd) {
+				dfd = $.Deferred(function (dfd) {
 					setTimeout(function () {
 						$.ajax(ajax)
 							.done(function () {	dfd.resolveWith(this, arguments); })
@@ -2401,33 +2429,42 @@ $.extend(Fancytree.prototype,
 					}, delay);
 				});
 			}else{
-				source = $.ajax(ajax);
+				dfd = $.ajax(ajax);
 			}
 
-			// TODO: change 'pipe' to 'then' for jQuery 1.8
-			// $.pipe returns a new Promise with filtered  results
-			source = source.pipe(function (data, textStatus, jqXHR) {
-				var res;
+			// Defer the deferred: we want to be able to reject, even if ajax
+			// resolved ok.
+			source = new $.Deferred();
+			dfd.done(function (data, textStatus, jqXHR) {
+				var errorObj, res;
 				if(typeof data === "string"){
 					$.error("Ajax request returned a string (did you get the JSON dataType wrong?).");
 				}
-				// postProcess is similar to the standard dataFilter hook,
+				// postProcess is similar to the standard ajax dataFilter hook,
 				// but it is also called for JSONP
 				if( ctx.options.postProcess ){
-					res = tree._triggerNodeEvent("postProcess", ctx, ctx.originalEvent, {response: data, dataType: this.dataType});
+					res = tree._triggerNodeEvent("postProcess", ctx, ctx.originalEvent, {response: data, error: null, dataType: this.dataType});
+					if( res.error ) {
+						errorObj = $.isPlainObject(res.error) ? res.error : {message: res.error};
+						errorObj = tree._makeHookContext(node, null, errorObj);
+						source.rejectWith(this, [errorObj]);
+						return;
+					}
 					data = $.isArray(res) ? res : data;
+
 				} else if (data && data.hasOwnProperty("d") && ctx.options.enableAspx ) {
 					// Process ASPX WebMethod JSON object inside "d" property
 					data = (typeof data.d === "string") ? $.parseJSON(data.d) : data.d;
 				}
-				return data;
-			}, function (jqXHR, textStatus, errorThrown) {
-				return tree._makeHookContext(node, null, {
+				source.resolveWith(this, [data]);
+			}).fail(function (jqXHR, textStatus, errorThrown) {
+				var errorObj = tree._makeHookContext(node, null, {
 					error: jqXHR,
 					args: Array.prototype.slice.call(arguments),
 					message: errorThrown,
 					details: jqXHR.status + ": " + errorThrown
 				});
+				source.rejectWith(this, [errorObj]);
 			});
 		}
 
@@ -2437,7 +2474,7 @@ $.extend(Fancytree.prototype,
 			// node._isLoading = true;
 			tree.nodeSetStatus(ctx, "loading");
 
-			source.done(function () {
+			source.done(function (children) {
 				tree.nodeSetStatus(ctx, "ok");
 			}).fail(function(error){
 				var ctxErr;
@@ -2451,8 +2488,9 @@ $.extend(Fancytree.prototype,
 						message: error ? (error.message || error.toString()) : ""
 					});
 				}
-				tree._triggerNodeEvent("loaderror", ctxErr, null);
-				tree.nodeSetStatus(ctx, "error", ctxErr.message, ctxErr.details);
+				if( tree._triggerNodeEvent("loadError", ctxErr, null) !== false ) {
+					tree.nodeSetStatus(ctx, "error", ctxErr.message, ctxErr.details);
+				}
 			});
 		}
 		// $.when(source) resolves also for non-deferreds
@@ -2472,9 +2510,7 @@ $.extend(Fancytree.prototype,
 			_assert($.isArray(children), "expected array of children");
 			node._setChildren(children);
 			// trigger fancytreeloadchildren
-			// if( node.parent ) {
 			tree._triggerNodeEvent("loadChildren", node);
-			// }
 		// }).always(function(){
 		// 	node._isLoading = false;
 		});
@@ -3791,7 +3827,7 @@ $.extend($.ui.fancytree,
 	/** @lends Fancytree_Static# */
 	{
 	/** @type {string} */
-	version: "2.1.0",      // Set to semver by 'grunt release'
+	version: "2.3.0",      // Set to semver by 'grunt release'
 	/** @type {string} */
 	buildType: "production", // Set to 'production' by 'grunt build'
 	/** @type {int} */

data/app/assets/javascripts/fancytree/src/jquery.fancytree.menu.js

@@ -11,8 +11,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 ;(function($, window, document, undefined) {

data/app/assets/javascripts/fancytree/src/jquery.fancytree.persist.js

@@ -11,8 +11,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 ;(function($, window, document, undefined) {

data/app/assets/javascripts/fancytree/src/jquery.fancytree.table.js

@@ -9,8 +9,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 ;(function($, window, document, undefined) {

data/app/assets/javascripts/fancytree/src/jquery.fancytree.themeroller.js

@@ -11,8 +11,8 @@
  * Released under the MIT license
  * https://github.com/mar10/fancytree/wiki/LicenseInfo
  *
- * @version 2.1.0
- * @date 2014-05-29T16:44
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
  */
 
 ;(function($, window, document, undefined) {

data/app/assets/javascripts/fancytree/src/jquery.fancytree.wide.js

@@ -0,0 +1,124 @@
+/*!
+ *
+ * jquery.fancytree.wide.js
+ * Support for 100% wide selection bars.
+ * (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
+ *
+ * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ *
+ * Released under the MIT license
+ * https://github.com/mar10/fancytree/wiki/LicenseInfo
+ *
+ * @version 2.3.0
+ * @date 2014-08-17T10:39
+ */
+
+;(function($, window, document, undefined) {
+
+"use strict";
+
+/*******************************************************************************
+ * Private functions and variables
+ */
+// function _assert(cond, msg){
+// 	// TODO: see qunit.js extractStacktrace()
+// 	if(!cond){
+// 		msg = msg ? ": " + msg : "";
+// 		$.error("Assertion failed" + msg);
+// 	}
+// }
+
+/* Calculate inner width without scrollbar */
+function realInnerWidth($el) {
+	// http://blog.jquery.com/2012/08/16/jquery-1-8-box-sizing-width-csswidth-and-outerwidth/
+//	inst.contWidth = parseFloat(this.$container.css("width"), 10);
+	// 'Client width without scrollbar' - 'padding'
+	return $el[0].clientWidth - ($el.innerWidth() -  parseFloat($el.css("width"), 10));
+}
+
+
+/**
+ * [ext-wide] Recalculate the width of the selection bar after the tree container
+ * was resized.<br>
+ * May be called explicitly on container resize, since there is no resize event
+ * for DIV tags.
+ *
+ * @alias Fancytree#wideUpdate
+ * @requires jquery.fancytree.wide.js
+ */
+$.ui.fancytree._FancytreeClass.prototype.wideUpdate = function(){
+	var inst = this.ext.wide,
+		prevCw = inst.contWidth,
+		prevLo = inst.lineOfs;
+	// http://blog.jquery.com/2012/08/16/jquery-1-8-box-sizing-width-csswidth-and-outerwidth/
+//	inst.contWidth = parseFloat(this.$container.css("width"), 10);
+	inst.contWidth = realInnerWidth(this.$container);
+	// Each title is precceeded by 2 or 3 icons (16px + 3 margin)
+	//     + 1px title border and 3px title padding
+	inst.lineOfs = (this.options.checkbox ? 3 : 2) * 19;
+	if( prevCw !== inst.contWidth || prevLo !== inst.lineOfs ) {
+		this.debug("wideUpdate: " + inst.contWidth);
+		this.visit(function(node){
+			node.tree._callHook("nodeRenderTitle", node);
+		});
+	}
+};
+
+/*******************************************************************************
+ * Extension code
+ */
+$.ui.fancytree.registerExtension({
+	name: "wide",
+	version: "0.0.2",
+	// Default options for this extension.
+	options: {
+		autoResize: true,  // call wideUpdate() on window.resize events
+		cheap: false,      // true: use static css only
+		margin: {left: 3, right: 3} // free margins near the selection bar
+	},
+
+	treeCreate: function(ctx){
+		this.$container.addClass("fancytree-ext-wide");
+		this._super(ctx);
+		// http://blog.jquery.com/2012/08/16/jquery-1-8-box-sizing-width-csswidth-and-outerwidth/
+//		this._local.contWidth = parseFloat(ctx.tree.$container.css("width"), 10);
+		this._local.contWidth = realInnerWidth(ctx.tree.$container);
+		// Every nested UL is indented by 16px
+		// Each title is precceeded by 2 or 3 icons (16px + 3 margin)
+		//     + 1px title border and 3px title padding
+		this._local.lineOfs = (ctx.options.checkbox ? 3 : 2) * 19;
+		this._local.levelOfs = 16;
+		this._local.titlePadding = 3;
+		$(window).on("resize" + ctx.widget.eventNamespace, $.ui.fancytree.debounce(200, function(event){
+			if( ctx.options.wide.autoResize && !ctx.options.wide.cheap ) {
+				ctx.tree.wideUpdate();
+			}
+		}));
+	},
+	treeDestroy: function(ctx){
+		$(window).off("resize" + ctx.widget.eventNamespace);
+		this._super(ctx);
+	},
+	nodeRenderTitle: function(ctx) {
+		var ofs, res, margin,
+			instOpts = ctx.options.wide,
+			inst = this._local,
+			cw = inst.contWidth,
+			node = ctx.node;
+
+		res = this._super(ctx);
+
+		if( !instOpts.cheap ) {
+			margin = instOpts.margin;
+			ofs = (node.getLevel() - 1) * inst.levelOfs + inst.lineOfs;
+			$(node.span).find(".fancytree-title").css({
+				width: cw - margin.left - margin.right - ofs,
+				marginLeft:  -ofs + margin.left,
+				paddingLeft: +ofs - margin.left + inst.titlePadding,
+				paddingRight: inst.titlePadding
+			});
+		}
+		return res;
+	}
+});
+}(jQuery, window, document));

data/app/assets/stylesheets/fancytree/skin-lion/ui.fancytree.css.erb

@@ -4,6 +4,11 @@
  * DON'T EDIT THE CSS FILE DIRECTLY, since it is automatically generated from
  * the LESS templates.
  */
+
+/*
+ *= depend_on_asset "fancytree/icons.gif"
+ */
+
 /*
  Lion colors:
 	gray highlight bar: #D4D4D4

data/app/assets/stylesheets/fancytree/skin-vista/ui.fancytree.css.erb

@@ -4,6 +4,11 @@
  * DON'T EDIT THE CSS FILE DIRECTLY, since it is automatically generated from
  * the LESS templates.
  */
+
+/*
+ *= depend_on_asset "fancytree/icons.gif"
+ */
+
 /*
 both:
    unselected background: #FCFCFC 'nearly white'

data/app/assets/stylesheets/fancytree/skin-win7/ui.fancytree.css.erb

@@ -4,6 +4,11 @@
  * DON'T EDIT THE CSS FILE DIRECTLY, since it is automatically generated from
  * the LESS templates.
  */
+
+/*
+ *= depend_on_asset "fancytree/icons.gif"
+ */
+
 /*******************************************************************************
  * Common Styles for Fancytree Skins.
  *

data/app/assets/stylesheets/fancytree/skin-win8-xxl/ui.fancytree.css.erb

@@ -4,6 +4,11 @@
  * DON'T EDIT THE CSS FILE DIRECTLY, since it is automatically generated from
  * the LESS templates.
  */
+
+/*
+ *= depend_on_asset "fancytree/icons.gif"
+ */
+
 /*******************************************************************************
  * Common Styles for Fancytree Skins.
  *