Skip to content

Commit

Permalink
Bump version to 2.28.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@mar10
mar10 committed Mar 19, 2018
1 parent 9065a54 commit 603a1d6
Show file tree
Hide file tree
Showing 53 changed files with 341 additions and 251 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jquery.fancytree",
"description": "JavaScript tree view / tree grid plugin with support for keyboard, inline editing, filtering, checkboxes, drag'n'drop, and lazy loading",
"version": "2.28.1-0",
"version": "2.28.1",
"main": [
"dist/jquery.fancytree-all-deps.min.js"
],
Expand Down
134 changes: 77 additions & 57 deletions dist/jquery.fancytree-all-deps.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery Fancytree Plugin - 2.28.0 - 2018-03-02T20:59:49Z
/*! jQuery Fancytree Plugin - 2.28.1 - 2018-03-19T06:47:37Z
* https://github.com/mar10/fancytree
* Copyright (c) 2018 Martin Wendt; Licensed MIT
*/
Expand Down Expand Up @@ -3045,8 +3045,8 @@ var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, d
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

/** Core Fancytree module.
Expand Down Expand Up @@ -8008,19 +8008,26 @@ $.widget("ui.fancytree",
var node = FT.getNode(event),
flag = (event.type === "focusin");

// tree.treeOnFocusInOut.call(tree, event);
// tree.debug("Tree container got event " + event.type, node, event, FT.getEventTarget(event));
if( flag && tree._getExpiringValue("focusin") ) {
// #789: IE 11 may send duplicate focusin events
FT.info("Ignored double focusin.");
if( !flag && node && $(event.target).is("a") ) {
// #764
node.debug("Ignored focusout on embedded <a> element.");
return;
}
tree._setExpiringValue("focusin", true, 50);
// tree.treeOnFocusInOut.call(tree, event);
// tree.debug("Tree container got event " + event.type, node, event, FT.getEventTarget(event));
if( flag ) {
if( tree._getExpiringValue("focusin") ) {
// #789: IE 11 may send duplicate focusin events
FT.info("Ignored double focusin.");
return;
}
tree._setExpiringValue("focusin", true, 50);

if( flag && !node ) {
// #789: IE 11 may send focusin before mousdown(?)
node = tree._getExpiringValue("mouseDownNode");
if( node ) { FT.info("Reconstruct mouse target for focusin from recent event."); }
if( !node ) {
// #789: IE 11 may send focusin before mousdown(?)
node = tree._getExpiringValue("mouseDownNode");
if( node ) { FT.info("Reconstruct mouse target for focusin from recent event."); }
}
}
if(node){
// For example clicking into an <input> that is part of a node
Expand Down Expand Up @@ -8159,7 +8166,7 @@ $.extend($.ui.fancytree,
/** @lends Fancytree_Static# */
{
/** @type {string} */
version: "2.28.0", // Set to semver by 'grunt release'
version: "2.28.1", // Set to semver by 'grunt release'
/** @type {string} */
buildType: "production", // Set to 'production' by 'grunt build'
/** @type {int} */
Expand Down Expand Up @@ -8257,6 +8264,9 @@ $.extend($.ui.fancytree,
*
* See http://jqueryui.com/upgrade-guide/1.9/#deprecated-offset-option-merged-into-my-and-at
* and http://jsfiddle.net/mar10/6xtu9a4e/
*
* @param {object} opts
* @returns {object} the (potentially modified) original opts hash object
*/
fixPositionOptions: function(opts) {
if( opts.offset || ("" + opts.my + opts.at ).indexOf("%") >= 0 ) {
Expand Down Expand Up @@ -8703,8 +8713,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

// To keep the global namespace clean, we wrap everything in a closure.
Expand Down Expand Up @@ -8822,7 +8832,7 @@ $.ui.fancytree.registerExtension({
// Every extension must be registered by a unique name.
name: "childcounter",
// Version information should be compliant with [semver](http://semver.org)
version: "2.28.0",
version: "2.28.1",

// Extension specific options and their defaults.
// This options will be available as `tree.options.childcounter.hideExpanded`
Expand Down Expand Up @@ -8922,8 +8932,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -9268,7 +9278,7 @@ $.ui.fancytree._FancytreeClass.prototype.changeRefKey = function(oldRefKey, newR
*/
$.ui.fancytree.registerExtension({
name: "clones",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
highlightActiveClones: true, // set 'fancytree-active-clone' on active clones and all peers
Expand Down Expand Up @@ -9404,8 +9414,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/


Expand Down Expand Up @@ -9567,8 +9577,7 @@ function handleDragOver(event, data) {
return LAST_HIT_MODE;
}

var markerOffsetX, nodeOfs, relPosY, //res,
// eventHash = getEventHash(event),
var markerOffsetX, nodeOfs, pos, relPosY,
hitMode = null,
tree = data.tree,
options = tree.options,
Expand Down Expand Up @@ -9645,16 +9654,22 @@ function handleDragOver(event, data) {
break;
}

pos = {
my: "left" + offsetString(markerOffsetX) + " center",
at: "left " + markerAt,
of: $targetTitle
};
if( options.rtl ) {
pos.my = "right" + offsetString(-markerOffsetX) + " center";
pos.at = "right " + markerAt;
// console.log("rtl", pos);
}
$dropMarker
.toggleClass(classDropAfter, hitMode === "after")
.toggleClass(classDropOver, hitMode === "over")
.toggleClass(classDropBefore, hitMode === "before")
.show()
.position(FT.fixPositionOptions({
my: "left" + offsetString(markerOffsetX) + " center",
at: "left " + markerAt,
of: $targetTitle
}));
.position(FT.fixPositionOptions(pos));
} else {
$dropMarker.hide();
// console.log("hide dropmarker")
Expand Down Expand Up @@ -9717,7 +9732,7 @@ function getDropEffect(event, data) {

$.ui.fancytree.registerExtension({
name: "dnd5",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering
Expand Down Expand Up @@ -9797,6 +9812,7 @@ $.ui.fancytree.registerExtension({
// $dropMarker.addClass(glyph.map._addClass + " " + glyph.map.dropMarker);
}
}
$dropMarker.toggleClass("fancytree-rtl", !!opts.rtl);
// Enable drag support if dragStart() is specified:
if( dndOpts.dragStart ) {
// Bind drag event handlers
Expand Down Expand Up @@ -10105,8 +10121,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -10362,7 +10378,7 @@ $.ui.fancytree._FancytreeNodeClass.prototype.isEditing = function(){
*/
$.ui.fancytree.registerExtension({
name: "edit",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
adjustWidthOfs: 4, // null: don't adjust input size to content
Expand Down Expand Up @@ -10445,8 +10461,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -10740,7 +10756,7 @@ $.ui.fancytree._FancytreeNodeClass.prototype.isMatched = function(){
*/
$.ui.fancytree.registerExtension({
name: "filter",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
autoApply: true, // Re-apply last filter if lazy data is loaded
Expand Down Expand Up @@ -10833,8 +10849,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -10895,7 +10911,8 @@ var FT = $.ui.fancytree,
expanderClosed: "fa-caret-right",
expanderLazy: "fa-angle-right",
expanderOpen: "fa-caret-down",
loading: "fa-spinner fa-pulse",
// We may prevent wobbling rotations on FF by creating a separate sub element:
loading: {html: "<span class='fa fa-spinner fa-pulse' />"},
nodata: "fa-meh-o",
noExpander: "",
radio: "fa-circle-thin", // "fa-circle-o"
Expand Down Expand Up @@ -11009,7 +11026,7 @@ function setIcon( span, baseClass, opts, type ) {

$.ui.fancytree.registerExtension({
name: "glyph",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
preset: null, // 'awesome3', 'awesome4', 'bootstrap3', 'material'
Expand Down Expand Up @@ -11131,8 +11148,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -11255,7 +11272,7 @@ function findNeighbourTd($target, keyCode){
*/
$.ui.fancytree.registerExtension({
name: "gridnav",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
autofocusInput: false, // Focus first embedded input if node gets activated
Expand Down Expand Up @@ -11357,8 +11374,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -11534,7 +11551,7 @@ $.ui.fancytree._FancytreeClass.prototype.getPersistData = function(){
*/
$.ui.fancytree.registerExtension({
name: "persist",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
cookieDelimiter: "~",
Expand Down Expand Up @@ -11786,8 +11803,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -11878,7 +11895,7 @@ function findPrevRowNode(node){

$.ui.fancytree.registerExtension({
name: "table",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
checkboxColumnIdx: null, // render the checkboxes into the this column index (default: nodeColumnIdx)
Expand Down Expand Up @@ -12165,8 +12182,11 @@ $.ui.fancytree.registerExtension({
$(node.tr).removeClass("fancytree-node");
// indent
indent = (node.getLevel() - 1) * opts.table.indentation;
$(node.span).css({paddingLeft: indent + "px"}); // #460
// $(node.span).css({marginLeft: indent + "px"});
if( opts.rtl ) {
$(node.span).css({paddingRight: indent + "px"});
} else {
$(node.span).css({paddingLeft: indent + "px"});
}
},
/* Expand node, return Deferred.promise. */
nodeSetExpanded: function(ctx, flag, callOpts) {
Expand Down Expand Up @@ -12259,8 +12279,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand All @@ -12285,7 +12305,7 @@ return $.ui.fancytree;
*/
$.ui.fancytree.registerExtension({
name: "themeroller",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
activeClass: "ui-state-active", // Class added to active node
Expand Down Expand Up @@ -12371,8 +12391,8 @@ return $.ui.fancytree;
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.28.0
* @date 2018-03-02T20:59:49Z
* @version 2.28.1
* @date 2018-03-19T06:47:37Z
*/

;(function( factory ) {
Expand Down Expand Up @@ -12485,7 +12505,7 @@ function renderLevelCss(containerId, depth, levelOfs, lineOfs, labelOfs, measure
*/
$.ui.fancytree.registerExtension({
name: "wide",
version: "2.28.0",
version: "2.28.1",
// Default options for this extension.
options: {
iconWidth: null, // Adjust this if @fancy-icon-width != "16px"
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.fancytree-all-deps.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.fancytree-all-deps.min.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 603a1d6

Please sign in to comment.