- Note: The ext-menu extension is deprecated and no
+ Note: The ext-menu extension is deprecated and no
longer supported!
- We feel that a context menu is typically used for multiple elements + We feel that a context menu is typically used for multiple elements on a web application and should not be tied to Fancytree only.
Use existing context menus instead, for example
-
-
- jquery-ui-contextmenu +
- jquery-ui-contextmenu (RECOMMENDED, see Fancytree demo and project site.)
- DEPRECATED
ext-menudemo. diff --git a/demo/sample-multi-ext.html b/demo/sample-multi-ext.html index 71242bac..1a9184dd 100644 --- a/demo/sample-multi-ext.html +++ b/demo/sample-multi-ext.html @@ -4,7 +4,7 @@Multiple Extensions - Fancytree - + @@ -113,7 +113,7 @@ // (Index #0 is rendered by fancytree by adding the checkbox) $tdList.eq(1).text(node.getIndexHier()).addClass("alignRight"); - // Index #2 is rendered by fancytree, but we make the title cell + // Index #2 is rendered by fancytree, but we make the title cell // span the remaining columns if it is a folder: if( node.isFolder() ) { $tdList.eq(2) @@ -138,28 +138,28 @@ switch( data.cmd ) { case "moveUp": refNode = node.getPrevSibling(); - if( refNode ) { + if( refNode ) { node.moveTo(refNode, "before"); node.setActive(); } break; case "moveDown": refNode = node.getNextSibling(); - if( refNode ) { + if( refNode ) { node.moveTo(refNode, "after"); node.setActive(); } break; case "indent": refNode = node.getPrevSibling(); - if( refNode ) { + if( refNode ) { node.moveTo(refNode, "child"); refNode.setExpanded(); node.setActive(); } break; case "outdent": - if( !node.isTopLevel() ) { + if( !node.isTopLevel() ) { node.moveTo(node.getParent(), "after"); node.setActive(); } diff --git a/dist/jquery.fancytree-all.js b/dist/jquery.fancytree-all.js index 9eee89d3..af298b25 100644 --- a/dist/jquery.fancytree-all.js +++ b/dist/jquery.fancytree-all.js @@ -3,12 +3,12 @@ * Dynamic tree view control, with support for lazy loading of branches. * https://github.com/mar10/fancytree/ * - * Copyright (c) 2006-2014, Martin Wendt (http://wwWendt.de) + * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de) * Released under the MIT license * https://github.com/mar10/fancytree/wiki/LicenseInfo * - * @version 2.7.0 - * @date 2014-12-21T15:57 + * @version 2.8.0 + * @date 2015-02-08T17:56 */ /** Core Fancytree module. @@ -101,19 +101,26 @@ function _makeVirtualFunction(methodName, tree, base, extension, extName){ _local = tree.ext[extName], _super = function(){ return prevFunc.apply(tree, arguments); + }, + _superApply = function(args){ + return prevFunc.apply(tree, args); }; // Return the wrapper function return function(){ var prevLocal = tree._local, - prevSuper = tree._super; + prevSuper = tree._super, + prevSuperApply = tree._superApply; + try{ tree._local = _local; tree._super = _super; + tree._superApply = _superApply; return baseFunc.apply(tree, arguments); }finally{ tree._local = prevLocal; tree._super = prevSuper; + tree._superApply = prevSuperApply; } }; })(); // end of Immediate Function @@ -218,6 +225,7 @@ var i, 123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 221: "]", 222: "'"}, + MOUSE_BUTTONS = { 0: "", 1: "left", 2: "middle", 3: "right" }, //boolean attributes that can be set with equivalent class names in the LI tags CLASS_ATTRS = "active expanded focus folder hideCheckbox lazy selected unselectable".split(" "), CLASS_ATTR_MAP = {}, @@ -1453,8 +1461,12 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{ newScrollTop = null; // this.debug("scrollIntoView(), scrollTop=", scrollTop, opts.scrollOfs); - _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets - +// _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets + if( !$(this.span).is(":visible") ) { + // We cannot calc offsets for hidden elements + this.warn("scrollIntoView(): node is invisible."); + return _getResolvedPromise(); + } if( isParentWindow ) { nodeY = $(this.span).offset().top; topNodeY = (topNode && topNode.span) ? $(topNode.span).offset().top : 0; @@ -1967,7 +1979,7 @@ Fancytree.prototype = /** @lends Fancytree# */{ this.warn("could not find node with key '" + key + "'"); } } - // Return a promise that is resovled, when ALL patches were applied + // Return a promise that is resolved, when ALL patches were applied return $.when.apply($, deferredList).promise(); }, /* TODO: implement in dnd extension @@ -2124,12 +2136,10 @@ Fancytree.prototype = /** @lends Fancytree# */{ return this.rootNode.getFirstChild(); }, /** - * Return node that has keyboard focus. - * @param {boolean} [ifTreeHasFocus=false] (not yet implemented) + * Return node that has keyboard focus or null. * @returns {FancytreeNode} */ - getFocusNode: function(ifTreeHasFocus) { - // TODO: implement ifTreeHasFocus + getFocusNode: function() { return this.focusNode; }, /** @@ -2298,7 +2308,7 @@ Fancytree.prototype = /** @lends Fancytree# */{ deferredList.push(dfd); __lazyload(key, node, dfd); } - // Return a promise that is resovled, when ALL paths were loaded + // Return a promise that is resolved, when ALL paths were loaded return $.when.apply($, deferredList).promise(); }, /** Re-fire beforeActivate and activate events. */ @@ -2520,14 +2530,14 @@ $.extend(Fancytree.prototype, handled = true, activate = !(event.ctrlKey || !opts.autoActivate ); -// node.debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which); -// FT.debug("keyEventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.keyEventToString(event) + '"'); +// (node || FT).debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which); +// FT.debug("eventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.eventToString(event) + '"'); - // Set focus to first node, if no other node has the focus yet + // Set focus to active (or first node) if no other node has the focus yet if( !node ){ - this.getFirstChild().setFocus(); + (this.getActiveNode() || this.getFirstChild()).setFocus(); node = ctx.node = this.focusNode; - node.debug("Keydown force focus on first node"); + node.debug("Keydown force focus on active node"); } if( opts.quicksearch && clean && /\w/.test(whichChar) && !$target.is(":input:enabled") ) { @@ -2546,7 +2556,7 @@ $.extend(Fancytree.prototype, event.preventDefault(); return; } - switch( FT.keyEventToString(event) ) { + switch( FT.eventToString(event) ) { case "+": case "=": // 187: '+' @ Chrome, Safari tree.nodeSetExpanded(ctx, true); @@ -2664,7 +2674,16 @@ $.extend(Fancytree.prototype, source.rejectWith(this, [errorObj]); }); } - + // #383: accept and convert ECMAScript 6 Promise + if( $.isFunction(source.then) && $.isFunction(source["catch"]) ) { + dfd = source; + source = new $.Deferred(); + dfd.then(function(value){ + source.resolve(value); + }, function(reason){ + source.reject(reason); + }); + } if($.isFunction(source.promise)){ // `source` is a deferred, i.e. ajax request _assert(!node.isLoading()); @@ -3225,7 +3244,7 @@ $.extend(Fancytree.prototype, * If flag is false, the node is deactivated (must be a synchronous operation) * @param {EventData} ctx * @param {boolean} [flag=true] - * @param {object} [opts] additional options. Defaults to {noEvents: false} + * @param {object} [opts] additional options. Defaults to {noEvents: false, noFocus: false} * @returns {$.Promise} */ nodeSetActive: function(ctx, flag, callOpts) { @@ -3236,6 +3255,7 @@ $.extend(Fancytree.prototype, tree = ctx.tree, opts = ctx.options, noEvents = (callOpts.noEvents === true), + noFocus = (callOpts.noFocus === true), isActive = (node === tree.activeNode); // flag defaults to true @@ -3262,7 +3282,9 @@ $.extend(Fancytree.prototype, } tree.activeNode = node; tree.nodeRenderStatus(ctx); - tree.nodeSetFocus(ctx); + if( !noFocus ) { + tree.nodeSetFocus(ctx); + } if( !noEvents ) { tree._triggerNodeEvent("activate", node, ctx.originalEvent); } @@ -3431,7 +3453,7 @@ $.extend(Fancytree.prototype, // node.debug("nodeSetExpanded: returns"); return dfd.promise(); }, - /** Focus ot blur this node. + /** Focus or blur this node. * @param {EventData} ctx * @param {boolean} [flag=true] */ @@ -3458,10 +3480,8 @@ $.extend(Fancytree.prototype, if(flag){ if( !this.hasFocus() ){ node.debug("nodeSetFocus: forcing container focus"); - // Note: we pass _calledByNodeSetFocus=true - this._callHook("treeSetFocus", ctx, true, true); + this._callHook("treeSetFocus", ctx, true, {calledByNode: true}); } - // this.nodeMakeVisible(ctx); node.makeVisible({scrollIntoView: false}); tree.focusNode = node; // node.debug("FOCUS..."); @@ -3709,14 +3729,18 @@ $.extend(Fancytree.prototype, * @param {EventData} ctx * @param {boolean} [flag=true] */ - treeSetFocus: function(ctx, flag, _calledByNodeSetFocus) { + treeSetFocus: function(ctx, flag, callOpts) { flag = (flag !== false); - // this.debug("treeSetFocus(" + flag + "), _calledByNodeSetFocus: " + _calledByNodeSetFocus); + // this.debug("treeSetFocus(" + flag + "), callOpts: " + callOpts); // this.debug(" focusNode: " + this.focusNode); // this.debug(" activeNode: " + this.activeNode); if( flag !== this.hasFocus() ){ this._hasFocus = flag; + if( !flag && this.focusNode ) { + // Node also looses focus if widget blurs + this.focusNode.setFocus(false); + } this.$container.toggleClass("fancytree-treefocus", flag); this._triggerTreeEvent(flag ? "focusTree" : "blurTree"); } @@ -4042,7 +4066,7 @@ $.extend($.ui.fancytree, /** @lends Fancytree_Static# */ { /** @type {string} */ - version: "2.7.0", // Set to semver by 'grunt release' + version: "2.8.0", // Set to semver by 'grunt release' /** @type {string} */ buildType: "production", // Set to 'production' by 'grunt build' /** @type {int} */ @@ -4116,6 +4140,37 @@ $.extend($.ui.fancytree, return ENTITY_MAP[s]; }); }, + /** Make jQuery.position() arguments backwards compatible, i.e. if + * jQuery UI version <= 1.8, convert + * { my: "left+3 center", at: "left bottom", of: $target } + * to + * { my: "left center", at: "left bottom", of: $target, offset: "3 0" } + * + * See http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at + * and http://jsfiddle.net/mar10/6xtu9a4e/ + */ + fixPositionOptions: function(opts) { + if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) { + $.error("expected new position syntax (but '%' is not supported)"); + } + if( ! $.ui.fancytree.jquerySupports.positionMyOfs ) { + var // parse 'left+3 center' into ['left+3 center', 'left', '+3', 'center', undefined] + myParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.my), + atParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.at), + // convert to numbers + dx = (myParts[2] ? (+myParts[2]) : 0) + (atParts[2] ? (+atParts[2]) : 0), + dy = (myParts[4] ? (+myParts[4]) : 0) + (atParts[4] ? (+atParts[4]) : 0); + + opts = $.extend({}, opts, { // make a copy and overwrite + my: myParts[1] + " " + myParts[3], + at: atParts[1] + " " + atParts[3] + }); + if( dx || dy ) { + opts.offset = "" + dx + " " + dy; + } + } + return opts; + }, /** Return a {node: FancytreeNode, type: TYPE} object for a mouse event. * * @param {Event} event Mouse event, e.g. click, ... @@ -4197,25 +4252,38 @@ $.extend($.ui.fancytree, /*jshint expr:true */ ($.ui.fancytree.debugLevel >= 1) && consoleApply("info", arguments); }, - /** Convert a keydown event to a string like 'ctrl+a', 'ctrl+shift+f2'. + /** Convert a keydown or mouse event to a canonical string like 'ctrl+a', 'ctrl+shift+f2', 'shift+leftdblclick'. + * This is especially handy for switch-statements in event handlers. * @param {event} * @returns {string} */ - keyEventToString: function(event) { + eventToString: function(event) { // Poor-man's hotkeys. See here for a complete implementation: // https://github.com/jeresig/jquery.hotkeys var which = event.which, + et = event.type, s = []; if( event.altKey ) { s.push("alt"); } if( event.ctrlKey ) { s.push("ctrl"); } if( event.metaKey ) { s.push("meta"); } if( event.shiftKey ) { s.push("shift"); } - if( !IGNORE_KEYCODES[which] ) { - s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() ); + + if( et === "click" || et === "dblclick" ) { + s.push(MOUSE_BUTTONS[event.button] + et); + } else { + if( !IGNORE_KEYCODES[which] ) { + s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() ); + } } return s.join("+"); }, + /* @deprecated: use eventToString(event) instead. + */ + keyEventToString: function(event) { + this.warn("keyEventToString() is deprecated: use eventToString()"); + return this.eventToString(event); + }, /** * Parse tree data from HTML- markup
*
@@ -4355,13 +4423,13 @@ $.extend($.ui.fancytree,
* Add a child counter bubble to tree nodes.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
// To keep the global namespace clean, we wrap everything in a closure
@@ -4485,7 +4553,7 @@ $.ui.fancytree.registerExtension({
// Optionally check for dependencies with other extensions
/* this._requireExtension("glyph", false, false); */
// Call the base implementation
- this._super(ctx);
+ this._superApply(arguments);
// Add a class to the tree container
this.$container.addClass("fancytree-ext-childcounter");
},
@@ -4494,7 +4562,7 @@ $.ui.fancytree.registerExtension({
// this method could as well be omitted).
treeDestroy: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
// Overload the `renderTitle` hook, to append a counter badge
@@ -4503,7 +4571,7 @@ $.ui.fancytree.registerExtension({
extOpts = ctx.options.childcounter,
count = (node.data.childCounter == null) ? node.countChildren(extOpts.deep) : +node.data.childCounter;
// Let the base implementation render the title
- this._super(ctx, title);
+ this._superApply(arguments);
// Append a counter badge
if( (count || ! extOpts.hideZeros) && (!node.isExpanded() || !extOpts.hideExpanded) ){
$("span.fancytree-icon", node.span).append($("").text(count));
@@ -4515,7 +4583,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node;
// Let the base implementation expand/collapse the node, then redraw the title
// after the animation has finished
- return this._super(ctx, flag, opts).always(function(){
+ return this._superApply(arguments).always(function(){
tree.nodeRenderTitle(ctx);
});
}
@@ -4531,13 +4599,13 @@ $.ui.fancytree.registerExtension({
* Support faster lookup of nodes by key and shared ref-ids.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -4863,7 +4931,7 @@ $.ui.fancytree.registerExtension({
},
treeCreate: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
ctx.tree.refMap = {};
ctx.tree.keyMap = {};
},
@@ -4875,12 +4943,12 @@ $.ui.fancytree.registerExtension({
return calcUniqueKey(node);
};
// The default implementation loads initial data
- this._super(ctx);
+ this._superApply(arguments);
},
treeClear: function(ctx){
ctx.tree.refMap = {};
ctx.tree.keyMap = {};
- return this._super(ctx);
+ return this._superApply(arguments);
},
treeRegisterNode: function(ctx, add, node) {
var refList, len,
@@ -4893,7 +4961,7 @@ $.ui.fancytree.registerExtension({
// ctx.tree.debug("clones.treeRegisterNode", add, node);
if( key === "_statusNode" ){
- return this._super(ctx, add, node);
+ return this._superApply(arguments);
}
if( add ) {
@@ -4941,13 +5009,13 @@ $.ui.fancytree.registerExtension({
}
}
}
- return this._super(ctx, add, node);
+ return this._superApply(arguments);
},
nodeRenderStatus: function(ctx) {
var $span, res,
node = ctx.node;
- res = this._super(ctx);
+ res = this._superApply(arguments);
if( ctx.options.clones.highlightClones ) {
$span = $(node[ctx.tree.statusClassPropName]);
@@ -4964,7 +5032,7 @@ $.ui.fancytree.registerExtension({
scpn = ctx.tree.statusClassPropName,
node = ctx.node;
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
if( ctx.options.clones.highlightActiveClones && node.isClone() ) {
$.each(node.getCloneList(true), function(idx, n){
@@ -4983,13 +5051,13 @@ $.ui.fancytree.registerExtension({
* Drag-and-drop support.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -5210,7 +5278,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
// issue #270: draggable eats mousedown events
if( tree.options.dnd.dragStart ){
tree.$container.on("mousedown", function(event){
@@ -5235,18 +5303,17 @@ $.ui.fancytree.registerExtension({
if( event.which === $.ui.keyCode.ESCAPE) {
this._local._cancelDrag();
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeClick: function(ctx) {
// if( ctx.options.dnd.dragStart ){
// ctx.tree.$container.focus();
// }
- return this._super(ctx);
+ return this._superApply(arguments);
},
/* Display drop marker according to hitMode ('after', 'before', 'over', 'out', 'start', 'stop'). */
_setDndStatus: function(sourceNode, targetNode, helper, hitMode, accept) {
- var posOpts,
- markerOffsetX = 0,
+ var markerOffsetX = 0,
markerAt = "center",
instData = this._local,
$source = sourceNode ? $(sourceNode.span) : null,
@@ -5284,23 +5351,13 @@ $.ui.fancytree.registerExtension({
markerOffsetX = 8;
}
- if( $.ui.fancytree.jquerySupports.positionMyOfs ){
- posOpts = {
+ instData.$dropMarker
+ .show()
+ .position($.ui.fancytree.fixPositionOptions({
my: "left" + offsetString(markerOffsetX) + " center",
at: "left " + markerAt,
of: $target
- };
- } else {
- posOpts = {
- my: "left center",
- at: "left " + markerAt,
- of: $target,
- offset: "" + markerOffsetX + " 0"
- };
- }
- instData.$dropMarker
- .show()
- .position(posOpts);
+ }));
// helper.addClass("fancytree-drop-hover");
} else {
// $source && $source.removeClass("fancytree-drag-source");
@@ -5547,13 +5604,13 @@ $.ui.fancytree.registerExtension({
* Make node titles editable.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -5809,7 +5866,7 @@ $.ui.fancytree.registerExtension({
currentNode: null,
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-edit");
},
nodeClick: function(ctx) {
@@ -5819,14 +5876,14 @@ $.ui.fancytree.registerExtension({
return false;
}
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeDblclick: function(ctx) {
if( $.inArray("dblclick", ctx.options.edit.triggerStart) >= 0 ){
ctx.node.editStart();
return false;
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeKeydown: function(ctx) {
switch( ctx.originalEvent.which ) {
@@ -5843,7 +5900,7 @@ $.ui.fancytree.registerExtension({
}
break;
}
- return this._super(ctx);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
@@ -5854,13 +5911,13 @@ $.ui.fancytree.registerExtension({
* Remove or highlight tree nodes, based on a filter.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -5992,10 +6049,10 @@ $.ui.fancytree.registerExtension({
mode: "dimm"
},
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
nodeLoadChildren: function(ctx, source) {
- return this._super(ctx, source).done(function() {
+ return this._superApply(arguments).done(function() {
if( ctx.tree.enableFilter && ctx.tree.lastFilterArgs && ctx.options.filter.autoApply ) {
ctx.tree._applyFilterImpl.apply(ctx.tree, ctx.tree.lastFilterArgs);
}
@@ -6008,7 +6065,7 @@ $.ui.fancytree.registerExtension({
tree = ctx.tree,
$span = $(node[tree.statusClassPropName]);
- res = this._super(ctx);
+ res = this._superApply(arguments);
// nothing to do, if node was not yet rendered
if( !$span.length || !tree.enableFilter ) {
return res;
@@ -6029,13 +6086,13 @@ $.ui.fancytree.registerExtension({
* Use glyph fonts as instead of icon sprites.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -6077,7 +6134,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
tree.$container.addClass("fancytree-ext-glyph");
},
nodeRenderStatus: function(ctx) {
@@ -6090,7 +6147,7 @@ $.ui.fancytree.registerExtension({
// $span = $(node.span)
;
- this._super(ctx);
+ this._superApply(arguments);
if( node.isRoot() ){
return;
@@ -6138,7 +6195,7 @@ $.ui.fancytree.registerExtension({
opts = ctx.options.glyph,
node = ctx.node;
- this._super(ctx, status, message, details);
+ this._superApply(arguments);
if(node.parent){
span = $("span.fancytree-expander", node.span).get(0);
@@ -6162,13 +6219,13 @@ $.ui.fancytree.registerExtension({
* Support keyboard navigation for trees with embedded input controls.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -6283,7 +6340,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
// gridnav requires the table extension to be loaded before itself
this._requireExtension("table", true, true);
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-gridnav");
@@ -6308,7 +6365,7 @@ $.ui.fancytree.registerExtension({
flag = (flag !== false);
- this._super(ctx, flag);
+ this._superApply(arguments);
if( flag ){
if( ctx.options.titlesTabbable ){
@@ -6350,8 +6407,8 @@ $.ui.fancytree.registerExtension({
}
return true;
}
- ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
- return this._super(ctx);
+ // ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
@@ -6364,13 +6421,13 @@ $.ui.fancytree.registerExtension({
*
* @depends: jquery.cookie.js
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -6581,7 +6638,7 @@ $.ui.fancytree.registerExtension({
// Bind init-handler to apply cookie state
tree.$div.bind("fancytreeinit", function(event){
var cookie, dfd, i, keyList, node,
- prevFocus = $.cookie(local.cookiePrefix + FOCUS); // record this before node.setActive() overrides it;
+ prevFocus = local._data(local.cookiePrefix + FOCUS); // record this before node.setActive() overrides it;
// tree.debug("document.cookie:", document.cookie);
@@ -6632,28 +6689,37 @@ $.ui.fancytree.registerExtension({
if(cookie && (opts.persist.overrideSource || !tree.activeNode)){
node = tree.getNodeByKey(cookie);
if(node){
- node.setActive();
+ node.debug("persist: set active", cookie);
+ // We only want to set the focus if the container
+ // had the keyboard focus before
+ node.setActive(true, {noFocus: true});
}
}
}
if(local.storeFocus && prevFocus){
node = tree.getNodeByKey(prevFocus);
if(node){
- node.setFocus();
+ // node.debug("persist: set focus", cookie);
+ if( tree.options.titlesTabbable ) {
+ $(node.span).find(".fancytree-title").focus();
+ } else {
+ $(tree.$container).focus();
+ }
+ // node.setFocus();
}
}
tree._triggerTreeEvent("restore", null, {});
});
});
// Init the tree
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeSetActive: function(ctx, flag, opts) {
var res,
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag, opts);
+ res = this._superApply(arguments);
if(local.storeActive){
local._data(local.cookiePrefix + ACTIVE, this.activeNode ? this.activeNode.key : null);
@@ -6666,7 +6732,7 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag, opts);
+ res = this._superApply(arguments);
if(local.storeExpanded){
local._appendKey(EXPANDED, node.key, flag);
@@ -6678,9 +6744,9 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
- if(flag && local.storeFocus){
+ if( local.storeFocus ) {
local._data(local.cookiePrefix + FOCUS, this.focusNode ? this.focusNode.key : null);
}
return res;
@@ -6692,7 +6758,7 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
if(local.storeSelected){
if( tree.options.selectMode === 3 ){
@@ -6719,13 +6785,13 @@ $.ui.fancytree.registerExtension({
* Render tree as table (aka 'treegrid', 'tabletree').
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -6831,7 +6897,7 @@ $.ui.fancytree.registerExtension({
tree.ariaPropName = "tr";
this.nodeContainerAttrName = "tr";
- this._super(ctx);
+ this._superApply(arguments);
// standard Fancytree created a root UL
$(tree.rootNode.ul).remove();
@@ -6980,7 +7046,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node,
opts = ctx.options;
- this._super(ctx);
+ this._superApply(arguments);
// Move checkbox to custom column
if(opts.checkbox && opts.table.checkboxColumnIdx != null ){
$cb = $("span.fancytree-checkbox", node.span).detach();
@@ -7003,7 +7069,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node,
opts = ctx.options;
- this._super(ctx);
+ this._superApply(arguments);
$(node.tr).removeClass("fancytree-node");
// indent
@@ -7058,11 +7124,11 @@ $.ui.fancytree.registerExtension({
$(firstChild.tr).remove();
}
}
- this._super(ctx, status, message, details);
+ return this._superApply(arguments);
},
treeClear: function(ctx) {
this.nodeRemoveChildMarkup(this._makeHookContext(this.rootNode));
- return this._super(ctx);
+ return this._superApply(arguments);
}
/*,
treeSetFocus: function(ctx, flag) {
@@ -7081,13 +7147,13 @@ $.ui.fancytree.registerExtension({
*
* @see http://jqueryui.com/themeroller/
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -7109,7 +7175,7 @@ $.ui.fancytree.registerExtension({
},
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
var $el = ctx.widget.element;
if($el[0].nodeName === "TABLE"){
@@ -7128,13 +7194,13 @@ $.ui.fancytree.registerExtension({
});
},
treeDestroy: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
ctx.widget.element.removeClass("ui-widget ui-widget-content ui-corner-all");
},
nodeRenderStatus: function(ctx){
var node = ctx.node,
$el = $(node.span);
- this._super(ctx);
+ this._superApply(arguments);
/*
.ui-state-highlight: Class to be applied to highlighted or selected elements. Applies "highlight" container styles to an element and its child text, links, and icons.
.ui-state-error: Class to be applied to error messaging container elements. Applies "error" container styles to an element and its child text, links, and icons.
@@ -7158,13 +7224,13 @@ $.ui.fancytree.registerExtension({
* 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)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -7271,7 +7337,7 @@ $.ui.fancytree.registerExtension({
},
treeCreate: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-wide");
var containerId, cssText, iconSpacingUnit, iconWidthUnit, levelOfsUnit,
@@ -7311,14 +7377,14 @@ $.ui.fancytree.registerExtension({
treeDestroy: function(ctx){
// Remove generated css rules
defineHeadStyleElement(this.$container.attr("id"), null);
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeRenderStatus: function(ctx) {
var containerId, cssText, res,
node = ctx.node,
level = node.getLevel();
- res = this._super(ctx);
+ res = this._superApply(arguments);
// Generate some more level-n rules if required
if( level > this._local.maxDepth ) {
containerId = this.$container.attr("id");
diff --git a/dist/jquery.fancytree-all.min.js b/dist/jquery.fancytree-all.min.js
index ff2037fa..4f030a8d 100644
--- a/dist/jquery.fancytree-all.min.js
+++ b/dist/jquery.fancytree-all.min.js
@@ -1,6 +1,6 @@
-/*! jQuery Fancytree Plugin - 2.7.0 - 2014-12-21T15:57
+/*! jQuery Fancytree Plugin - 2.8.0 - 2015-02-08T17:56
* https://github.com/mar10/fancytree
- * Copyright (c) 2014 Martin Wendt; Licensed MIT */
+ * Copyright (c) 2015 Martin Wendt; Licensed MIT */
(function( factory ) {
if ( typeof define === "function" && define.amd ) {
define( [ "jquery" ], factory );
@@ -9,36 +9,36 @@
}
}(function( $ ) {
-!function(a,b,c,d){"use strict";function e(b,c){b||(c=c?": "+c:"",a.error("Fancytree assertion failed"+c))}function f(a,c){var d,e,f=b.console?b.console[a]:null;if(f)try{f.apply(b.console,c)}catch(g){for(e="",d=0;d
- hierarchy
- this._super(ctx, force, deep, collapsed, _recursive);
+ this._superApply(arguments);
// Remove expander and add a trailing triangle instead
var level, $tdChild, $ul,
tree = ctx.tree,
diff --git a/dist/src/jquery.fancytree.debug.js b/dist/src/jquery.fancytree.debug.js
index 14a4d29e..810af922 100644
--- a/dist/src/jquery.fancytree.debug.js
+++ b/dist/src/jquery.fancytree.debug.js
@@ -4,13 +4,13 @@
* Miscellaneous debug extensions.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -59,7 +59,7 @@ $.ui.fancytree.registerExtension({
tree.debug("COOKIE " + document.cookie);
});
// Init the tree
- this._super(ctx);
+ this._superApply(arguments);
},
nodeClick: function(ctx) {
if(this.options.tracecalls.traceHooks){
@@ -135,7 +135,7 @@ $.ui.fancytree.registerExtension({
var s = this.options.prefix + "render '" + ctx.node + "'";
/*jshint expr:true */
window.console && window.console.time && window.console.time(s);
- this._super(ctx, force, deep, collapsed);
+ this._superApply(arguments);
window.console && window.console.timeEnd && window.console.timeEnd(s);
}
});
diff --git a/dist/src/jquery.fancytree.dnd.js b/dist/src/jquery.fancytree.dnd.js
index 38cf6af1..05fccfd7 100644
--- a/dist/src/jquery.fancytree.dnd.js
+++ b/dist/src/jquery.fancytree.dnd.js
@@ -4,13 +4,13 @@
* Drag-and-drop support.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -231,7 +231,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
// issue #270: draggable eats mousedown events
if( tree.options.dnd.dragStart ){
tree.$container.on("mousedown", function(event){
@@ -256,18 +256,17 @@ $.ui.fancytree.registerExtension({
if( event.which === $.ui.keyCode.ESCAPE) {
this._local._cancelDrag();
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeClick: function(ctx) {
// if( ctx.options.dnd.dragStart ){
// ctx.tree.$container.focus();
// }
- return this._super(ctx);
+ return this._superApply(arguments);
},
/* Display drop marker according to hitMode ('after', 'before', 'over', 'out', 'start', 'stop'). */
_setDndStatus: function(sourceNode, targetNode, helper, hitMode, accept) {
- var posOpts,
- markerOffsetX = 0,
+ var markerOffsetX = 0,
markerAt = "center",
instData = this._local,
$source = sourceNode ? $(sourceNode.span) : null,
@@ -305,23 +304,13 @@ $.ui.fancytree.registerExtension({
markerOffsetX = 8;
}
- if( $.ui.fancytree.jquerySupports.positionMyOfs ){
- posOpts = {
+ instData.$dropMarker
+ .show()
+ .position($.ui.fancytree.fixPositionOptions({
my: "left" + offsetString(markerOffsetX) + " center",
at: "left " + markerAt,
of: $target
- };
- } else {
- posOpts = {
- my: "left center",
- at: "left " + markerAt,
- of: $target,
- offset: "" + markerOffsetX + " 0"
- };
- }
- instData.$dropMarker
- .show()
- .position(posOpts);
+ }));
// helper.addClass("fancytree-drop-hover");
} else {
// $source && $source.removeClass("fancytree-drag-source");
diff --git a/dist/src/jquery.fancytree.edit.js b/dist/src/jquery.fancytree.edit.js
index 19a3a8e0..dd9e1e01 100644
--- a/dist/src/jquery.fancytree.edit.js
+++ b/dist/src/jquery.fancytree.edit.js
@@ -4,13 +4,13 @@
* Make node titles editable.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -266,7 +266,7 @@ $.ui.fancytree.registerExtension({
currentNode: null,
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-edit");
},
nodeClick: function(ctx) {
@@ -276,14 +276,14 @@ $.ui.fancytree.registerExtension({
return false;
}
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeDblclick: function(ctx) {
if( $.inArray("dblclick", ctx.options.edit.triggerStart) >= 0 ){
ctx.node.editStart();
return false;
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeKeydown: function(ctx) {
switch( ctx.originalEvent.which ) {
@@ -300,7 +300,7 @@ $.ui.fancytree.registerExtension({
}
break;
}
- return this._super(ctx);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
diff --git a/dist/src/jquery.fancytree.filter.js b/dist/src/jquery.fancytree.filter.js
index b4968f4c..d72fe207 100644
--- a/dist/src/jquery.fancytree.filter.js
+++ b/dist/src/jquery.fancytree.filter.js
@@ -4,13 +4,13 @@
* Remove or highlight tree nodes, based on a filter.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -142,10 +142,10 @@ $.ui.fancytree.registerExtension({
mode: "dimm"
},
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
nodeLoadChildren: function(ctx, source) {
- return this._super(ctx, source).done(function() {
+ return this._superApply(arguments).done(function() {
if( ctx.tree.enableFilter && ctx.tree.lastFilterArgs && ctx.options.filter.autoApply ) {
ctx.tree._applyFilterImpl.apply(ctx.tree, ctx.tree.lastFilterArgs);
}
@@ -158,7 +158,7 @@ $.ui.fancytree.registerExtension({
tree = ctx.tree,
$span = $(node[tree.statusClassPropName]);
- res = this._super(ctx);
+ res = this._superApply(arguments);
// nothing to do, if node was not yet rendered
if( !$span.length || !tree.enableFilter ) {
return res;
diff --git a/dist/src/jquery.fancytree.glyph.js b/dist/src/jquery.fancytree.glyph.js
index c589d993..9af44ebc 100644
--- a/dist/src/jquery.fancytree.glyph.js
+++ b/dist/src/jquery.fancytree.glyph.js
@@ -4,13 +4,13 @@
* Use glyph fonts as instead of icon sprites.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -52,7 +52,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
tree.$container.addClass("fancytree-ext-glyph");
},
nodeRenderStatus: function(ctx) {
@@ -65,7 +65,7 @@ $.ui.fancytree.registerExtension({
// $span = $(node.span)
;
- this._super(ctx);
+ this._superApply(arguments);
if( node.isRoot() ){
return;
@@ -113,7 +113,7 @@ $.ui.fancytree.registerExtension({
opts = ctx.options.glyph,
node = ctx.node;
- this._super(ctx, status, message, details);
+ this._superApply(arguments);
if(node.parent){
span = $("span.fancytree-expander", node.span).get(0);
diff --git a/dist/src/jquery.fancytree.gridnav.js b/dist/src/jquery.fancytree.gridnav.js
index 8e7a0d90..1f936c5e 100644
--- a/dist/src/jquery.fancytree.gridnav.js
+++ b/dist/src/jquery.fancytree.gridnav.js
@@ -4,13 +4,13 @@
* Support keyboard navigation for trees with embedded input controls.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -125,7 +125,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
// gridnav requires the table extension to be loaded before itself
this._requireExtension("table", true, true);
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-gridnav");
@@ -150,7 +150,7 @@ $.ui.fancytree.registerExtension({
flag = (flag !== false);
- this._super(ctx, flag);
+ this._superApply(arguments);
if( flag ){
if( ctx.options.titlesTabbable ){
@@ -192,8 +192,8 @@ $.ui.fancytree.registerExtension({
}
return true;
}
- ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
- return this._super(ctx);
+ // ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
diff --git a/dist/src/jquery.fancytree.js b/dist/src/jquery.fancytree.js
index ec0975d9..a5da1ff9 100644
--- a/dist/src/jquery.fancytree.js
+++ b/dist/src/jquery.fancytree.js
@@ -3,12 +3,12 @@
* Dynamic tree view control, with support for lazy loading of branches.
* https://github.com/mar10/fancytree/
*
- * Copyright (c) 2006-2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
/** Core Fancytree module.
@@ -101,19 +101,26 @@ function _makeVirtualFunction(methodName, tree, base, extension, extName){
_local = tree.ext[extName],
_super = function(){
return prevFunc.apply(tree, arguments);
+ },
+ _superApply = function(args){
+ return prevFunc.apply(tree, args);
};
// Return the wrapper function
return function(){
var prevLocal = tree._local,
- prevSuper = tree._super;
+ prevSuper = tree._super,
+ prevSuperApply = tree._superApply;
+
try{
tree._local = _local;
tree._super = _super;
+ tree._superApply = _superApply;
return baseFunc.apply(tree, arguments);
}finally{
tree._local = prevLocal;
tree._super = prevSuper;
+ tree._superApply = prevSuperApply;
}
};
})(); // end of Immediate Function
@@ -218,6 +225,7 @@ var i,
123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=",
188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
221: "]", 222: "'"},
+ MOUSE_BUTTONS = { 0: "", 1: "left", 2: "middle", 3: "right" },
//boolean attributes that can be set with equivalent class names in the LI tags
CLASS_ATTRS = "active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),
CLASS_ATTR_MAP = {},
@@ -1453,8 +1461,12 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
newScrollTop = null;
// this.debug("scrollIntoView(), scrollTop=", scrollTop, opts.scrollOfs);
- _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
-
+// _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
+ if( !$(this.span).is(":visible") ) {
+ // We cannot calc offsets for hidden elements
+ this.warn("scrollIntoView(): node is invisible.");
+ return _getResolvedPromise();
+ }
if( isParentWindow ) {
nodeY = $(this.span).offset().top;
topNodeY = (topNode && topNode.span) ? $(topNode.span).offset().top : 0;
@@ -1967,7 +1979,7 @@ Fancytree.prototype = /** @lends Fancytree# */{
this.warn("could not find node with key '" + key + "'");
}
}
- // Return a promise that is resovled, when ALL patches were applied
+ // Return a promise that is resolved, when ALL patches were applied
return $.when.apply($, deferredList).promise();
},
/* TODO: implement in dnd extension
@@ -2124,12 +2136,10 @@ Fancytree.prototype = /** @lends Fancytree# */{
return this.rootNode.getFirstChild();
},
/**
- * Return node that has keyboard focus.
- * @param {boolean} [ifTreeHasFocus=false] (not yet implemented)
+ * Return node that has keyboard focus or null.
* @returns {FancytreeNode}
*/
- getFocusNode: function(ifTreeHasFocus) {
- // TODO: implement ifTreeHasFocus
+ getFocusNode: function() {
return this.focusNode;
},
/**
@@ -2298,7 +2308,7 @@ Fancytree.prototype = /** @lends Fancytree# */{
deferredList.push(dfd);
__lazyload(key, node, dfd);
}
- // Return a promise that is resovled, when ALL paths were loaded
+ // Return a promise that is resolved, when ALL paths were loaded
return $.when.apply($, deferredList).promise();
},
/** Re-fire beforeActivate and activate events. */
@@ -2520,14 +2530,14 @@ $.extend(Fancytree.prototype,
handled = true,
activate = !(event.ctrlKey || !opts.autoActivate );
-// node.debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
-// FT.debug("keyEventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.keyEventToString(event) + '"');
+// (node || FT).debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
+// FT.debug("eventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.eventToString(event) + '"');
- // Set focus to first node, if no other node has the focus yet
+ // Set focus to active (or first node) if no other node has the focus yet
if( !node ){
- this.getFirstChild().setFocus();
+ (this.getActiveNode() || this.getFirstChild()).setFocus();
node = ctx.node = this.focusNode;
- node.debug("Keydown force focus on first node");
+ node.debug("Keydown force focus on active node");
}
if( opts.quicksearch && clean && /\w/.test(whichChar) && !$target.is(":input:enabled") ) {
@@ -2546,7 +2556,7 @@ $.extend(Fancytree.prototype,
event.preventDefault();
return;
}
- switch( FT.keyEventToString(event) ) {
+ switch( FT.eventToString(event) ) {
case "+":
case "=": // 187: '+' @ Chrome, Safari
tree.nodeSetExpanded(ctx, true);
@@ -2664,7 +2674,16 @@ $.extend(Fancytree.prototype,
source.rejectWith(this, [errorObj]);
});
}
-
+ // #383: accept and convert ECMAScript 6 Promise
+ if( $.isFunction(source.then) && $.isFunction(source["catch"]) ) {
+ dfd = source;
+ source = new $.Deferred();
+ dfd.then(function(value){
+ source.resolve(value);
+ }, function(reason){
+ source.reject(reason);
+ });
+ }
if($.isFunction(source.promise)){
// `source` is a deferred, i.e. ajax request
_assert(!node.isLoading());
@@ -3225,7 +3244,7 @@ $.extend(Fancytree.prototype,
* If flag is false, the node is deactivated (must be a synchronous operation)
* @param {EventData} ctx
* @param {boolean} [flag=true]
- * @param {object} [opts] additional options. Defaults to {noEvents: false}
+ * @param {object} [opts] additional options. Defaults to {noEvents: false, noFocus: false}
* @returns {$.Promise}
*/
nodeSetActive: function(ctx, flag, callOpts) {
@@ -3236,6 +3255,7 @@ $.extend(Fancytree.prototype,
tree = ctx.tree,
opts = ctx.options,
noEvents = (callOpts.noEvents === true),
+ noFocus = (callOpts.noFocus === true),
isActive = (node === tree.activeNode);
// flag defaults to true
@@ -3262,7 +3282,9 @@ $.extend(Fancytree.prototype,
}
tree.activeNode = node;
tree.nodeRenderStatus(ctx);
- tree.nodeSetFocus(ctx);
+ if( !noFocus ) {
+ tree.nodeSetFocus(ctx);
+ }
if( !noEvents ) {
tree._triggerNodeEvent("activate", node, ctx.originalEvent);
}
@@ -3431,7 +3453,7 @@ $.extend(Fancytree.prototype,
// node.debug("nodeSetExpanded: returns");
return dfd.promise();
},
- /** Focus ot blur this node.
+ /** Focus or blur this node.
* @param {EventData} ctx
* @param {boolean} [flag=true]
*/
@@ -3458,10 +3480,8 @@ $.extend(Fancytree.prototype,
if(flag){
if( !this.hasFocus() ){
node.debug("nodeSetFocus: forcing container focus");
- // Note: we pass _calledByNodeSetFocus=true
- this._callHook("treeSetFocus", ctx, true, true);
+ this._callHook("treeSetFocus", ctx, true, {calledByNode: true});
}
- // this.nodeMakeVisible(ctx);
node.makeVisible({scrollIntoView: false});
tree.focusNode = node;
// node.debug("FOCUS...");
@@ -3709,14 +3729,18 @@ $.extend(Fancytree.prototype,
* @param {EventData} ctx
* @param {boolean} [flag=true]
*/
- treeSetFocus: function(ctx, flag, _calledByNodeSetFocus) {
+ treeSetFocus: function(ctx, flag, callOpts) {
flag = (flag !== false);
- // this.debug("treeSetFocus(" + flag + "), _calledByNodeSetFocus: " + _calledByNodeSetFocus);
+ // this.debug("treeSetFocus(" + flag + "), callOpts: " + callOpts);
// this.debug(" focusNode: " + this.focusNode);
// this.debug(" activeNode: " + this.activeNode);
if( flag !== this.hasFocus() ){
this._hasFocus = flag;
+ if( !flag && this.focusNode ) {
+ // Node also looses focus if widget blurs
+ this.focusNode.setFocus(false);
+ }
this.$container.toggleClass("fancytree-treefocus", flag);
this._triggerTreeEvent(flag ? "focusTree" : "blurTree");
}
@@ -4042,7 +4066,7 @@ $.extend($.ui.fancytree,
/** @lends Fancytree_Static# */
{
/** @type {string} */
- version: "2.7.0", // Set to semver by 'grunt release'
+ version: "2.8.0", // Set to semver by 'grunt release'
/** @type {string} */
buildType: "production", // Set to 'production' by 'grunt build'
/** @type {int} */
@@ -4116,6 +4140,37 @@ $.extend($.ui.fancytree,
return ENTITY_MAP[s];
});
},
+ /** Make jQuery.position() arguments backwards compatible, i.e. if
+ * jQuery UI version <= 1.8, convert
+ * { my: "left+3 center", at: "left bottom", of: $target }
+ * to
+ * { my: "left center", at: "left bottom", of: $target, offset: "3 0" }
+ *
+ * See http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at
+ * and http://jsfiddle.net/mar10/6xtu9a4e/
+ */
+ fixPositionOptions: function(opts) {
+ if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) {
+ $.error("expected new position syntax (but '%' is not supported)");
+ }
+ if( ! $.ui.fancytree.jquerySupports.positionMyOfs ) {
+ var // parse 'left+3 center' into ['left+3 center', 'left', '+3', 'center', undefined]
+ myParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.my),
+ atParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.at),
+ // convert to numbers
+ dx = (myParts[2] ? (+myParts[2]) : 0) + (atParts[2] ? (+atParts[2]) : 0),
+ dy = (myParts[4] ? (+myParts[4]) : 0) + (atParts[4] ? (+atParts[4]) : 0);
+
+ opts = $.extend({}, opts, { // make a copy and overwrite
+ my: myParts[1] + " " + myParts[3],
+ at: atParts[1] + " " + atParts[3]
+ });
+ if( dx || dy ) {
+ opts.offset = "" + dx + " " + dy;
+ }
+ }
+ return opts;
+ },
/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
*
* @param {Event} event Mouse event, e.g. click, ...
@@ -4197,25 +4252,38 @@ $.extend($.ui.fancytree,
/*jshint expr:true */
($.ui.fancytree.debugLevel >= 1) && consoleApply("info", arguments);
},
- /** Convert a keydown event to a string like 'ctrl+a', 'ctrl+shift+f2'.
+ /** Convert a keydown or mouse event to a canonical string like 'ctrl+a', 'ctrl+shift+f2', 'shift+leftdblclick'.
+ * This is especially handy for switch-statements in event handlers.
* @param {event}
* @returns {string}
*/
- keyEventToString: function(event) {
+ eventToString: function(event) {
// Poor-man's hotkeys. See here for a complete implementation:
// https://github.com/jeresig/jquery.hotkeys
var which = event.which,
+ et = event.type,
s = [];
if( event.altKey ) { s.push("alt"); }
if( event.ctrlKey ) { s.push("ctrl"); }
if( event.metaKey ) { s.push("meta"); }
if( event.shiftKey ) { s.push("shift"); }
- if( !IGNORE_KEYCODES[which] ) {
- s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() );
+
+ if( et === "click" || et === "dblclick" ) {
+ s.push(MOUSE_BUTTONS[event.button] + et);
+ } else {
+ if( !IGNORE_KEYCODES[which] ) {
+ s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() );
+ }
}
return s.join("+");
},
+ /* @deprecated: use eventToString(event) instead.
+ */
+ keyEventToString: function(event) {
+ this.warn("keyEventToString() is deprecated: use eventToString()");
+ return this.eventToString(event);
+ },
/**
* Parse tree data from HTML
- markup
*
diff --git a/dist/src/jquery.fancytree.menu.js b/dist/src/jquery.fancytree.menu.js
index 5f588e2a..2b133a95 100644
--- a/dist/src/jquery.fancytree.menu.js
+++ b/dist/src/jquery.fancytree.menu.js
@@ -6,13 +6,13 @@
*
* @see http://api.jqueryui.com/menu/
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -49,7 +49,7 @@ $.ui.fancytree.registerExtension({
var opts = ctx.options,
tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
// Prepare an object that will be passed with menu events
tree.ext.menu.data = {
@@ -94,7 +94,7 @@ $.ui.fancytree.registerExtension({
}).hide();
},
treeDestroy: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
_openMenu: function(ctx){
var data,
@@ -149,7 +149,7 @@ $.ui.fancytree.registerExtension({
// ctx.tree.ext.menu._openMenu(ctx);
// return false;
// }
-// this._super(ctx);
+// this._superApply(arguments);
// }
});
}(jQuery, window, document));
diff --git a/dist/src/jquery.fancytree.persist.js b/dist/src/jquery.fancytree.persist.js
index 29007792..d96b099a 100644
--- a/dist/src/jquery.fancytree.persist.js
+++ b/dist/src/jquery.fancytree.persist.js
@@ -6,13 +6,13 @@
*
* @depends: jquery.cookie.js
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -223,7 +223,7 @@ $.ui.fancytree.registerExtension({
// Bind init-handler to apply cookie state
tree.$div.bind("fancytreeinit", function(event){
var cookie, dfd, i, keyList, node,
- prevFocus = $.cookie(local.cookiePrefix + FOCUS); // record this before node.setActive() overrides it;
+ prevFocus = local._data(local.cookiePrefix + FOCUS); // record this before node.setActive() overrides it;
// tree.debug("document.cookie:", document.cookie);
@@ -274,28 +274,37 @@ $.ui.fancytree.registerExtension({
if(cookie && (opts.persist.overrideSource || !tree.activeNode)){
node = tree.getNodeByKey(cookie);
if(node){
- node.setActive();
+ node.debug("persist: set active", cookie);
+ // We only want to set the focus if the container
+ // had the keyboard focus before
+ node.setActive(true, {noFocus: true});
}
}
}
if(local.storeFocus && prevFocus){
node = tree.getNodeByKey(prevFocus);
if(node){
- node.setFocus();
+ // node.debug("persist: set focus", cookie);
+ if( tree.options.titlesTabbable ) {
+ $(node.span).find(".fancytree-title").focus();
+ } else {
+ $(tree.$container).focus();
+ }
+ // node.setFocus();
}
}
tree._triggerTreeEvent("restore", null, {});
});
});
// Init the tree
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeSetActive: function(ctx, flag, opts) {
var res,
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag, opts);
+ res = this._superApply(arguments);
if(local.storeActive){
local._data(local.cookiePrefix + ACTIVE, this.activeNode ? this.activeNode.key : null);
@@ -308,7 +317,7 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag, opts);
+ res = this._superApply(arguments);
if(local.storeExpanded){
local._appendKey(EXPANDED, node.key, flag);
@@ -320,9 +329,9 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
- if(flag && local.storeFocus){
+ if( local.storeFocus ) {
local._data(local.cookiePrefix + FOCUS, this.focusNode ? this.focusNode.key : null);
}
return res;
@@ -334,7 +343,7 @@ $.ui.fancytree.registerExtension({
local = this._local;
flag = (flag !== false);
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
if(local.storeSelected){
if( tree.options.selectMode === 3 ){
diff --git a/dist/src/jquery.fancytree.table.js b/dist/src/jquery.fancytree.table.js
index ed8959bb..cf5af3ed 100644
--- a/dist/src/jquery.fancytree.table.js
+++ b/dist/src/jquery.fancytree.table.js
@@ -4,13 +4,13 @@
* Render tree as table (aka 'treegrid', 'tabletree').
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -116,7 +116,7 @@ $.ui.fancytree.registerExtension({
tree.ariaPropName = "tr";
this.nodeContainerAttrName = "tr";
- this._super(ctx);
+ this._superApply(arguments);
// standard Fancytree created a root UL
$(tree.rootNode.ul).remove();
@@ -265,7 +265,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node,
opts = ctx.options;
- this._super(ctx);
+ this._superApply(arguments);
// Move checkbox to custom column
if(opts.checkbox && opts.table.checkboxColumnIdx != null ){
$cb = $("span.fancytree-checkbox", node.span).detach();
@@ -288,7 +288,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node,
opts = ctx.options;
- this._super(ctx);
+ this._superApply(arguments);
$(node.tr).removeClass("fancytree-node");
// indent
@@ -343,11 +343,11 @@ $.ui.fancytree.registerExtension({
$(firstChild.tr).remove();
}
}
- this._super(ctx, status, message, details);
+ return this._superApply(arguments);
},
treeClear: function(ctx) {
this.nodeRemoveChildMarkup(this._makeHookContext(this.rootNode));
- return this._super(ctx);
+ return this._superApply(arguments);
}
/*,
treeSetFocus: function(ctx, flag) {
diff --git a/dist/src/jquery.fancytree.themeroller.js b/dist/src/jquery.fancytree.themeroller.js
index 4f74b002..c410088f 100644
--- a/dist/src/jquery.fancytree.themeroller.js
+++ b/dist/src/jquery.fancytree.themeroller.js
@@ -6,13 +6,13 @@
*
* @see http://jqueryui.com/themeroller/
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -34,7 +34,7 @@ $.ui.fancytree.registerExtension({
},
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
var $el = ctx.widget.element;
if($el[0].nodeName === "TABLE"){
@@ -53,13 +53,13 @@ $.ui.fancytree.registerExtension({
});
},
treeDestroy: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
ctx.widget.element.removeClass("ui-widget ui-widget-content ui-corner-all");
},
nodeRenderStatus: function(ctx){
var node = ctx.node,
$el = $(node.span);
- this._super(ctx);
+ this._superApply(arguments);
/*
.ui-state-highlight: Class to be applied to highlighted or selected elements. Applies "highlight" container styles to an element and its child text, links, and icons.
.ui-state-error: Class to be applied to error messaging container elements. Applies "error" container styles to an element and its child text, links, and icons.
diff --git a/dist/src/jquery.fancytree.wide.js b/dist/src/jquery.fancytree.wide.js
index 39b1f943..78a62431 100644
--- a/dist/src/jquery.fancytree.wide.js
+++ b/dist/src/jquery.fancytree.wide.js
@@ -3,13 +3,13 @@
* 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)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -116,7 +116,7 @@ $.ui.fancytree.registerExtension({
},
treeCreate: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-wide");
var containerId, cssText, iconSpacingUnit, iconWidthUnit, levelOfsUnit,
@@ -156,14 +156,14 @@ $.ui.fancytree.registerExtension({
treeDestroy: function(ctx){
// Remove generated css rules
defineHeadStyleElement(this.$container.attr("id"), null);
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeRenderStatus: function(ctx) {
var containerId, cssText, res,
node = ctx.node,
level = node.getLevel();
- res = this._super(ctx);
+ res = this._superApply(arguments);
// Generate some more level-n rules if required
if( level > this._local.maxDepth ) {
containerId = this.$container.attr("id");
diff --git a/fancytree.jquery.json b/fancytree.jquery.json
index 2154158f..f9a13c43 100644
--- a/fancytree.jquery.json
+++ b/fancytree.jquery.json
@@ -1,6 +1,6 @@
{
"name": "fancytree",
- "version": "2.7.1-0",
+ "version": "2.8.0",
"title": "Fancytree",
"description": "Fancytree is a JavaScript tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
"homepage": "https://github.com/mar10/fancytree",
diff --git a/package.json b/package.json
index 65c388c3..957bd9fa 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "jquery.fancytree",
"title": "jQuery Fancytree Plugin",
"description": "Fancytree is a JavaScript tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
- "version": "2.7.1-0",
+ "version": "2.8.0",
"homepage": "https://github.com/mar10/fancytree",
"author": {
"name": "Martin Wendt",
diff --git a/src/jquery.fancytree.js b/src/jquery.fancytree.js
index 84fd628f..ad8b6505 100644
--- a/src/jquery.fancytree.js
+++ b/src/jquery.fancytree.js
@@ -4140,8 +4140,8 @@ $.extend($.ui.fancytree,
return ENTITY_MAP[s];
});
},
- /** Make jQuery.position() arguments backwards compatible, i.e. if
- * jQuery UI version <= 1.8, convert
+ /** Make jQuery.position() arguments backwards compatible, i.e. if
+ * jQuery UI version <= 1.8, convert
* { my: "left+3 center", at: "left bottom", of: $target }
* to
* { my: "left center", at: "left bottom", of: $target, offset: "3 0" }
@@ -4150,24 +4150,24 @@ $.extend($.ui.fancytree,
* and http://jsfiddle.net/mar10/6xtu9a4e/
*/
fixPositionOptions: function(opts) {
- if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) {
- $.error("expected new position syntax (but '%' is not supported)");
- }
+ if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) {
+ $.error("expected new position syntax (but '%' is not supported)");
+ }
if( ! $.ui.fancytree.jquerySupports.positionMyOfs ) {
var // parse 'left+3 center' into ['left+3 center', 'left', '+3', 'center', undefined]
myParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.my),
atParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.at),
- // convert to numbers
- dx = (myParts[2] ? (+myParts[2]) : 0) + (atParts[2] ? (+atParts[2]) : 0),
- dy = (myParts[4] ? (+myParts[4]) : 0) + (atParts[4] ? (+atParts[4]) : 0);
-
- opts = $.extend({}, opts, { // make a copy and overwrite
- my: myParts[1] + " " + myParts[3],
- at: atParts[1] + " " + atParts[3]
- });
- if( dx || dy ) {
- opts.offset = "" + dx + " " + dy;
- }
+ // convert to numbers
+ dx = (myParts[2] ? (+myParts[2]) : 0) + (atParts[2] ? (+atParts[2]) : 0),
+ dy = (myParts[4] ? (+myParts[4]) : 0) + (atParts[4] ? (+atParts[4]) : 0);
+
+ opts = $.extend({}, opts, { // make a copy and overwrite
+ my: myParts[1] + " " + myParts[3],
+ at: atParts[1] + " " + atParts[3]
+ });
+ if( dx || dy ) {
+ opts.offset = "" + dx + " " + dy;
+ }
}
return opts;
},
- ",{"class":"ui-fancytree fancytree-container"}).appendTo(this.$div),this.$container=c,this.rootNode.ul=c[0],null==this.options.debugLevel&&(this.options.debugLevel=t.debugLevel),this.$container.attr("tabindex",this.options.tabbable?"0":"-1"),this.options.aria&&this.$container.attr("role","tree").attr("aria-multiselectable",!0)}if(a.ui&&a.ui.fancytree)return void a.ui.fancytree.warn("Fancytree: ignored duplicate include");e(a.ui,"Fancytree requires jQuery UI (http://jqueryui.com)");var s,t=null,u={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},v={16:!0,17:!0,18:!0},w={8:"backspace",9:"tab",10:"return",13:"return",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},x="active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),y={},z="expanded extraClasses folder hideCheckbox key lazy refKey selected title tooltip unselectable".split(" "),A={},B={active:!0,children:!0,data:!0,focus:!0};for(s=0;s
",{id:g}).hide().insertAfter(this.$container),e&&(d=this.getSelectedNodes(3===this.options.selectMode),a.each(d,function(b,c){h.append(a("",{type:"checkbox",name:e,value:c.key,checked:!0}))})),f&&this.activeNode&&h.append(a("",{type:"radio",name:f,value:this.activeNode.key,checked:!0}))},getActiveNode:function(){return this.activeNode},getFirstChild:function(){return this.rootNode.getFirstChild()},getFocusNode:function(){return this.focusNode},getNodeByKey:function(a,b){var d,e;return!b&&(d=c.getElementById(this.options.idPrefix+a))?d.ftnode?d.ftnode:null:(b=b||this.rootNode,e=null,b.visit(function(b){return b.key===a?(e=b,!1):void 0},!0),e)},getRootNode:function(){return this.rootNode},getSelectedNodes:function(a){var b=[];return this.rootNode.visit(function(c){return c.selected&&(b.push(c),a===!0)?"skip":void 0}),b},hasFocus:function(){return!!this._hasFocus},info:function(){this.options.debugLevel>=1&&(Array.prototype.unshift.call(arguments,this.toString()),f("info",arguments))},loadKeyPath:function(b,c,e){function f(a,b,d){c.call(r,b,"loading"),b.load().done(function(){r.loadKeyPath.call(r,l[a],c,b).always(m(d,r))}).fail(function(){r.warn("loadKeyPath: error loading: "+a+" (parent: "+o+")"),c.call(r,b,"error"),d.reject()})}var g,h,i,j,k,l,n,o,p,q=this.options.keyPathSeparator,r=this;for(a.isArray(b)||(b=[b]),l={},i=0;i")):(e=l.iconClass&&l.iconClass.call(k,j,a)||j.data.iconclass||null,o.push(e?"":""))),f="",l.renderTitle&&(f=l.renderTitle.call(k,{type:"renderTitle"},a)||""),f||(i=j.tooltip?" title='"+t.escapeHtml(j.tooltip)+"'":"",c=m?" id='ftal_"+j.key+"'":"",g=m?" role='treeitem'":"",h=l.titlesTabbable?" tabindex='0'":"",f=""+j.title+""),o.push(f),j.span.innerHTML=o.join(""),this.nodeRenderStatus(a))},nodeRenderStatus:function(b){var c=b.node,d=b.tree,e=b.options,f=c.hasChildren(),g=c.isLastSibling(),h=e.aria,i=a(c.span).find(".fancytree-title"),j=e._classNames,k=[],l=c[d.statusClassPropName];l&&(k.push(j.node),d.activeNode===c&&k.push(j.active),d.focusNode===c?(k.push(j.focused),h&&i.attr("aria-activedescendant",!0)):h&&i.removeAttr("aria-activedescendant"),c.expanded?(k.push(j.expanded),h&&i.attr("aria-expanded",!0)):h&&i.removeAttr("aria-expanded"),c.folder&&k.push(j.folder),f!==!1&&k.push(j.hasChildren),g&&k.push(j.lastsib),c.lazy&&null==c.children&&k.push(j.lazy),c.partsel&&k.push(j.partsel),c.unselectable&&k.push(j.unselectable),c._isLoading&&k.push(j.loading),c._error&&k.push(j.error),c.selected?(k.push(j.selected),h&&i.attr("aria-selected",!0)):h&&i.attr("aria-selected",!1),c.extraClasses&&k.push(c.extraClasses),k.push(f===!1?j.combinedExpanderPrefix+"n"+(g?"l":""):j.combinedExpanderPrefix+(c.expanded?"e":"c")+(c.lazy&&null==c.children?"d":"")+(g?"l":"")),k.push(j.combinedIconPrefix+(c.expanded?"e":"c")+(c.folder?"f":"")),l.className=k.join(" "),c.li&&(c.li.className=g?j.lastsib:"")) -},nodeSetActive:function(b,c,d){d=d||{};var f,g=b.node,h=b.tree,i=b.options,j=d.noEvents===!0,m=g===h.activeNode;return c=c!==!1,m===c?k(g):c&&!j&&this._triggerNodeEvent("beforeActivate",g,b.originalEvent)===!1?l(g,["rejected"]):void(c?(h.activeNode&&(e(h.activeNode!==g,"node was active (inconsistency)"),f=a.extend({},b,{node:h.activeNode}),h.nodeSetActive(f,!1),e(null===h.activeNode,"deactivate was out of sync?")),i.activeVisible&&g.makeVisible({scrollIntoView:!1}),h.activeNode=g,h.nodeRenderStatus(b),h.nodeSetFocus(b),j||h._triggerNodeEvent("activate",g,b.originalEvent)):(e(h.activeNode===g,"node was not active (inconsistency)"),h.activeNode=null,this.nodeRenderStatus(b),j||b.tree._triggerNodeEvent("deactivate",g,b.originalEvent)))},nodeSetExpanded:function(b,c,e){e=e||{};var f,g,h,i,j,m,n=b.node,o=b.tree,p=b.options,q=e.noAnimation===!0,r=e.noEvents===!0;if(c=c!==!1,n.expanded&&c||!n.expanded&&!c)return k(n);if(c&&!n.lazy&&!n.hasChildren())return k(n);if(!c&&n.getLevel()
- =0&&(r.title=r.title.substring(0,g))),r.title=a.trim(r.title),e=0,f=x.length;f>e;e++)r[x[e]]=d;for(j=this.className.split(" "),c=[],e=0,f=j.length;f>e;e++)k=j[e],y[k]?r[k]=!0:c.push(k);if(r.extraClasses=c.join(" "),h=o.attr("title"),h&&(r.tooltip=h),h=o.attr("id"),h&&(r.key=h),l=n(o),l&&!a.isEmptyObject(l)){for(e=0,f=z.length;f>e;e++)h=z[e],i=l[h],null!=i&&(delete l[h],r[h]=i);a.extend(r.data,l)}b=o.find(">ul:first"),r.children=b.length?a.ui.fancytree.parseHtml(b):r.lazy?d:null,m.push(r)}),m},registerExtension:function(b){e(null!=b.name,"extensions must have a `name` property."),e(null!=b.version,"extensions must have a `version` property."),a.ui.fancytree._extensions[b.name]=b},unescapeHtml:function(a){var b=c.createElement("div");return b.innerHTML=a,0===b.childNodes.length?"":b.childNodes[0].nodeValue},warn:function(){f("warn",arguments)}})}(jQuery,window,document);
+!function(a,b,c,d){"use strict";function e(b,c){b||(c=c?": "+c:"",a.error("Fancytree assertion failed"+c))}function f(a,c){var d,e,f=b.console?b.console[a]:null;if(f)try{f.apply(b.console,c)}catch(g){for(e="",d=0;d
- ",{"class":"ui-fancytree fancytree-container"}).appendTo(this.$div),this.$container=c,this.rootNode.ul=c[0],null==this.options.debugLevel&&(this.options.debugLevel=t.debugLevel),this.$container.attr("tabindex",this.options.tabbable?"0":"-1"),this.options.aria&&this.$container.attr("role","tree").attr("aria-multiselectable",!0)}if(a.ui&&a.ui.fancytree)return void a.ui.fancytree.warn("Fancytree: ignored duplicate include");e(a.ui,"Fancytree requires jQuery UI (http://jqueryui.com)");var s,t=null,u={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},v={16:!0,17:!0,18:!0},w={8:"backspace",9:"tab",10:"return",13:"return",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},x={0:"",1:"left",2:"middle",3:"right"},y="active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),z={},A="expanded extraClasses folder hideCheckbox key lazy refKey selected title tooltip unselectable".split(" "),B={},C={active:!0,children:!0,data:!0,focus:!0};for(s=0;s
",{id:g}).hide().insertAfter(this.$container),e&&(d=this.getSelectedNodes(3===this.options.selectMode),a.each(d,function(b,c){h.append(a("",{type:"checkbox",name:e,value:c.key,checked:!0}))})),f&&this.activeNode&&h.append(a("",{type:"radio",name:f,value:this.activeNode.key,checked:!0}))},getActiveNode:function(){return this.activeNode},getFirstChild:function(){return this.rootNode.getFirstChild()},getFocusNode:function(){return this.focusNode},getNodeByKey:function(a,b){var d,e;return!b&&(d=c.getElementById(this.options.idPrefix+a))?d.ftnode?d.ftnode:null:(b=b||this.rootNode,e=null,b.visit(function(b){return b.key===a?(e=b,!1):void 0},!0),e)},getRootNode:function(){return this.rootNode},getSelectedNodes:function(a){var b=[];return this.rootNode.visit(function(c){return c.selected&&(b.push(c),a===!0)?"skip":void 0}),b},hasFocus:function(){return!!this._hasFocus},info:function(){this.options.debugLevel>=1&&(Array.prototype.unshift.call(arguments,this.toString()),f("info",arguments))},loadKeyPath:function(b,c,e){function f(a,b,d){c.call(r,b,"loading"),b.load().done(function(){r.loadKeyPath.call(r,l[a],c,b).always(m(d,r))}).fail(function(){r.warn("loadKeyPath: error loading: "+a+" (parent: "+o+")"),c.call(r,b,"error"),d.reject()})}var g,h,i,j,k,l,n,o,p,q=this.options.keyPathSeparator,r=this;for(a.isArray(b)||(b=[b]),l={},i=0;i- =0&&(r.title=r.title.substring(0,g))),r.title=a.trim(r.title),e=0,f=y.length;f>e;e++)r[y[e]]=d;for(j=this.className.split(" "),c=[],e=0,f=j.length;f>e;e++)k=j[e],z[k]?r[k]=!0:c.push(k);if(r.extraClasses=c.join(" "),h=o.attr("title"),h&&(r.tooltip=h),h=o.attr("id"),h&&(r.key=h),l=n(o),l&&!a.isEmptyObject(l)){for(e=0,f=A.length;f>e;e++)h=A[e],i=l[h],null!=i&&(delete l[h],r[h]=i);a.extend(r.data,l)}b=o.find(">ul:first"),r.children=b.length?a.ui.fancytree.parseHtml(b):r.lazy?d:null,m.push(r)}),m},registerExtension:function(b){e(null!=b.name,"extensions must have a `name` property."),e(null!=b.version,"extensions must have a `version` property."),a.ui.fancytree._extensions[b.name]=b},unescapeHtml:function(a){var b=c.createElement("div");return b.innerHTML=a,0===b.childNodes.length?"":b.childNodes[0].nodeValue},warn:function(){f("warn",arguments)}})}(jQuery,window,document);
/*! Extension 'jquery.fancytree.childcounter.min.js' */
-!function(a){"use strict";a.ui.fancytree._FancytreeClass.prototype.countSelected=function(a){{var b=this;b.options}return b.getSelectedNodes(a).length},a.ui.fancytree._FancytreeNodeClass.prototype.toUpper=function(){var a=this;return a.setTitle(a.title.toUpperCase())},a.ui.fancytree.prototype.widgetMethod1=function(a){this.tree;return a},a.ui.fancytree.registerExtension({name:"childcounter",version:"1.0.0",options:{deep:!0,hideZeros:!0,hideExpanded:!1},foo:42,_appendCounter:function(){},treeInit:function(a){a.options,a.options.childcounter;this._super(a),this.$container.addClass("fancytree-ext-childcounter")},treeDestroy:function(a){this._super(a)},nodeRenderTitle:function(b,c){var d=b.node,e=b.options.childcounter,f=null==d.data.childCounter?d.countChildren(e.deep):+d.data.childCounter;this._super(b,c),!f&&e.hideZeros||d.isExpanded()&&e.hideExpanded||a("span.fancytree-icon",d.span).append(a("").text(f))},nodeSetExpanded:function(a,b,c){{var d=a.tree;a.node}return this._super(a,b,c).always(function(){d.nodeRenderTitle(a)})}})}(jQuery);
+!function(a){"use strict";a.ui.fancytree._FancytreeClass.prototype.countSelected=function(a){{var b=this;b.options}return b.getSelectedNodes(a).length},a.ui.fancytree._FancytreeNodeClass.prototype.toUpper=function(){var a=this;return a.setTitle(a.title.toUpperCase())},a.ui.fancytree.prototype.widgetMethod1=function(a){this.tree;return a},a.ui.fancytree.registerExtension({name:"childcounter",version:"1.0.0",options:{deep:!0,hideZeros:!0,hideExpanded:!1},foo:42,_appendCounter:function(){},treeInit:function(a){a.options,a.options.childcounter;this._superApply(arguments),this.$container.addClass("fancytree-ext-childcounter")},treeDestroy:function(){this._superApply(arguments)},nodeRenderTitle:function(b){var c=b.node,d=b.options.childcounter,e=null==c.data.childCounter?c.countChildren(d.deep):+c.data.childCounter;this._superApply(arguments),!e&&d.hideZeros||c.isExpanded()&&d.hideExpanded||a("span.fancytree-icon",c.span).append(a("").text(e))},nodeSetExpanded:function(a){{var b=a.tree;a.node}return this._superApply(arguments).always(function(){b.nodeRenderTitle(a)})}})}(jQuery);
/*! Extension 'jquery.fancytree.clones.min.js' */
-!function(a){"use strict";function b(b,c){b||(c=c?": "+c:"",a.error("Assertion failed"+c))}function c(a,b){var c;for(c=a.length-1;c>=0;c--)if(a[c]===b)return a.splice(c,1),!0;return!1}function d(a,b,c){for(var d,e,f=3&a.length,g=a.length-f,h=c,i=3432918353,j=461845907,k=0;g>k;)e=255&a.charCodeAt(k)|(255&a.charCodeAt(++k))<<8|(255&a.charCodeAt(++k))<<16|(255&a.charCodeAt(++k))<<24,++k,e=(65535&e)*i+(((e>>>16)*i&65535)<<16)&4294967295,e=e<<15|e>>>17,e=(65535&e)*j+(((e>>>16)*j&65535)<<16)&4294967295,h^=e,h=h<<13|h>>>19,d=5*(65535&h)+((5*(h>>>16)&65535)<<16)&4294967295,h=(65535&d)+27492+(((d>>>16)+58964&65535)<<16);switch(e=0,f){case 3:e^=(255&a.charCodeAt(k+2))<<16;case 2:e^=(255&a.charCodeAt(k+1))<<8;case 1:e^=255&a.charCodeAt(k),e=(65535&e)*i+(((e>>>16)*i&65535)<<16)&4294967295,e=e<<15|e>>>17,e=(65535&e)*j+(((e>>>16)*j&65535)<<16)&4294967295,h^=e}return h^=a.length,h^=h>>>16,h=2246822507*(65535&h)+((2246822507*(h>>>16)&65535)<<16)&4294967295,h^=h>>>13,h=3266489909*(65535&h)+((3266489909*(h>>>16)&65535)<<16)&4294967295,h^=h>>>16,b?("0000000"+(h>>>0).toString(16)).substr(-8):h>>>0}function e(b){var c,e=a.map(b.getParentList(!1,!0),function(a){return a.refKey||a.key});return e=e.join("/"),c="id_"+d(e,!0)}a.ui.fancytree._FancytreeNodeClass.prototype.getCloneList=function(b){var c,d=this.tree,e=d.refMap[this.refKey]||null,f=d.keyMap;return e&&(c=this.key,b?e=a.map(e,function(a){return f[a]}):(e=a.map(e,function(a){return a===c?null:f[a]}),e.length<1&&(e=null))),e},a.ui.fancytree._FancytreeNodeClass.prototype.isClone=function(){var a=this.refKey||null,b=a&&this.tree.refMap[a]||null;return!!(b&&b.length>1)},a.ui.fancytree._FancytreeNodeClass.prototype.reRegister=function(b,c){b=null==b?null:""+b,c=null==c?null:""+c;var d=this.tree,e=this.key,f=this.refKey,g=d.keyMap,h=d.refMap,i=h[f]||null,j=!1;return null!=b&&b!==this.key&&(g[b]&&a.error("[ext-clones] reRegister("+b+"): already exists: "+this),delete g[e],g[b]=this,i&&(h[f]=a.map(i,function(a){return a===e?b:a})),this.key=b,j=!0),null!=c&&c!==this.refKey&&(i&&(1===i.length?delete h[f]:h[f]=a.map(i,function(a){return a===e?null:a})),h[c]?h[c].append(b):h[c]=[this.key],this.refKey=c,j=!0),j},a.ui.fancytree._FancytreeClass.prototype.getNodesByRef=function(b,c){var d=this.keyMap,e=this.refMap[b]||null;return e&&(e=c?a.map(e,function(a){var b=d[a];return b.isDescendantOf(c)?b:null}):a.map(e,function(a){return d[a]}),e.length<1&&(e=null)),e},a.ui.fancytree._FancytreeClass.prototype.changeRefKey=function(a,b){var c,d,e=this.keyMap,f=this.refMap[a]||null;if(f){for(c=0;c
").css({zIndex:3,position:"relative"}).append(e.find("span.fancytree-title").clone()),c.data("ftSourceNode",d),c):"ERROR?: helper requested but sourceNode not found"},start:function(a,b){var c=b.helper.data("ftSourceNode");return!!c}},b.options.dnd.draggable)),c&&c.dragDrop&&b.widget.element.droppable(a.extend({addClasses:!1,tolerance:"intersect",greedy:!1},b.options.dnd.droppable))}function g(){h||(a.ui.plugin.add("draggable","connectToFancytree",{start:function(b,c){var d=a(this).data("ui-draggable")||a(this).data("draggable"),e=c.helper.data("ftSourceNode")||null;return e?(d.offset.click.top=-2,d.offset.click.left=16,e.tree.ext.dnd._onDragEvent("start",e,null,b,c,d)):void 0},drag:function(b,c){var d,e,f=a(this).data("ui-draggable")||a(this).data("draggable"),g=c.helper.data("ftSourceNode")||null,h=c.helper.data("ftTargetNode")||null,i=a.ui.fancytree.getNode(b.target);return b.target&&!i&&(d=a(b.target).closest("div.fancytree-drag-helper,#fancytree-drop-marker").length>0)?(e=g||h||a.ui.fancytree,void e.debug("Drag event over helper: ignored.")):(c.helper.data("ftTargetNode",i),h&&h!==i&&h.tree.ext.dnd._onDragEvent("leave",h,g,b,c,f),void(i&&i.tree.options.dnd.dragDrop&&(i===h?i.tree.ext.dnd._onDragEvent("over",i,g,b,c,f):i.tree.ext.dnd._onDragEvent("enter",i,g,b,c,f))))},stop:function(b,c){var d,e=a(this).data("ui-draggable")||a(this).data("draggable"),f=c.helper.data("ftSourceNode")||null,g=c.helper.data("ftTargetNode")||null,h=b.type,i="mouseup"===h&&1===b.which;i||(d=f||g||a.ui.fancytree,d.debug("Drag was cancelled")),g&&(i&&g.tree.ext.dnd._onDragEvent("drop",g,f,b,c,e),g.tree.ext.dnd._onDragEvent("leave",g,f,b,c,e)),f&&f.tree.ext.dnd._onDragEvent("stop",f,null,b,c,e)}}),h=!0)}var h=!1;a.ui.fancytree.registerExtension({name:"dnd",version:"0.1.0",options:{autoExpandMS:1e3,draggable:null,droppable:null,focusOnClick:!1,preventVoidMoves:!0,preventRecursiveMoves:!0,dragStart:null,dragStop:null,dragEnter:null,dragOver:null,dragDrop:null,dragLeave:null},treeInit:function(b){var c=b.tree;this._super(b),c.options.dnd.dragStart&&c.$container.on("mousedown",function(d){if(!c.hasFocus()&&b.options.dnd.focusOnClick){var e=a.ui.fancytree.getNode(d);e.debug("Re-enable focus that was prevented by jQuery UI draggable."),setTimeout(function(){a(d.target).closest(":tabbable").focus()},10)}}),f(c)},nodeKeydown:function(b){var c=b.originalEvent;return c.which===a.ui.keyCode.ESCAPE&&this._local._cancelDrag(),this._super(b)},nodeClick:function(a){return this._super(a)},_setDndStatus:function(b,c,d,f,g){var h,i=0,j="center",k=this._local,l=b?a(b.span):null,m=a(c.span);if(k.$dropMarker||(k.$dropMarker=a("").hide().css({"z-index":1e3}).prependTo(a(this.$div).parent())),"after"===f||"before"===f||"over"===f){switch(f){case"before":k.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over").addClass("fancytree-drop-before"),j="top";break;case"after":k.$dropMarker.removeClass("fancytree-drop-before fancytree-drop-over").addClass("fancytree-drop-after"),j="bottom";break;default:k.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-before").addClass("fancytree-drop-over"),m.addClass("fancytree-drop-target"),i=8}h=a.ui.fancytree.jquerySupports.positionMyOfs?{my:"left"+e(i)+" center",at:"left "+j,of:m}:{my:"left center",at:"left "+j,of:m,offset:""+i+" 0"},k.$dropMarker.show().position(h)}else m.removeClass("fancytree-drop-target"),k.$dropMarker.hide();"after"===f?m.addClass("fancytree-drop-after"):m.removeClass("fancytree-drop-after"),"before"===f?m.addClass("fancytree-drop-before"):m.removeClass("fancytree-drop-before"),g===!0?(l&&l.addClass("fancytree-drop-accept"),m.addClass("fancytree-drop-accept"),d.addClass("fancytree-drop-accept")):(l&&l.removeClass("fancytree-drop-accept"),m.removeClass("fancytree-drop-accept"),d.removeClass("fancytree-drop-accept")),g===!1?(l&&l.addClass("fancytree-drop-reject"),m.addClass("fancytree-drop-reject"),d.addClass("fancytree-drop-reject")):(l&&l.removeClass("fancytree-drop-reject"),m.removeClass("fancytree-drop-reject"),d.removeClass("fancytree-drop-reject"))},_onDragEvent:function(b,c,e,f,g,h){"over"!==b&&this.debug("tree.ext.dnd._onDragEvent(%s, %o, %o) - %o",b,c,e,this);var i,j,k,l,m,n,o=this.options,p=o.dnd,q=this._makeHookContext(c,f,{otherNode:e,ui:g,draggable:h}),r=null,s=a(c.span);switch(b){case"start":c.isStatusNode()?r=!1:p.dragStart&&(r=p.dragStart(c,q)),r===!1?(this.debug("tree.dragStart() cancelled"),g.helper.trigger("mouseup").hide()):s.addClass("fancytree-drag-source");break;case"enter":n=p.preventRecursiveMoves&&c.isDescendantOf(e)?!1:p.dragEnter?p.dragEnter(c,q):null,r=n?a.isArray(n)?{over:a.inArray("over",n)>=0,before:a.inArray("before",n)>=0,after:a.inArray("after",n)>=0}:{over:n===!0||"over"===n,before:n===!0||"before"===n,after:n===!0||"after"===n}:!1,g.helper.data("enterResponse",r),this.debug("helper.enterResponse: %o",r);break;case"over":l=g.helper.data("enterResponse"),m=null,l===!1||("string"==typeof l?m=l:(i=s.offset(),j={x:f.pageX-i.left,y:f.pageY-i.top},k={x:j.x/s.width(),y:j.y/s.height()},l.after&&k.y>.75?m="after":!l.over&&l.after&&k.y>.5?m="after":l.before&&k.y<=.25?m="before":!l.over&&l.before&&k.y<=.5?m="before":l.over&&(m="over"),p.preventVoidMoves&&(c===e?(this.debug(" drop over source node prevented"),m=null):"before"===m&&e&&c===e.getNextSibling()?(this.debug(" drop after source node prevented"),m=null):"after"===m&&e&&c===e.getPrevSibling()?(this.debug(" drop before source node prevented"),m=null):"over"===m&&e&&e.parent===c&&e.isLastSibling()&&(this.debug(" drop last child over own parent prevented"),m=null)),g.helper.data("hitMode",m))),"over"===m&&p.autoExpandMS&&c.hasChildren()!==!1&&!c.expanded&&c.scheduleAction("expand",p.autoExpandMS),m&&p.dragOver&&(q.hitMode=m,r=p.dragOver(c,q)),this._local._setDndStatus(e,c,g.helper,m,r!==!1&&null!==m);break;case"drop":m=g.helper.data("hitMode"),m&&p.dragDrop&&(q.hitMode=m,p.dragDrop(c,q));break;case"leave":c.scheduleAction("cancel"),g.helper.data("enterResponse",null),g.helper.data("hitMode",null),this._local._setDndStatus(e,c,g.helper,"out",d),p.dragLeave&&p.dragLeave(c,q);break;case"stop":s.removeClass("fancytree-drag-source"),p.dragStop&&p.dragStop(c,q);break;default:a.error("Unsupported drag event: "+b)}return r},_cancelDrag:function(){var b=a.ui.ddmanager.current;b&&b.cancel()}})}(jQuery,window,document); +!function(a,b,c,d){"use strict";function e(a){return 0===a?"":a>0?"+"+a:""+a}function f(b){var c=b.options.dnd||null;c&&g(),c&&c.dragStart&&b.widget.element.draggable(a.extend({addClasses:!1,appendTo:b.$container,containment:!1,delay:0,distance:4,revert:!1,scroll:!0,scrollSpeed:7,scrollSensitivity:10,connectToFancytree:!0,helper:function(b){var c,d=a.ui.fancytree.getNode(b.target),e=a(d.span);return d?(c=a("").css({zIndex:3,position:"relative"}).append(e.find("span.fancytree-title").clone()),c.data("ftSourceNode",d),c):"ERROR?: helper requested but sourceNode not found"},start:function(a,b){var c=b.helper.data("ftSourceNode");return!!c}},b.options.dnd.draggable)),c&&c.dragDrop&&b.widget.element.droppable(a.extend({addClasses:!1,tolerance:"intersect",greedy:!1},b.options.dnd.droppable))}function g(){h||(a.ui.plugin.add("draggable","connectToFancytree",{start:function(b,c){var d=a(this).data("ui-draggable")||a(this).data("draggable"),e=c.helper.data("ftSourceNode")||null;return e?(d.offset.click.top=-2,d.offset.click.left=16,e.tree.ext.dnd._onDragEvent("start",e,null,b,c,d)):void 0},drag:function(b,c){var d,e,f=a(this).data("ui-draggable")||a(this).data("draggable"),g=c.helper.data("ftSourceNode")||null,h=c.helper.data("ftTargetNode")||null,i=a.ui.fancytree.getNode(b.target);return b.target&&!i&&(d=a(b.target).closest("div.fancytree-drag-helper,#fancytree-drop-marker").length>0)?(e=g||h||a.ui.fancytree,void e.debug("Drag event over helper: ignored.")):(c.helper.data("ftTargetNode",i),h&&h!==i&&h.tree.ext.dnd._onDragEvent("leave",h,g,b,c,f),void(i&&i.tree.options.dnd.dragDrop&&(i===h?i.tree.ext.dnd._onDragEvent("over",i,g,b,c,f):i.tree.ext.dnd._onDragEvent("enter",i,g,b,c,f))))},stop:function(b,c){var d,e=a(this).data("ui-draggable")||a(this).data("draggable"),f=c.helper.data("ftSourceNode")||null,g=c.helper.data("ftTargetNode")||null,h=b.type,i="mouseup"===h&&1===b.which;i||(d=f||g||a.ui.fancytree,d.debug("Drag was cancelled")),g&&(i&&g.tree.ext.dnd._onDragEvent("drop",g,f,b,c,e),g.tree.ext.dnd._onDragEvent("leave",g,f,b,c,e)),f&&f.tree.ext.dnd._onDragEvent("stop",f,null,b,c,e)}}),h=!0)}var h=!1;a.ui.fancytree.registerExtension({name:"dnd",version:"0.1.0",options:{autoExpandMS:1e3,draggable:null,droppable:null,focusOnClick:!1,preventVoidMoves:!0,preventRecursiveMoves:!0,dragStart:null,dragStop:null,dragEnter:null,dragOver:null,dragDrop:null,dragLeave:null},treeInit:function(b){var c=b.tree;this._superApply(arguments),c.options.dnd.dragStart&&c.$container.on("mousedown",function(d){if(!c.hasFocus()&&b.options.dnd.focusOnClick){var e=a.ui.fancytree.getNode(d);e.debug("Re-enable focus that was prevented by jQuery UI draggable."),setTimeout(function(){a(d.target).closest(":tabbable").focus()},10)}}),f(c)},nodeKeydown:function(b){var c=b.originalEvent;return c.which===a.ui.keyCode.ESCAPE&&this._local._cancelDrag(),this._superApply(arguments)},nodeClick:function(){return this._superApply(arguments)},_setDndStatus:function(b,c,d,f,g){var h=0,i="center",j=this._local,k=b?a(b.span):null,l=a(c.span);if(j.$dropMarker||(j.$dropMarker=a("").hide().css({"z-index":1e3}).prependTo(a(this.$div).parent())),"after"===f||"before"===f||"over"===f){switch(f){case"before":j.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over").addClass("fancytree-drop-before"),i="top";break;case"after":j.$dropMarker.removeClass("fancytree-drop-before fancytree-drop-over").addClass("fancytree-drop-after"),i="bottom";break;default:j.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-before").addClass("fancytree-drop-over"),l.addClass("fancytree-drop-target"),h=8}j.$dropMarker.show().position(a.ui.fancytree.fixPositionOptions({my:"left"+e(h)+" center",at:"left "+i,of:l}))}else l.removeClass("fancytree-drop-target"),j.$dropMarker.hide();"after"===f?l.addClass("fancytree-drop-after"):l.removeClass("fancytree-drop-after"),"before"===f?l.addClass("fancytree-drop-before"):l.removeClass("fancytree-drop-before"),g===!0?(k&&k.addClass("fancytree-drop-accept"),l.addClass("fancytree-drop-accept"),d.addClass("fancytree-drop-accept")):(k&&k.removeClass("fancytree-drop-accept"),l.removeClass("fancytree-drop-accept"),d.removeClass("fancytree-drop-accept")),g===!1?(k&&k.addClass("fancytree-drop-reject"),l.addClass("fancytree-drop-reject"),d.addClass("fancytree-drop-reject")):(k&&k.removeClass("fancytree-drop-reject"),l.removeClass("fancytree-drop-reject"),d.removeClass("fancytree-drop-reject"))},_onDragEvent:function(b,c,e,f,g,h){"over"!==b&&this.debug("tree.ext.dnd._onDragEvent(%s, %o, %o) - %o",b,c,e,this);var i,j,k,l,m,n,o=this.options,p=o.dnd,q=this._makeHookContext(c,f,{otherNode:e,ui:g,draggable:h}),r=null,s=a(c.span);switch(b){case"start":c.isStatusNode()?r=!1:p.dragStart&&(r=p.dragStart(c,q)),r===!1?(this.debug("tree.dragStart() cancelled"),g.helper.trigger("mouseup").hide()):s.addClass("fancytree-drag-source");break;case"enter":n=p.preventRecursiveMoves&&c.isDescendantOf(e)?!1:p.dragEnter?p.dragEnter(c,q):null,r=n?a.isArray(n)?{over:a.inArray("over",n)>=0,before:a.inArray("before",n)>=0,after:a.inArray("after",n)>=0}:{over:n===!0||"over"===n,before:n===!0||"before"===n,after:n===!0||"after"===n}:!1,g.helper.data("enterResponse",r),this.debug("helper.enterResponse: %o",r);break;case"over":l=g.helper.data("enterResponse"),m=null,l===!1||("string"==typeof l?m=l:(i=s.offset(),j={x:f.pageX-i.left,y:f.pageY-i.top},k={x:j.x/s.width(),y:j.y/s.height()},l.after&&k.y>.75?m="after":!l.over&&l.after&&k.y>.5?m="after":l.before&&k.y<=.25?m="before":!l.over&&l.before&&k.y<=.5?m="before":l.over&&(m="over"),p.preventVoidMoves&&(c===e?(this.debug(" drop over source node prevented"),m=null):"before"===m&&e&&c===e.getNextSibling()?(this.debug(" drop after source node prevented"),m=null):"after"===m&&e&&c===e.getPrevSibling()?(this.debug(" drop before source node prevented"),m=null):"over"===m&&e&&e.parent===c&&e.isLastSibling()&&(this.debug(" drop last child over own parent prevented"),m=null)),g.helper.data("hitMode",m))),"over"===m&&p.autoExpandMS&&c.hasChildren()!==!1&&!c.expanded&&c.scheduleAction("expand",p.autoExpandMS),m&&p.dragOver&&(q.hitMode=m,r=p.dragOver(c,q)),this._local._setDndStatus(e,c,g.helper,m,r!==!1&&null!==m);break;case"drop":m=g.helper.data("hitMode"),m&&p.dragDrop&&(q.hitMode=m,p.dragDrop(c,q));break;case"leave":c.scheduleAction("cancel"),g.helper.data("enterResponse",null),g.helper.data("hitMode",null),this._local._setDndStatus(e,c,g.helper,"out",d),p.dragLeave&&p.dragLeave(c,q);break;case"stop":s.removeClass("fancytree-drag-source"),p.dragStop&&p.dragStop(c,q);break;default:a.error("Unsupported drag event: "+b)}return r},_cancelDrag:function(){var b=a.ui.ddmanager.current;b&&b.cancel()}})}(jQuery,window,document); /*! Extension 'jquery.fancytree.edit.min.js' */ -!function(a,b,c){"use strict";var d=/Mac/.test(navigator.platform),e=a.ui.fancytree.escapeHtml,f=a.ui.fancytree.unescapeHtml;a.ui.fancytree._FancytreeNodeClass.prototype.editStart=function(){var b,d=this,e=this.tree,g=e.ext.edit,h=e.options.edit,i=a(".fancytree-title",d.span),j={node:d,tree:e,options:e.options,isNew:a(d.span).hasClass("fancytree-edit-new"),orgTitle:d.title,input:null,dirty:!1};return h.beforeEdit.call(d,{type:"beforeEdit"},j)===!1?!1:(a.ui.fancytree.assert(!g.currentNode,"recursive edit"),g.currentNode=this,g.eventData=j,e.widget._unbind(),a(c).on("mousedown.fancytree-edit",function(b){a(b.target).hasClass("fancytree-edit-input")||d.editEnd(!0,b)}),b=a("",{"class":"fancytree-edit-input",type:"text",value:f(j.orgTitle)}),g.eventData.input=b,null!=h.adjustWidthOfs&&b.width(i.width()+h.adjustWidthOfs),null!=h.inputCss&&b.css(h.inputCss),i.html(b),b.focus().change(function(){b.addClass("fancytree-edit-dirty")}).keydown(function(b){switch(b.which){case a.ui.keyCode.ESCAPE:d.editEnd(!1,b);break;case a.ui.keyCode.ENTER:return d.editEnd(!0,b),!1}b.stopPropagation()}).blur(function(a){return d.editEnd(!0,a)}),void h.edit.call(d,{type:"edit"},j))},a.ui.fancytree._FancytreeNodeClass.prototype.editEnd=function(b){var d,f=this,g=this.tree,h=g.ext.edit,i=h.eventData,j=g.options.edit,k=a(".fancytree-title",f.span),l=k.find("input.fancytree-edit-input");return j.trim&&l.val(a.trim(l.val())),d=l.val(),i.dirty=d!==f.title,i.save=b===!1?!1:i.isNew?""!==d:i.dirty&&""!==d,j.beforeClose.call(f,{type:"beforeClose"},i)===!1?!1:i.save&&j.save.call(f,{type:"save"},i)===!1?!1:(l.removeClass("fancytree-edit-dirty").unbind(),a(c).off(".fancytree-edit"),i.save?(f.setTitle(e(d)),f.setFocus()):i.isNew?(f.remove(),f=i.node=null,h.relatedNode.setFocus()):(f.renderTitle(),f.setFocus()),h.eventData=null,h.currentNode=null,h.relatedNode=null,g.widget._bind(),a(g.$container).focus(),i.input=null,j.close.call(f,{type:"close"},i),!0)},a.ui.fancytree._FancytreeNodeClass.prototype.editCreateNode=function(b,c){var d,e=this;return b=b||"child",null==c?c={title:""}:"string"==typeof c?c={title:c}:a.ui.fancytree.assert(a.isPlainObject(c)),"child"!==b||this.isExpanded()||this.hasChildren()===!1?(d=this.addNode(c,b),d.makeVisible(),a(d.span).addClass("fancytree-edit-new"),this.tree.ext.edit.relatedNode=this,void d.editStart()):void this.setExpanded().done(function(){e.editCreateNode(b,c)})},a.ui.fancytree._FancytreeClass.prototype.isEditing=function(){return this.ext.edit.currentNode},a.ui.fancytree._FancytreeNodeClass.prototype.isEditing=function(){return this.tree.ext.edit.currentNode===this},a.ui.fancytree.registerExtension({name:"edit",version:"0.2.0",options:{adjustWidthOfs:4,allowEmpty:!1,inputCss:{minWidth:"3em"},triggerCancel:["esc","tab","click"],triggerStart:["f2","shift+click","mac+enter"],trim:!0,beforeClose:a.noop,beforeEdit:a.noop,close:a.noop,edit:a.noop,save:a.noop},currentNode:null,treeInit:function(a){this._super(a),this.$container.addClass("fancytree-ext-edit")},nodeClick:function(b){return a.inArray("shift+click",b.options.edit.triggerStart)>=0&&b.originalEvent.shiftKey?(b.node.editStart(),!1):this._super(b)},nodeDblclick:function(b){return a.inArray("dblclick",b.options.edit.triggerStart)>=0?(b.node.editStart(),!1):this._super(b)},nodeKeydown:function(b){switch(b.originalEvent.which){case 113:if(a.inArray("f2",b.options.edit.triggerStart)>=0)return b.node.editStart(),!1;break;case a.ui.keyCode.ENTER:if(a.inArray("mac+enter",b.options.edit.triggerStart)>=0&&d)return b.node.editStart(),!1}return this._super(b)}})}(jQuery,window,document); +!function(a,b,c){"use strict";var d=/Mac/.test(navigator.platform),e=a.ui.fancytree.escapeHtml,f=a.ui.fancytree.unescapeHtml;a.ui.fancytree._FancytreeNodeClass.prototype.editStart=function(){var b,d=this,e=this.tree,g=e.ext.edit,h=e.options.edit,i=a(".fancytree-title",d.span),j={node:d,tree:e,options:e.options,isNew:a(d.span).hasClass("fancytree-edit-new"),orgTitle:d.title,input:null,dirty:!1};return h.beforeEdit.call(d,{type:"beforeEdit"},j)===!1?!1:(a.ui.fancytree.assert(!g.currentNode,"recursive edit"),g.currentNode=this,g.eventData=j,e.widget._unbind(),a(c).on("mousedown.fancytree-edit",function(b){a(b.target).hasClass("fancytree-edit-input")||d.editEnd(!0,b)}),b=a("",{"class":"fancytree-edit-input",type:"text",value:f(j.orgTitle)}),g.eventData.input=b,null!=h.adjustWidthOfs&&b.width(i.width()+h.adjustWidthOfs),null!=h.inputCss&&b.css(h.inputCss),i.html(b),b.focus().change(function(){b.addClass("fancytree-edit-dirty")}).keydown(function(b){switch(b.which){case a.ui.keyCode.ESCAPE:d.editEnd(!1,b);break;case a.ui.keyCode.ENTER:return d.editEnd(!0,b),!1}b.stopPropagation()}).blur(function(a){return d.editEnd(!0,a)}),void h.edit.call(d,{type:"edit"},j))},a.ui.fancytree._FancytreeNodeClass.prototype.editEnd=function(b){var d,f=this,g=this.tree,h=g.ext.edit,i=h.eventData,j=g.options.edit,k=a(".fancytree-title",f.span),l=k.find("input.fancytree-edit-input");return j.trim&&l.val(a.trim(l.val())),d=l.val(),i.dirty=d!==f.title,i.save=b===!1?!1:i.isNew?""!==d:i.dirty&&""!==d,j.beforeClose.call(f,{type:"beforeClose"},i)===!1?!1:i.save&&j.save.call(f,{type:"save"},i)===!1?!1:(l.removeClass("fancytree-edit-dirty").unbind(),a(c).off(".fancytree-edit"),i.save?(f.setTitle(e(d)),f.setFocus()):i.isNew?(f.remove(),f=i.node=null,h.relatedNode.setFocus()):(f.renderTitle(),f.setFocus()),h.eventData=null,h.currentNode=null,h.relatedNode=null,g.widget._bind(),a(g.$container).focus(),i.input=null,j.close.call(f,{type:"close"},i),!0)},a.ui.fancytree._FancytreeNodeClass.prototype.editCreateNode=function(b,c){var d,e=this;return b=b||"child",null==c?c={title:""}:"string"==typeof c?c={title:c}:a.ui.fancytree.assert(a.isPlainObject(c)),"child"!==b||this.isExpanded()||this.hasChildren()===!1?(d=this.addNode(c,b),d.makeVisible(),a(d.span).addClass("fancytree-edit-new"),this.tree.ext.edit.relatedNode=this,void d.editStart()):void this.setExpanded().done(function(){e.editCreateNode(b,c)})},a.ui.fancytree._FancytreeClass.prototype.isEditing=function(){return this.ext.edit.currentNode},a.ui.fancytree._FancytreeNodeClass.prototype.isEditing=function(){return this.tree.ext.edit.currentNode===this},a.ui.fancytree.registerExtension({name:"edit",version:"0.2.0",options:{adjustWidthOfs:4,allowEmpty:!1,inputCss:{minWidth:"3em"},triggerCancel:["esc","tab","click"],triggerStart:["f2","shift+click","mac+enter"],trim:!0,beforeClose:a.noop,beforeEdit:a.noop,close:a.noop,edit:a.noop,save:a.noop},currentNode:null,treeInit:function(){this._superApply(arguments),this.$container.addClass("fancytree-ext-edit")},nodeClick:function(b){return a.inArray("shift+click",b.options.edit.triggerStart)>=0&&b.originalEvent.shiftKey?(b.node.editStart(),!1):this._superApply(arguments)},nodeDblclick:function(b){return a.inArray("dblclick",b.options.edit.triggerStart)>=0?(b.node.editStart(),!1):this._superApply(arguments)},nodeKeydown:function(b){switch(b.originalEvent.which){case 113:if(a.inArray("f2",b.options.edit.triggerStart)>=0)return b.node.editStart(),!1;break;case a.ui.keyCode.ENTER:if(a.inArray("mac+enter",b.options.edit.triggerStart)>=0&&d)return b.node.editStart(),!1}return this._superApply(arguments)}})}(jQuery,window,document); /*! Extension 'jquery.fancytree.filter.min.js' */ -!function(a){"use strict";function b(a){return(a+"").replace(/([.?*+\^\$\[\]\\(){}|-])/g,"\\$1")}a.ui.fancytree._FancytreeClass.prototype._applyFilterImpl=function(a,c,d){var e,f,g=0,h="hide"===this.options.filter.mode;return d=!!d&&!c,"string"==typeof a&&(e=b(a),f=new RegExp(".*"+e+".*","i"),a=function(a){return!!f.exec(a.title)}),this.enableFilter=!0,this.lastFilterArgs=arguments,this.$div.addClass("fancytree-ext-filter"),this.$div.addClass(h?"fancytree-ext-filter-hide":"fancytree-ext-filter-dimm"),this.visit(function(a){delete a.match,delete a.subMatch}),this.visit(function(b){return d&&null!=b.children||!a(b)||(g++,b.match=!0,b.visitParents(function(a){a.subMatch=!0}),!c)?void 0:(b.visit(function(a){a.match=!0}),"skip")}),this.render(),g},a.ui.fancytree._FancytreeClass.prototype.filterNodes=function(a,b){return this._applyFilterImpl(a,!1,b)},a.ui.fancytree._FancytreeClass.prototype.applyFilter=function(){return this.warn("Fancytree.applyFilter() is deprecated since 2014-05-10. Use .filterNodes() instead."),this.filterNodes.apply(this,arguments)},a.ui.fancytree._FancytreeClass.prototype.filterBranches=function(a){return this._applyFilterImpl(a,!0,null)},a.ui.fancytree._FancytreeClass.prototype.clearFilter=function(){this.visit(function(a){delete a.match,delete a.subMatch}),this.enableFilter=!1,this.lastFilterArgs=null,this.$div.removeClass("fancytree-ext-filter fancytree-ext-filter-dimm fancytree-ext-filter-hide"),this.render()},a.ui.fancytree.registerExtension({name:"filter",version:"0.3.0",options:{autoApply:!0,mode:"dimm"},treeInit:function(a){this._super(a)},nodeLoadChildren:function(a,b){return this._super(a,b).done(function(){a.tree.enableFilter&&a.tree.lastFilterArgs&&a.options.filter.autoApply&&a.tree._applyFilterImpl.apply(a.tree,a.tree.lastFilterArgs)})},nodeRenderStatus:function(b){var c,d=b.node,e=b.tree,f=a(d[e.statusClassPropName]);return c=this._super(b),f.length&&e.enableFilter?(f.toggleClass("fancytree-match",!!d.match).toggleClass("fancytree-submatch",!!d.subMatch).toggleClass("fancytree-hide",!(d.match||d.subMatch)),c):c}})}(jQuery,window,document); +!function(a){"use strict";function b(a){return(a+"").replace(/([.?*+\^\$\[\]\\(){}|-])/g,"\\$1")}a.ui.fancytree._FancytreeClass.prototype._applyFilterImpl=function(a,c,d){var e,f,g=0,h="hide"===this.options.filter.mode;return d=!!d&&!c,"string"==typeof a&&(e=b(a),f=new RegExp(".*"+e+".*","i"),a=function(a){return!!f.exec(a.title)}),this.enableFilter=!0,this.lastFilterArgs=arguments,this.$div.addClass("fancytree-ext-filter"),this.$div.addClass(h?"fancytree-ext-filter-hide":"fancytree-ext-filter-dimm"),this.visit(function(a){delete a.match,delete a.subMatch}),this.visit(function(b){return d&&null!=b.children||!a(b)||(g++,b.match=!0,b.visitParents(function(a){a.subMatch=!0}),!c)?void 0:(b.visit(function(a){a.match=!0}),"skip")}),this.render(),g},a.ui.fancytree._FancytreeClass.prototype.filterNodes=function(a,b){return this._applyFilterImpl(a,!1,b)},a.ui.fancytree._FancytreeClass.prototype.applyFilter=function(){return this.warn("Fancytree.applyFilter() is deprecated since 2014-05-10. Use .filterNodes() instead."),this.filterNodes.apply(this,arguments)},a.ui.fancytree._FancytreeClass.prototype.filterBranches=function(a){return this._applyFilterImpl(a,!0,null)},a.ui.fancytree._FancytreeClass.prototype.clearFilter=function(){this.visit(function(a){delete a.match,delete a.subMatch}),this.enableFilter=!1,this.lastFilterArgs=null,this.$div.removeClass("fancytree-ext-filter fancytree-ext-filter-dimm fancytree-ext-filter-hide"),this.render()},a.ui.fancytree.registerExtension({name:"filter",version:"0.3.0",options:{autoApply:!0,mode:"dimm"},treeInit:function(){this._superApply(arguments)},nodeLoadChildren:function(a){return this._superApply(arguments).done(function(){a.tree.enableFilter&&a.tree.lastFilterArgs&&a.options.filter.autoApply&&a.tree._applyFilterImpl.apply(a.tree,a.tree.lastFilterArgs)})},nodeRenderStatus:function(b){var c,d=b.node,e=b.tree,f=a(d[e.statusClassPropName]);return c=this._superApply(arguments),f.length&&e.enableFilter?(f.toggleClass("fancytree-match",!!d.match).toggleClass("fancytree-submatch",!!d.subMatch).toggleClass("fancytree-hide",!(d.match||d.subMatch)),c):c}})}(jQuery,window,document); /*! Extension 'jquery.fancytree.glyph.min.js' */ -!function(a){"use strict";function b(a,b){return a.map[b]}a.ui.fancytree.registerExtension({name:"glyph",version:"0.2.0",options:{map:{checkbox:"icon-check-empty",checkboxSelected:"icon-check",checkboxUnknown:"icon-check icon-muted",error:"icon-exclamation-sign",expanderClosed:"icon-caret-right",expanderLazy:"icon-angle-right",expanderOpen:"icon-caret-down",doc:"icon-file-alt",noExpander:"",docOpen:"icon-file-alt",loading:"icon-refresh icon-spin",folder:"icon-folder-close-alt",folderOpen:"icon-folder-open-alt"}},treeInit:function(a){var b=a.tree;this._super(a),b.$container.addClass("fancytree-ext-glyph")},nodeRenderStatus:function(c){var d,e,f=c.node,g=a(f.span),h=c.options.glyph,i=h.map;this._super(c),f.isRoot()||(e=g.children("span.fancytree-expander").get(0),e&&(d=f.isLoading()?"loading":f.expanded?"expanderOpen":f.isUndefined()?"expanderLazy":f.hasChildren()?"expanderClosed":"noExpander",e.className="fancytree-expander "+i[d]),e=f.tr?a("td",f.tr).children("span.fancytree-checkbox").get(0):g.children("span.fancytree-checkbox").get(0),e&&(d=f.selected?"checkboxSelected":f.partsel?"checkboxUnknown":"checkbox",e.className="fancytree-checkbox "+i[d]),e=g.children("span.fancytree-icon").get(0),e&&(d=f.folder?f.expanded?b(h,"folderOpen"):b(h,"folder"):f.expanded?b(h,"docOpen"):b(h,"doc"),e.className="fancytree-icon "+d))},nodeSetStatus:function(c,d,e,f){var g,h=c.options.glyph,i=c.node;this._super(c,d,e,f),g=i.parent?a("span.fancytree-expander",i.span).get(0):a(".fancytree-statusnode-wait, .fancytree-statusnode-error",i[this.nodeContainerAttrName]).find("span.fancytree-expander").get(0),"loading"===d?g.className="fancytree-expander "+b(h,"loading"):"error"===d&&(g.className="fancytree-expander "+b(h,"error"))}})}(jQuery,window,document); +!function(a){"use strict";function b(a,b){return a.map[b]}a.ui.fancytree.registerExtension({name:"glyph",version:"0.2.0",options:{map:{checkbox:"icon-check-empty",checkboxSelected:"icon-check",checkboxUnknown:"icon-check icon-muted",error:"icon-exclamation-sign",expanderClosed:"icon-caret-right",expanderLazy:"icon-angle-right",expanderOpen:"icon-caret-down",doc:"icon-file-alt",noExpander:"",docOpen:"icon-file-alt",loading:"icon-refresh icon-spin",folder:"icon-folder-close-alt",folderOpen:"icon-folder-open-alt"}},treeInit:function(a){var b=a.tree;this._superApply(arguments),b.$container.addClass("fancytree-ext-glyph")},nodeRenderStatus:function(c){var d,e,f=c.node,g=a(f.span),h=c.options.glyph,i=h.map;this._superApply(arguments),f.isRoot()||(e=g.children("span.fancytree-expander").get(0),e&&(d=f.isLoading()?"loading":f.expanded?"expanderOpen":f.isUndefined()?"expanderLazy":f.hasChildren()?"expanderClosed":"noExpander",e.className="fancytree-expander "+i[d]),e=f.tr?a("td",f.tr).children("span.fancytree-checkbox").get(0):g.children("span.fancytree-checkbox").get(0),e&&(d=f.selected?"checkboxSelected":f.partsel?"checkboxUnknown":"checkbox",e.className="fancytree-checkbox "+i[d]),e=g.children("span.fancytree-icon").get(0),e&&(d=f.folder?f.expanded?b(h,"folderOpen"):b(h,"folder"):f.expanded?b(h,"docOpen"):b(h,"doc"),e.className="fancytree-icon "+d))},nodeSetStatus:function(c,d){var e,f=c.options.glyph,g=c.node;this._superApply(arguments),e=g.parent?a("span.fancytree-expander",g.span).get(0):a(".fancytree-statusnode-wait, .fancytree-statusnode-error",g[this.nodeContainerAttrName]).find("span.fancytree-expander").get(0),"loading"===d?e.className="fancytree-expander "+b(f,"loading"):"error"===d&&(e.className="fancytree-expander "+b(f,"error"))}})}(jQuery,window,document); /*! Extension 'jquery.fancytree.gridnav.min.js' */ -!function(a){"use strict";function b(b,c){var d,e=c.get(0),f=0;return b.children().each(function(){return this===e?!1:(d=a(this).prop("colspan"),void(f+=d?d:1))}),f}function c(b,c){var d,e=null,f=0;return b.children().each(function(){return f>=c?(e=a(this),!1):(d=a(this).prop("colspan"),void(f+=d?d:1))}),e}function d(a,d){var f,g,h=a.closest("td"),i=null;switch(d){case e.LEFT:i=h.prev();break;case e.RIGHT:i=h.next();break;case e.UP:case e.DOWN:for(f=h.parent(),g=b(f,h);;){if(f=d===e.UP?f.prev():f.next(),!f.length)break;if(!f.is(":hidden")&&(i=c(f,g),i&&i.find(":input").length))break}}return i}var e=a.ui.keyCode,f={text:[e.UP,e.DOWN],checkbox:[e.UP,e.DOWN,e.LEFT,e.RIGHT],radiobutton:[e.UP,e.DOWN,e.LEFT,e.RIGHT],"select-one":[e.LEFT,e.RIGHT],"select-multiple":[e.LEFT,e.RIGHT]};a.ui.fancytree.registerExtension({name:"gridnav",version:"0.0.1",options:{autofocusInput:!1,handleCursorKeys:!0},treeInit:function(b){this._requireExtension("table",!0,!0),this._super(b),this.$container.addClass("fancytree-ext-gridnav"),this.$container.on("focusin",function(c){var d,e=a.ui.fancytree.getNode(c.target);e&&!e.isActive()&&(d=b.tree._makeHookContext(e,c),b.tree._callHook("nodeSetActive",d,!0))})},nodeSetActive:function(b,c){var d,e=b.options.gridnav,f=b.node,g=b.originalEvent||{},h=a(g.target).is(":input");c=c!==!1,this._super(b,c),c&&(b.options.titlesTabbable?(h||(a(f.span).find("span.fancytree-title").focus(),f.setFocus()),b.tree.$container.attr("tabindex","-1")):e.autofocusInput&&!h&&(d=a(f.tr||f.span),d.find(":input:enabled:first").focus()))},nodeKeydown:function(b){var c,e,g,h=b.options.gridnav,i=b.originalEvent,j=a(i.target);return c=j.is(":input:enabled")?j.prop("type"):null,c&&h.handleCursorKeys?(e=f[c],e&&a.inArray(i.which,e)>=0&&(g=d(j,i.which),g&&g.length)?(g.find(":input:enabled").focus(),!1):!0):(b.tree.debug("ext-gridnav NOT HANDLED",i,c),this._super(b))}})}(jQuery,window,document); +!function(a){"use strict";function b(b,c){var d,e=c.get(0),f=0;return b.children().each(function(){return this===e?!1:(d=a(this).prop("colspan"),void(f+=d?d:1))}),f}function c(b,c){var d,e=null,f=0;return b.children().each(function(){return f>=c?(e=a(this),!1):(d=a(this).prop("colspan"),void(f+=d?d:1))}),e}function d(a,d){var f,g,h=a.closest("td"),i=null;switch(d){case e.LEFT:i=h.prev();break;case e.RIGHT:i=h.next();break;case e.UP:case e.DOWN:for(f=h.parent(),g=b(f,h);;){if(f=d===e.UP?f.prev():f.next(),!f.length)break;if(!f.is(":hidden")&&(i=c(f,g),i&&i.find(":input").length))break}}return i}var e=a.ui.keyCode,f={text:[e.UP,e.DOWN],checkbox:[e.UP,e.DOWN,e.LEFT,e.RIGHT],radiobutton:[e.UP,e.DOWN,e.LEFT,e.RIGHT],"select-one":[e.LEFT,e.RIGHT],"select-multiple":[e.LEFT,e.RIGHT]};a.ui.fancytree.registerExtension({name:"gridnav",version:"0.0.1",options:{autofocusInput:!1,handleCursorKeys:!0},treeInit:function(b){this._requireExtension("table",!0,!0),this._superApply(arguments),this.$container.addClass("fancytree-ext-gridnav"),this.$container.on("focusin",function(c){var d,e=a.ui.fancytree.getNode(c.target);e&&!e.isActive()&&(d=b.tree._makeHookContext(e,c),b.tree._callHook("nodeSetActive",d,!0))})},nodeSetActive:function(b,c){var d,e=b.options.gridnav,f=b.node,g=b.originalEvent||{},h=a(g.target).is(":input");c=c!==!1,this._superApply(arguments),c&&(b.options.titlesTabbable?(h||(a(f.span).find("span.fancytree-title").focus(),f.setFocus()),b.tree.$container.attr("tabindex","-1")):e.autofocusInput&&!h&&(d=a(f.tr||f.span),d.find(":input:enabled:first").focus()))},nodeKeydown:function(b){var c,e,g,h=b.options.gridnav,i=b.originalEvent,j=a(i.target);return c=j.is(":input:enabled")?j.prop("type"):null,c&&h.handleCursorKeys?(e=f[c],e&&a.inArray(i.which,e)>=0&&(g=d(j,i.which),g&&g.length)?(g.find(":input:enabled").focus(),!1):!0):this._superApply(arguments)}})}(jQuery,window,document); /*! Extension 'jquery.fancytree.persist.min.js' */ -!function(a,b,c,d){"use strict";function e(b,c,d,f,g){var i,j,k,l,m=!1,n=[],o=[];for(d=d||[],g=g||a.Deferred(),i=0,k=d.length;k>i;i++)j=d[i],l=b.getNodeByKey(j),l?f&&l.isUndefined()?(m=!0,b.debug("_loadLazyNodes: "+l+" is lazy: loading..."),n.push("expand"===f?l.setExpanded():l.load())):(b.debug("_loadLazyNodes: "+l+" already loaded."),l.setExpanded()):(o.push(j),b.debug("_loadLazyNodes: "+l+" was not yet found."));return a.when.apply(a,n).always(function(){if(m&&o.length>0)e(b,c,o,f,g);else{if(o.length)for(b.warn("_loadLazyNodes: could not load those keys: ",o),i=0,k=o.length;k>i;i++)j=d[i],c._appendKey(h,d[i],!1);g.resolve()}}),g}var f=a.ui.fancytree.assert,g="active",h="expanded",i="focus",j="selected";a.ui.fancytree._FancytreeClass.prototype.clearCookies=function(a){var b=this.ext.persist,c=b.cookiePrefix;a=a||"active expanded focus selected",a.indexOf(g)>=0&&b._data(c+g,null),a.indexOf(h)>=0&&b._data(c+h,null),a.indexOf(i)>=0&&b._data(c+i,null),a.indexOf(j)>=0&&b._data(c+j,null)},a.ui.fancytree._FancytreeClass.prototype.getPersistData=function(){var a=this.ext.persist,b=a.cookiePrefix,c=a.cookieDelimiter,d={};return d[g]=a._data(b+g),d[h]=(a._data(b+h)||"").split(c),d[j]=(a._data(b+j)||"").split(c),d[i]=a._data(b+i),d},a.ui.fancytree.registerExtension({name:"persist",version:"0.3.0",options:{cookieDelimiter:"~",cookiePrefix:d,cookie:{raw:!1,expires:"",path:"",domain:"",secure:!1},expandLazy:!1,overrideSource:!0,store:"auto",types:"active expanded focus selected"},_data:function(b,c){var e=this._local.localStorage;return c===d?e?e.getItem(b):a.cookie(b):void(null===c?e?e.removeItem(b):a.removeCookie(b):e?e.setItem(b,c):a.cookie(b,c,this.options.persist.cookie))},_appendKey:function(b,c,d){c=""+c;var e=this._local,f=this.options.persist,g=f.cookieDelimiter,h=e.cookiePrefix+b,i=e._data(h),j=i?i.split(g):[],k=a.inArray(c,j);k>=0&&j.splice(k,1),d&&j.push(c),e._data(h,j.join(g))},treeInit:function(c){var k=c.tree,l=c.options,m=this._local,n=this.options.persist;return f("localStore"===n.store||a.cookie,"Missing required plugin for 'persist' extension: jquery.cookie.js"),m.cookiePrefix=n.cookiePrefix||"fancytree-"+k._id+"-",m.storeActive=n.types.indexOf(g)>=0,m.storeExpanded=n.types.indexOf(h)>=0,m.storeSelected=n.types.indexOf(j)>=0,m.storeFocus=n.types.indexOf(i)>=0,m.localStorage="cookie"!==n.store&&b.localStorage?"local"===n.store?b.localStorage:b.sessionStorage:null,k.$div.bind("fancytreeinit",function(){var b,c,f,o,p,q=a.cookie(m.cookiePrefix+i);b=m._data(m.cookiePrefix+h),o=b&&b.split(n.cookieDelimiter),c=m.storeExpanded?e(k,m,o,n.expandLazy?"expand":!1,null):(new a.Deferred).resolve(),c.done(function(){if(m.storeSelected){if(b=m._data(m.cookiePrefix+j))for(o=b.split(n.cookieDelimiter),f=0;f"),f="",b.options.aria&&(e.attr("role","row"),f=" role='gridcell'"),d=0;d "),f="",b.options.aria&&(e.attr("role","row"),f=" role='gridcell'"),d=0;d - markup
*
diff --git a/dist/jquery.fancytree.min.js b/dist/jquery.fancytree.min.js
index e2309416..972f1685 100644
--- a/dist/jquery.fancytree.min.js
+++ b/dist/jquery.fancytree.min.js
@@ -3,12 +3,12 @@
* Dynamic tree view control, with support for lazy loading of branches.
* https://github.com/mar10/fancytree/
*
- * Copyright (c) 2006-2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
-!function(a,b,c,d){"use strict";function e(b,c){b||(c=c?": "+c:"",a.error("Fancytree assertion failed"+c))}function f(a,c){var d,e,f=b.console?b.console[a]:null;if(f)try{f.apply(b.console,c)}catch(g){for(e="",d=0;d
- ",{"class":"ui-fancytree fancytree-container"}).appendTo(this.$div),this.$container=c,this.rootNode.ul=c[0],null==this.options.debugLevel&&(this.options.debugLevel=t.debugLevel),this.$container.attr("tabindex",this.options.tabbable?"0":"-1"),this.options.aria&&this.$container.attr("role","tree").attr("aria-multiselectable",!0)}if(a.ui&&a.ui.fancytree)return void a.ui.fancytree.warn("Fancytree: ignored duplicate include");e(a.ui,"Fancytree requires jQuery UI (http://jqueryui.com)");var s,t=null,u={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},v={16:!0,17:!0,18:!0},w={8:"backspace",9:"tab",10:"return",13:"return",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},x="active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),y={},z="expanded extraClasses folder hideCheckbox key lazy refKey selected title tooltip unselectable".split(" "),A={},B={active:!0,children:!0,data:!0,focus:!0};for(s=0;s
",{id:g}).hide().insertAfter(this.$container),e&&(d=this.getSelectedNodes(3===this.options.selectMode),a.each(d,function(b,c){h.append(a("",{type:"checkbox",name:e,value:c.key,checked:!0}))})),f&&this.activeNode&&h.append(a("",{type:"radio",name:f,value:this.activeNode.key,checked:!0}))},getActiveNode:function(){return this.activeNode},getFirstChild:function(){return this.rootNode.getFirstChild()},getFocusNode:function(){return this.focusNode},getNodeByKey:function(a,b){var d,e;return!b&&(d=c.getElementById(this.options.idPrefix+a))?d.ftnode?d.ftnode:null:(b=b||this.rootNode,e=null,b.visit(function(b){return b.key===a?(e=b,!1):void 0},!0),e)},getRootNode:function(){return this.rootNode},getSelectedNodes:function(a){var b=[];return this.rootNode.visit(function(c){return c.selected&&(b.push(c),a===!0)?"skip":void 0}),b},hasFocus:function(){return!!this._hasFocus},info:function(){this.options.debugLevel>=1&&(Array.prototype.unshift.call(arguments,this.toString()),f("info",arguments))},loadKeyPath:function(b,c,e){function f(a,b,d){c.call(r,b,"loading"),b.load().done(function(){r.loadKeyPath.call(r,l[a],c,b).always(m(d,r))}).fail(function(){r.warn("loadKeyPath: error loading: "+a+" (parent: "+o+")"),c.call(r,b,"error"),d.reject()})}var g,h,i,j,k,l,n,o,p,q=this.options.keyPathSeparator,r=this;for(a.isArray(b)||(b=[b]),l={},i=0;i- =0&&(r.title=r.title.substring(0,g))),r.title=a.trim(r.title),e=0,f=x.length;f>e;e++)r[x[e]]=d;for(j=this.className.split(" "),c=[],e=0,f=j.length;f>e;e++)k=j[e],y[k]?r[k]=!0:c.push(k);if(r.extraClasses=c.join(" "),h=o.attr("title"),h&&(r.tooltip=h),h=o.attr("id"),h&&(r.key=h),l=n(o),l&&!a.isEmptyObject(l)){for(e=0,f=z.length;f>e;e++)h=z[e],i=l[h],null!=i&&(delete l[h],r[h]=i);a.extend(r.data,l)}b=o.find(">ul:first"),r.children=b.length?a.ui.fancytree.parseHtml(b):r.lazy?d:null,m.push(r)}),m},registerExtension:function(b){e(null!=b.name,"extensions must have a `name` property."),e(null!=b.version,"extensions must have a `version` property."),a.ui.fancytree._extensions[b.name]=b},unescapeHtml:function(a){var b=c.createElement("div");return b.innerHTML=a,0===b.childNodes.length?"":b.childNodes[0].nodeValue},warn:function(){f("warn",arguments)}})}(jQuery,window,document);
\ No newline at end of file
+!function(a,b,c,d){"use strict";function e(b,c){b||(c=c?": "+c:"",a.error("Fancytree assertion failed"+c))}function f(a,c){var d,e,f=b.console?b.console[a]:null;if(f)try{f.apply(b.console,c)}catch(g){for(e="",d=0;d
- ",{"class":"ui-fancytree fancytree-container"}).appendTo(this.$div),this.$container=c,this.rootNode.ul=c[0],null==this.options.debugLevel&&(this.options.debugLevel=t.debugLevel),this.$container.attr("tabindex",this.options.tabbable?"0":"-1"),this.options.aria&&this.$container.attr("role","tree").attr("aria-multiselectable",!0)}if(a.ui&&a.ui.fancytree)return void a.ui.fancytree.warn("Fancytree: ignored duplicate include");e(a.ui,"Fancytree requires jQuery UI (http://jqueryui.com)");var s,t=null,u={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},v={16:!0,17:!0,18:!0},w={8:"backspace",9:"tab",10:"return",13:"return",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},x={0:"",1:"left",2:"middle",3:"right"},y="active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),z={},A="expanded extraClasses folder hideCheckbox key lazy refKey selected title tooltip unselectable".split(" "),B={},C={active:!0,children:!0,data:!0,focus:!0};for(s=0;s
",{id:g}).hide().insertAfter(this.$container),e&&(d=this.getSelectedNodes(3===this.options.selectMode),a.each(d,function(b,c){h.append(a("",{type:"checkbox",name:e,value:c.key,checked:!0}))})),f&&this.activeNode&&h.append(a("",{type:"radio",name:f,value:this.activeNode.key,checked:!0}))},getActiveNode:function(){return this.activeNode},getFirstChild:function(){return this.rootNode.getFirstChild()},getFocusNode:function(){return this.focusNode},getNodeByKey:function(a,b){var d,e;return!b&&(d=c.getElementById(this.options.idPrefix+a))?d.ftnode?d.ftnode:null:(b=b||this.rootNode,e=null,b.visit(function(b){return b.key===a?(e=b,!1):void 0},!0),e)},getRootNode:function(){return this.rootNode},getSelectedNodes:function(a){var b=[];return this.rootNode.visit(function(c){return c.selected&&(b.push(c),a===!0)?"skip":void 0}),b},hasFocus:function(){return!!this._hasFocus},info:function(){this.options.debugLevel>=1&&(Array.prototype.unshift.call(arguments,this.toString()),f("info",arguments))},loadKeyPath:function(b,c,e){function f(a,b,d){c.call(r,b,"loading"),b.load().done(function(){r.loadKeyPath.call(r,l[a],c,b).always(m(d,r))}).fail(function(){r.warn("loadKeyPath: error loading: "+a+" (parent: "+o+")"),c.call(r,b,"error"),d.reject()})}var g,h,i,j,k,l,n,o,p,q=this.options.keyPathSeparator,r=this;for(a.isArray(b)||(b=[b]),l={},i=0;i- =0&&(r.title=r.title.substring(0,g))),r.title=a.trim(r.title),e=0,f=y.length;f>e;e++)r[y[e]]=d;for(j=this.className.split(" "),c=[],e=0,f=j.length;f>e;e++)k=j[e],z[k]?r[k]=!0:c.push(k);if(r.extraClasses=c.join(" "),h=o.attr("title"),h&&(r.tooltip=h),h=o.attr("id"),h&&(r.key=h),l=n(o),l&&!a.isEmptyObject(l)){for(e=0,f=A.length;f>e;e++)h=A[e],i=l[h],null!=i&&(delete l[h],r[h]=i);a.extend(r.data,l)}b=o.find(">ul:first"),r.children=b.length?a.ui.fancytree.parseHtml(b):r.lazy?d:null,m.push(r)}),m},registerExtension:function(b){e(null!=b.name,"extensions must have a `name` property."),e(null!=b.version,"extensions must have a `version` property."),a.ui.fancytree._extensions[b.name]=b},unescapeHtml:function(a){var b=c.createElement("div");return b.innerHTML=a,0===b.childNodes.length?"":b.childNodes[0].nodeValue},warn:function(){f("warn",arguments)}})}(jQuery,window,document);
\ No newline at end of file
diff --git a/dist/src/jquery.fancytree.childcounter.js b/dist/src/jquery.fancytree.childcounter.js
index 29cd57d5..5dab99bd 100644
--- a/dist/src/jquery.fancytree.childcounter.js
+++ b/dist/src/jquery.fancytree.childcounter.js
@@ -14,13 +14,13 @@
* Add a child counter bubble to tree nodes.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
// To keep the global namespace clean, we wrap everything in a closure
@@ -144,7 +144,7 @@ $.ui.fancytree.registerExtension({
// Optionally check for dependencies with other extensions
/* this._requireExtension("glyph", false, false); */
// Call the base implementation
- this._super(ctx);
+ this._superApply(arguments);
// Add a class to the tree container
this.$container.addClass("fancytree-ext-childcounter");
},
@@ -153,7 +153,7 @@ $.ui.fancytree.registerExtension({
// this method could as well be omitted).
treeDestroy: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
// Overload the `renderTitle` hook, to append a counter badge
@@ -162,7 +162,7 @@ $.ui.fancytree.registerExtension({
extOpts = ctx.options.childcounter,
count = (node.data.childCounter == null) ? node.countChildren(extOpts.deep) : +node.data.childCounter;
// Let the base implementation render the title
- this._super(ctx, title);
+ this._superApply(arguments);
// Append a counter badge
if( (count || ! extOpts.hideZeros) && (!node.isExpanded() || !extOpts.hideExpanded) ){
$("span.fancytree-icon", node.span).append($("").text(count));
@@ -174,7 +174,7 @@ $.ui.fancytree.registerExtension({
node = ctx.node;
// Let the base implementation expand/collapse the node, then redraw the title
// after the animation has finished
- return this._super(ctx, flag, opts).always(function(){
+ return this._superApply(arguments).always(function(){
tree.nodeRenderTitle(ctx);
});
}
diff --git a/dist/src/jquery.fancytree.clones.js b/dist/src/jquery.fancytree.clones.js
index f30d4c56..36f53e1b 100644
--- a/dist/src/jquery.fancytree.clones.js
+++ b/dist/src/jquery.fancytree.clones.js
@@ -4,13 +4,13 @@
* Support faster lookup of nodes by key and shared ref-ids.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -336,7 +336,7 @@ $.ui.fancytree.registerExtension({
},
treeCreate: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
ctx.tree.refMap = {};
ctx.tree.keyMap = {};
},
@@ -348,12 +348,12 @@ $.ui.fancytree.registerExtension({
return calcUniqueKey(node);
};
// The default implementation loads initial data
- this._super(ctx);
+ this._superApply(arguments);
},
treeClear: function(ctx){
ctx.tree.refMap = {};
ctx.tree.keyMap = {};
- return this._super(ctx);
+ return this._superApply(arguments);
},
treeRegisterNode: function(ctx, add, node) {
var refList, len,
@@ -366,7 +366,7 @@ $.ui.fancytree.registerExtension({
// ctx.tree.debug("clones.treeRegisterNode", add, node);
if( key === "_statusNode" ){
- return this._super(ctx, add, node);
+ return this._superApply(arguments);
}
if( add ) {
@@ -414,13 +414,13 @@ $.ui.fancytree.registerExtension({
}
}
}
- return this._super(ctx, add, node);
+ return this._superApply(arguments);
},
nodeRenderStatus: function(ctx) {
var $span, res,
node = ctx.node;
- res = this._super(ctx);
+ res = this._superApply(arguments);
if( ctx.options.clones.highlightClones ) {
$span = $(node[ctx.tree.statusClassPropName]);
@@ -437,7 +437,7 @@ $.ui.fancytree.registerExtension({
scpn = ctx.tree.statusClassPropName,
node = ctx.node;
- res = this._super(ctx, flag);
+ res = this._superApply(arguments);
if( ctx.options.clones.highlightActiveClones && node.isClone() ) {
$.each(node.getCloneList(true), function(idx, n){
diff --git a/dist/src/jquery.fancytree.columnview.js b/dist/src/jquery.fancytree.columnview.js
index 9f57c4d0..53ba2ac8 100644
--- a/dist/src/jquery.fancytree.columnview.js
+++ b/dist/src/jquery.fancytree.columnview.js
@@ -4,13 +4,13 @@
* Render tree like a Mac Finder's column view.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -57,7 +57,7 @@ $.ui.fancytree.registerExtension({
tree.tr = $("tbody tr", $table)[0];
tree.columnCount = $(">td", tree.tr).length;
// Perform default behavior
- this._super(ctx);
+ this._superApply(arguments);
// Standard Fancytree created a root
- . Now move this into first table cell
$ul = $(tree.rootNode.ul);
$tdFirst = $(">td", tree.tr).eq(0);
@@ -98,22 +98,23 @@ $.ui.fancytree.registerExtension({
}
// Adjust keyboard behaviour:
}).bind("fancytreekeydown", function(event, data){
- var next = null;
+ var next = null,
+ node = data.node || data.tree.getFirstChild();
switch(event.which){
case $.ui.keyCode.DOWN:
- next = data.node.getNextSibling();
+ next = node.getNextSibling();
if( next ){
next.setFocus();
}
return false;
case $.ui.keyCode.LEFT:
- next = data.node.getParent();
+ next = node.getParent();
if( next ){
next.setFocus();
}
return false;
case $.ui.keyCode.UP:
- next = data.node.getPrevSibling();
+ next = node.getPrevSibling();
if( next ){
next.setFocus();
}
@@ -123,7 +124,7 @@ $.ui.fancytree.registerExtension({
},
nodeRender: function(ctx, force, deep, collapsed, _recursive) {
// Render standard nested
- -
- hierarchy
- this._super(ctx, force, deep, collapsed, _recursive);
+ this._superApply(arguments);
// Remove expander and add a trailing triangle instead
var level, $tdChild, $ul,
tree = ctx.tree,
diff --git a/dist/src/jquery.fancytree.debug.js b/dist/src/jquery.fancytree.debug.js
index 14a4d29e..810af922 100644
--- a/dist/src/jquery.fancytree.debug.js
+++ b/dist/src/jquery.fancytree.debug.js
@@ -4,13 +4,13 @@
* Miscellaneous debug extensions.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -59,7 +59,7 @@ $.ui.fancytree.registerExtension({
tree.debug("COOKIE " + document.cookie);
});
// Init the tree
- this._super(ctx);
+ this._superApply(arguments);
},
nodeClick: function(ctx) {
if(this.options.tracecalls.traceHooks){
@@ -135,7 +135,7 @@ $.ui.fancytree.registerExtension({
var s = this.options.prefix + "render '" + ctx.node + "'";
/*jshint expr:true */
window.console && window.console.time && window.console.time(s);
- this._super(ctx, force, deep, collapsed);
+ this._superApply(arguments);
window.console && window.console.timeEnd && window.console.timeEnd(s);
}
});
diff --git a/dist/src/jquery.fancytree.dnd.js b/dist/src/jquery.fancytree.dnd.js
index 38cf6af1..05fccfd7 100644
--- a/dist/src/jquery.fancytree.dnd.js
+++ b/dist/src/jquery.fancytree.dnd.js
@@ -4,13 +4,13 @@
* Drag-and-drop support.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -231,7 +231,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
// issue #270: draggable eats mousedown events
if( tree.options.dnd.dragStart ){
tree.$container.on("mousedown", function(event){
@@ -256,18 +256,17 @@ $.ui.fancytree.registerExtension({
if( event.which === $.ui.keyCode.ESCAPE) {
this._local._cancelDrag();
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeClick: function(ctx) {
// if( ctx.options.dnd.dragStart ){
// ctx.tree.$container.focus();
// }
- return this._super(ctx);
+ return this._superApply(arguments);
},
/* Display drop marker according to hitMode ('after', 'before', 'over', 'out', 'start', 'stop'). */
_setDndStatus: function(sourceNode, targetNode, helper, hitMode, accept) {
- var posOpts,
- markerOffsetX = 0,
+ var markerOffsetX = 0,
markerAt = "center",
instData = this._local,
$source = sourceNode ? $(sourceNode.span) : null,
@@ -305,23 +304,13 @@ $.ui.fancytree.registerExtension({
markerOffsetX = 8;
}
- if( $.ui.fancytree.jquerySupports.positionMyOfs ){
- posOpts = {
+ instData.$dropMarker
+ .show()
+ .position($.ui.fancytree.fixPositionOptions({
my: "left" + offsetString(markerOffsetX) + " center",
at: "left " + markerAt,
of: $target
- };
- } else {
- posOpts = {
- my: "left center",
- at: "left " + markerAt,
- of: $target,
- offset: "" + markerOffsetX + " 0"
- };
- }
- instData.$dropMarker
- .show()
- .position(posOpts);
+ }));
// helper.addClass("fancytree-drop-hover");
} else {
// $source && $source.removeClass("fancytree-drag-source");
diff --git a/dist/src/jquery.fancytree.edit.js b/dist/src/jquery.fancytree.edit.js
index 19a3a8e0..dd9e1e01 100644
--- a/dist/src/jquery.fancytree.edit.js
+++ b/dist/src/jquery.fancytree.edit.js
@@ -4,13 +4,13 @@
* Make node titles editable.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -266,7 +266,7 @@ $.ui.fancytree.registerExtension({
currentNode: null,
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-edit");
},
nodeClick: function(ctx) {
@@ -276,14 +276,14 @@ $.ui.fancytree.registerExtension({
return false;
}
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeDblclick: function(ctx) {
if( $.inArray("dblclick", ctx.options.edit.triggerStart) >= 0 ){
ctx.node.editStart();
return false;
}
- return this._super(ctx);
+ return this._superApply(arguments);
},
nodeKeydown: function(ctx) {
switch( ctx.originalEvent.which ) {
@@ -300,7 +300,7 @@ $.ui.fancytree.registerExtension({
}
break;
}
- return this._super(ctx);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
diff --git a/dist/src/jquery.fancytree.filter.js b/dist/src/jquery.fancytree.filter.js
index b4968f4c..d72fe207 100644
--- a/dist/src/jquery.fancytree.filter.js
+++ b/dist/src/jquery.fancytree.filter.js
@@ -4,13 +4,13 @@
* Remove or highlight tree nodes, based on a filter.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -142,10 +142,10 @@ $.ui.fancytree.registerExtension({
mode: "dimm"
},
treeInit: function(ctx){
- this._super(ctx);
+ this._superApply(arguments);
},
nodeLoadChildren: function(ctx, source) {
- return this._super(ctx, source).done(function() {
+ return this._superApply(arguments).done(function() {
if( ctx.tree.enableFilter && ctx.tree.lastFilterArgs && ctx.options.filter.autoApply ) {
ctx.tree._applyFilterImpl.apply(ctx.tree, ctx.tree.lastFilterArgs);
}
@@ -158,7 +158,7 @@ $.ui.fancytree.registerExtension({
tree = ctx.tree,
$span = $(node[tree.statusClassPropName]);
- res = this._super(ctx);
+ res = this._superApply(arguments);
// nothing to do, if node was not yet rendered
if( !$span.length || !tree.enableFilter ) {
return res;
diff --git a/dist/src/jquery.fancytree.glyph.js b/dist/src/jquery.fancytree.glyph.js
index c589d993..9af44ebc 100644
--- a/dist/src/jquery.fancytree.glyph.js
+++ b/dist/src/jquery.fancytree.glyph.js
@@ -4,13 +4,13 @@
* Use glyph fonts as instead of icon sprites.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -52,7 +52,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
var tree = ctx.tree;
- this._super(ctx);
+ this._superApply(arguments);
tree.$container.addClass("fancytree-ext-glyph");
},
nodeRenderStatus: function(ctx) {
@@ -65,7 +65,7 @@ $.ui.fancytree.registerExtension({
// $span = $(node.span)
;
- this._super(ctx);
+ this._superApply(arguments);
if( node.isRoot() ){
return;
@@ -113,7 +113,7 @@ $.ui.fancytree.registerExtension({
opts = ctx.options.glyph,
node = ctx.node;
- this._super(ctx, status, message, details);
+ this._superApply(arguments);
if(node.parent){
span = $("span.fancytree-expander", node.span).get(0);
diff --git a/dist/src/jquery.fancytree.gridnav.js b/dist/src/jquery.fancytree.gridnav.js
index 8e7a0d90..1f936c5e 100644
--- a/dist/src/jquery.fancytree.gridnav.js
+++ b/dist/src/jquery.fancytree.gridnav.js
@@ -4,13 +4,13 @@
* Support keyboard navigation for trees with embedded input controls.
* (Extension module for jquery.fancytree.js: https://github.com/mar10/fancytree/)
*
- * Copyright (c) 2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
*
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
;(function($, window, document, undefined) {
@@ -125,7 +125,7 @@ $.ui.fancytree.registerExtension({
treeInit: function(ctx){
// gridnav requires the table extension to be loaded before itself
this._requireExtension("table", true, true);
- this._super(ctx);
+ this._superApply(arguments);
this.$container.addClass("fancytree-ext-gridnav");
@@ -150,7 +150,7 @@ $.ui.fancytree.registerExtension({
flag = (flag !== false);
- this._super(ctx, flag);
+ this._superApply(arguments);
if( flag ){
if( ctx.options.titlesTabbable ){
@@ -192,8 +192,8 @@ $.ui.fancytree.registerExtension({
}
return true;
}
- ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
- return this._super(ctx);
+ // ctx.tree.debug("ext-gridnav NOT HANDLED", event, inputType);
+ return this._superApply(arguments);
}
});
}(jQuery, window, document));
diff --git a/dist/src/jquery.fancytree.js b/dist/src/jquery.fancytree.js
index ec0975d9..a5da1ff9 100644
--- a/dist/src/jquery.fancytree.js
+++ b/dist/src/jquery.fancytree.js
@@ -3,12 +3,12 @@
* Dynamic tree view control, with support for lazy loading of branches.
* https://github.com/mar10/fancytree/
*
- * Copyright (c) 2006-2014, Martin Wendt (http://wwWendt.de)
+ * Copyright (c) 2008-2015, Martin Wendt (http://wwWendt.de)
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
- * @version 2.7.0
- * @date 2014-12-21T15:57
+ * @version 2.8.0
+ * @date 2015-02-08T17:56
*/
/** Core Fancytree module.
@@ -101,19 +101,26 @@ function _makeVirtualFunction(methodName, tree, base, extension, extName){
_local = tree.ext[extName],
_super = function(){
return prevFunc.apply(tree, arguments);
+ },
+ _superApply = function(args){
+ return prevFunc.apply(tree, args);
};
// Return the wrapper function
return function(){
var prevLocal = tree._local,
- prevSuper = tree._super;
+ prevSuper = tree._super,
+ prevSuperApply = tree._superApply;
+
try{
tree._local = _local;
tree._super = _super;
+ tree._superApply = _superApply;
return baseFunc.apply(tree, arguments);
}finally{
tree._local = prevLocal;
tree._super = prevSuper;
+ tree._superApply = prevSuperApply;
}
};
})(); // end of Immediate Function
@@ -218,6 +225,7 @@ var i,
123: "f12", 144: "numlock", 145: "scroll", 173: "-", 186: ";", 187: "=",
188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
221: "]", 222: "'"},
+ MOUSE_BUTTONS = { 0: "", 1: "left", 2: "middle", 3: "right" },
//boolean attributes that can be set with equivalent class names in the LI tags
CLASS_ATTRS = "active expanded focus folder hideCheckbox lazy selected unselectable".split(" "),
CLASS_ATTR_MAP = {},
@@ -1453,8 +1461,12 @@ FancytreeNode.prototype = /** @lends FancytreeNode# */{
newScrollTop = null;
// this.debug("scrollIntoView(), scrollTop=", scrollTop, opts.scrollOfs);
- _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
-
+// _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
+ if( !$(this.span).is(":visible") ) {
+ // We cannot calc offsets for hidden elements
+ this.warn("scrollIntoView(): node is invisible.");
+ return _getResolvedPromise();
+ }
if( isParentWindow ) {
nodeY = $(this.span).offset().top;
topNodeY = (topNode && topNode.span) ? $(topNode.span).offset().top : 0;
@@ -1967,7 +1979,7 @@ Fancytree.prototype = /** @lends Fancytree# */{
this.warn("could not find node with key '" + key + "'");
}
}
- // Return a promise that is resovled, when ALL patches were applied
+ // Return a promise that is resolved, when ALL patches were applied
return $.when.apply($, deferredList).promise();
},
/* TODO: implement in dnd extension
@@ -2124,12 +2136,10 @@ Fancytree.prototype = /** @lends Fancytree# */{
return this.rootNode.getFirstChild();
},
/**
- * Return node that has keyboard focus.
- * @param {boolean} [ifTreeHasFocus=false] (not yet implemented)
+ * Return node that has keyboard focus or null.
* @returns {FancytreeNode}
*/
- getFocusNode: function(ifTreeHasFocus) {
- // TODO: implement ifTreeHasFocus
+ getFocusNode: function() {
return this.focusNode;
},
/**
@@ -2298,7 +2308,7 @@ Fancytree.prototype = /** @lends Fancytree# */{
deferredList.push(dfd);
__lazyload(key, node, dfd);
}
- // Return a promise that is resovled, when ALL paths were loaded
+ // Return a promise that is resolved, when ALL paths were loaded
return $.when.apply($, deferredList).promise();
},
/** Re-fire beforeActivate and activate events. */
@@ -2520,14 +2530,14 @@ $.extend(Fancytree.prototype,
handled = true,
activate = !(event.ctrlKey || !opts.autoActivate );
-// node.debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
-// FT.debug("keyEventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.keyEventToString(event) + '"');
+// (node || FT).debug("ftnode.nodeKeydown(" + event.type + "): ftnode:" + this + ", charCode:" + event.charCode + ", keyCode: " + event.keyCode + ", which: " + event.which);
+// FT.debug("eventToString", which, '"' + String.fromCharCode(which) + '"', '"' + FT.eventToString(event) + '"');
- // Set focus to first node, if no other node has the focus yet
+ // Set focus to active (or first node) if no other node has the focus yet
if( !node ){
- this.getFirstChild().setFocus();
+ (this.getActiveNode() || this.getFirstChild()).setFocus();
node = ctx.node = this.focusNode;
- node.debug("Keydown force focus on first node");
+ node.debug("Keydown force focus on active node");
}
if( opts.quicksearch && clean && /\w/.test(whichChar) && !$target.is(":input:enabled") ) {
@@ -2546,7 +2556,7 @@ $.extend(Fancytree.prototype,
event.preventDefault();
return;
}
- switch( FT.keyEventToString(event) ) {
+ switch( FT.eventToString(event) ) {
case "+":
case "=": // 187: '+' @ Chrome, Safari
tree.nodeSetExpanded(ctx, true);
@@ -2664,7 +2674,16 @@ $.extend(Fancytree.prototype,
source.rejectWith(this, [errorObj]);
});
}
-
+ // #383: accept and convert ECMAScript 6 Promise
+ if( $.isFunction(source.then) && $.isFunction(source["catch"]) ) {
+ dfd = source;
+ source = new $.Deferred();
+ dfd.then(function(value){
+ source.resolve(value);
+ }, function(reason){
+ source.reject(reason);
+ });
+ }
if($.isFunction(source.promise)){
// `source` is a deferred, i.e. ajax request
_assert(!node.isLoading());
@@ -3225,7 +3244,7 @@ $.extend(Fancytree.prototype,
* If flag is false, the node is deactivated (must be a synchronous operation)
* @param {EventData} ctx
* @param {boolean} [flag=true]
- * @param {object} [opts] additional options. Defaults to {noEvents: false}
+ * @param {object} [opts] additional options. Defaults to {noEvents: false, noFocus: false}
* @returns {$.Promise}
*/
nodeSetActive: function(ctx, flag, callOpts) {
@@ -3236,6 +3255,7 @@ $.extend(Fancytree.prototype,
tree = ctx.tree,
opts = ctx.options,
noEvents = (callOpts.noEvents === true),
+ noFocus = (callOpts.noFocus === true),
isActive = (node === tree.activeNode);
// flag defaults to true
@@ -3262,7 +3282,9 @@ $.extend(Fancytree.prototype,
}
tree.activeNode = node;
tree.nodeRenderStatus(ctx);
- tree.nodeSetFocus(ctx);
+ if( !noFocus ) {
+ tree.nodeSetFocus(ctx);
+ }
if( !noEvents ) {
tree._triggerNodeEvent("activate", node, ctx.originalEvent);
}
@@ -3431,7 +3453,7 @@ $.extend(Fancytree.prototype,
// node.debug("nodeSetExpanded: returns");
return dfd.promise();
},
- /** Focus ot blur this node.
+ /** Focus or blur this node.
* @param {EventData} ctx
* @param {boolean} [flag=true]
*/
@@ -3458,10 +3480,8 @@ $.extend(Fancytree.prototype,
if(flag){
if( !this.hasFocus() ){
node.debug("nodeSetFocus: forcing container focus");
- // Note: we pass _calledByNodeSetFocus=true
- this._callHook("treeSetFocus", ctx, true, true);
+ this._callHook("treeSetFocus", ctx, true, {calledByNode: true});
}
- // this.nodeMakeVisible(ctx);
node.makeVisible({scrollIntoView: false});
tree.focusNode = node;
// node.debug("FOCUS...");
@@ -3709,14 +3729,18 @@ $.extend(Fancytree.prototype,
* @param {EventData} ctx
* @param {boolean} [flag=true]
*/
- treeSetFocus: function(ctx, flag, _calledByNodeSetFocus) {
+ treeSetFocus: function(ctx, flag, callOpts) {
flag = (flag !== false);
- // this.debug("treeSetFocus(" + flag + "), _calledByNodeSetFocus: " + _calledByNodeSetFocus);
+ // this.debug("treeSetFocus(" + flag + "), callOpts: " + callOpts);
// this.debug(" focusNode: " + this.focusNode);
// this.debug(" activeNode: " + this.activeNode);
if( flag !== this.hasFocus() ){
this._hasFocus = flag;
+ if( !flag && this.focusNode ) {
+ // Node also looses focus if widget blurs
+ this.focusNode.setFocus(false);
+ }
this.$container.toggleClass("fancytree-treefocus", flag);
this._triggerTreeEvent(flag ? "focusTree" : "blurTree");
}
@@ -4042,7 +4066,7 @@ $.extend($.ui.fancytree,
/** @lends Fancytree_Static# */
{
/** @type {string} */
- version: "2.7.0", // Set to semver by 'grunt release'
+ version: "2.8.0", // Set to semver by 'grunt release'
/** @type {string} */
buildType: "production", // Set to 'production' by 'grunt build'
/** @type {int} */
@@ -4116,6 +4140,37 @@ $.extend($.ui.fancytree,
return ENTITY_MAP[s];
});
},
+ /** Make jQuery.position() arguments backwards compatible, i.e. if
+ * jQuery UI version <= 1.8, convert
+ * { my: "left+3 center", at: "left bottom", of: $target }
+ * to
+ * { my: "left center", at: "left bottom", of: $target, offset: "3 0" }
+ *
+ * See http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at
+ * and http://jsfiddle.net/mar10/6xtu9a4e/
+ */
+ fixPositionOptions: function(opts) {
+ if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) {
+ $.error("expected new position syntax (but '%' is not supported)");
+ }
+ if( ! $.ui.fancytree.jquerySupports.positionMyOfs ) {
+ var // parse 'left+3 center' into ['left+3 center', 'left', '+3', 'center', undefined]
+ myParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.my),
+ atParts = /(\w+)([+-]?\d+)?\s+(\w+)([+-]?\d+)?/.exec(opts.at),
+ // convert to numbers
+ dx = (myParts[2] ? (+myParts[2]) : 0) + (atParts[2] ? (+atParts[2]) : 0),
+ dy = (myParts[4] ? (+myParts[4]) : 0) + (atParts[4] ? (+atParts[4]) : 0);
+
+ opts = $.extend({}, opts, { // make a copy and overwrite
+ my: myParts[1] + " " + myParts[3],
+ at: atParts[1] + " " + atParts[3]
+ });
+ if( dx || dy ) {
+ opts.offset = "" + dx + " " + dy;
+ }
+ }
+ return opts;
+ },
/** Return a {node: FancytreeNode, type: TYPE} object for a mouse event.
*
* @param {Event} event Mouse event, e.g. click, ...
@@ -4197,25 +4252,38 @@ $.extend($.ui.fancytree,
/*jshint expr:true */
($.ui.fancytree.debugLevel >= 1) && consoleApply("info", arguments);
},
- /** Convert a keydown event to a string like 'ctrl+a', 'ctrl+shift+f2'.
+ /** Convert a keydown or mouse event to a canonical string like 'ctrl+a', 'ctrl+shift+f2', 'shift+leftdblclick'.
+ * This is especially handy for switch-statements in event handlers.
* @param {event}
* @returns {string}
*/
- keyEventToString: function(event) {
+ eventToString: function(event) {
// Poor-man's hotkeys. See here for a complete implementation:
// https://github.com/jeresig/jquery.hotkeys
var which = event.which,
+ et = event.type,
s = [];
if( event.altKey ) { s.push("alt"); }
if( event.ctrlKey ) { s.push("ctrl"); }
if( event.metaKey ) { s.push("meta"); }
if( event.shiftKey ) { s.push("shift"); }
- if( !IGNORE_KEYCODES[which] ) {
- s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() );
+
+ if( et === "click" || et === "dblclick" ) {
+ s.push(MOUSE_BUTTONS[event.button] + et);
+ } else {
+ if( !IGNORE_KEYCODES[which] ) {
+ s.push( SPECIAL_KEYCODES[which] || String.fromCharCode(which).toLowerCase() );
+ }
}
return s.join("+");
},
+ /* @deprecated: use eventToString(event) instead.
+ */
+ keyEventToString: function(event) {
+ this.warn("keyEventToString() is deprecated: use eventToString()");
+ return this.eventToString(event);
+ },
/**
* Parse tree data from HTML