Skip to content

Commit

Permalink
Bump version to 2.22.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@mar10
mar10 committed May 6, 2017
1 parent 84f0136 commit 60f4cd5
Show file tree
Hide file tree
Showing 24 changed files with 156 additions and 250 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": "Fancytree is a JavaScript tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
"version": "2.22.4-0",
"version": "2.22.4",
"main": [
"dist/jquery.fancytree-all.js"
],
Expand Down
133 changes: 53 additions & 80 deletions dist/jquery.fancytree-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

/** Core Fancytree module.
Expand Down Expand Up @@ -3389,18 +3389,17 @@ $.extend(Fancytree.prototype,
node.li = document.createElement("li");
node.li.ftnode = node;

// We set role 'treeitem' to the title span instead
if(aria){
// TODO: why does the next line don't work:
// node.li.role = "treeitem";
// $(node.li).attr("role", "treeitem");
// .attr("aria-labelledby", "ftal_" + opts.idPrefix + node.key);
}
// if(aria){
// $(node.li).attr("role", "treeitem");
// }
if( node.key && opts.generateIds ){
node.li.id = opts.idPrefix + node.key;
}
node.span = document.createElement("span");
node.span.className = "fancytree-node";
if( aria && !node.tr ) {
$(node.span).attr("role", "treeitem");
}
// if(aria){
// $(node.li).attr("aria-labelledby", "ftal_" + opts.idPrefix + node.key);
// }
Expand Down Expand Up @@ -3520,32 +3519,22 @@ $.extend(Fancytree.prototype,
return;
}
// Connector (expanded, expandable or simple)
role = (aria && node.hasChildren() !== false) ? " role='button'" : "";
if( level < opts.minExpandLevel ) {
if( !node.lazy ) {
node.expanded = true;
}
if(level > 1){
if(aria){
ares.push("<span role='button' class='fancytree-expander fancytree-expander-fixed'></span>");
}else{
ares.push("<span class='fancytree-expander fancytree-expander-fixed''></span>");
}
ares.push("<span " + role + " class='fancytree-expander fancytree-expander-fixed'></span>");
}
// .. else (i.e. for root level) skip expander/connector alltogether
} else {
if(aria){
ares.push("<span role='button' class='fancytree-expander'></span>");
}else{
ares.push("<span class='fancytree-expander'></span>");
}
ares.push("<span " + role + " class='fancytree-expander'></span>");
}
// Checkbox mode
if( opts.checkbox && node.hideCheckbox !== true && !node.isStatusNode() ) {
if(aria){
ares.push("<span role='checkbox' class='fancytree-checkbox'></span>");
}else{
ares.push("<span class='fancytree-checkbox'></span>");
}
role = aria ? " role='checkbox'" : "";
ares.push("<span " + role + " class='fancytree-checkbox'></span>");
}
// Folder or doctype icon
if( node.data.iconClass !== undefined ) { // 2015-11-16
Expand All @@ -3566,24 +3555,8 @@ $.extend(Fancytree.prototype,
// icon is defined, but not true/false: must be a string
icon = "" + icon;
}
// if( $.isFunction(opts.icon) ) {
// icon = opts.icon.call(tree, {type: "icon"}, ctx);
// if( icon == null ) {
// icon = node.icon;
// }
// } else {
// icon = (node.icon != null) ? node.icon : opts.icon;
// }
// if( icon == null ) {
// icon = true; // no icon option at all: show default icon
// } else {
// if( typeof icon !== "boolean" ) {
// // icon is defined, but not true/false: must be a string
// icon = "" + icon;
// }
// }
if( icon !== false ) {
role = aria ? " role='img'" : "";
role = aria ? " role='presentation'" : "";
if ( typeof icon === "string" ) {
if( TEST_IMG.test(icon) ) {
// node.icon is an image url. Prepend imagePath
Expand Down Expand Up @@ -3612,7 +3585,7 @@ $.extend(Fancytree.prototype,
// id = aria ? " id='ftal_" + opts.idPrefix + node.key + "'" : "";
id = "";
// role = "";
role = (aria && !node.tr) ? " role='treeitem'" : "";
role = ""; // (aria && !node.tr) ? " role='treeitem'" : "";
tabindex = opts.titlesTabbable ? " tabindex='0'" : "";

nodeTitle = "<span " + role + " class='fancytree-title'" +
Expand Down Expand Up @@ -3655,7 +3628,7 @@ $.extend(Fancytree.prototype,
return;
}
if( aria ) {
$ariaElem = node.tr ? $(node.tr) : $(node.span).find(".fancytree-title");
$ariaElem = node.tr ? $(node.tr) : $(node.span); //.find(".fancytree-title");
}
// Build a list of class names that we will add to the node <span>
cnList.push(cn.node);
Expand Down Expand Up @@ -4710,7 +4683,7 @@ $.extend($.ui.fancytree,
/** @lends Fancytree_Static# */
{
/** @type {string} */
version: "2.22.3", // Set to semver by 'grunt release'
version: "2.22.4", // Set to semver by 'grunt release'
/** @type {string} */
buildType: "production", // Set to 'production' by 'grunt build'
/** @type {int} */
Expand Down Expand Up @@ -5189,8 +5162,8 @@ $.extend($.ui.fancytree,
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

// To keep the global namespace clean, we wrap everything in a closure
Expand Down Expand Up @@ -5292,7 +5265,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.22.3",
version: "2.22.4",

// Extension specific options and their defaults.
// This options will be available as `tree.options.childcounter.hideExpanded`
Expand Down Expand Up @@ -5390,8 +5363,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -5723,7 +5696,7 @@ $.ui.fancytree._FancytreeClass.prototype.changeRefKey = function(oldRefKey, newR
*/
$.ui.fancytree.registerExtension({
name: "clones",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
highlightActiveClones: true, // set 'fancytree-active-clone' on active clones and all peers
Expand Down Expand Up @@ -5856,8 +5829,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -6094,7 +6067,7 @@ function _initDragAndDrop(tree) {

$.ui.fancytree.registerExtension({
name: "dnd",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
// Make tree nodes accept draggables
Expand Down Expand Up @@ -6429,8 +6402,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/


Expand Down Expand Up @@ -6683,7 +6656,7 @@ function handleDragOver(event, data) {

$.ui.fancytree.registerExtension({
name: "dnd5",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering
Expand Down Expand Up @@ -7010,8 +6983,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -7254,7 +7227,7 @@ $.ui.fancytree._FancytreeNodeClass.prototype.isEditing = function(){
*/
$.ui.fancytree.registerExtension({
name: "edit",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
adjustWidthOfs: 4, // null: don't adjust input size to content
Expand Down Expand Up @@ -7326,8 +7299,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -7590,7 +7563,7 @@ $.ui.fancytree._FancytreeNodeClass.prototype.isMatched = function(){
*/
$.ui.fancytree.registerExtension({
name: "filter",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
autoApply: true, // Re-apply last filter if lazy data is loaded
Expand Down Expand Up @@ -7680,8 +7653,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand All @@ -7698,7 +7671,7 @@ function _getIcon(opts, type){

$.ui.fancytree.registerExtension({
name: "glyph",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
map: {
Expand Down Expand Up @@ -7824,8 +7797,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -7931,7 +7904,7 @@ function findNeighbourTd($target, keyCode){
*/
$.ui.fancytree.registerExtension({
name: "gridnav",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
autofocusInput: false, // Focus first embedded input if node gets activated
Expand Down Expand Up @@ -8030,8 +8003,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -8171,7 +8144,7 @@ $.ui.fancytree._FancytreeClass.prototype.getPersistData = function(){
*/
$.ui.fancytree.registerExtension({
name: "persist",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
cookieDelimiter: "~",
Expand Down Expand Up @@ -8418,8 +8391,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -8497,7 +8470,7 @@ function findPrevRowNode(node){

$.ui.fancytree.registerExtension({
name: "table",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
checkboxColumnIdx: null, // render the checkboxes into the this column index (default: nodeColumnIdx)
Expand Down Expand Up @@ -8867,8 +8840,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand All @@ -8880,7 +8853,7 @@ $.ui.fancytree.registerExtension({
*/
$.ui.fancytree.registerExtension({
name: "themeroller",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
activeClass: "ui-state-active", // Class added to active node
Expand Down Expand Up @@ -8963,8 +8936,8 @@ $.ui.fancytree.registerExtension({
* Released under the MIT license
* https://github.com/mar10/fancytree/wiki/LicenseInfo
*
* @version 2.22.3
* @date 2017-05-05T05:59:51Z
* @version 2.22.4
* @date 2017-05-06T06:26:23Z
*/

;(function($, window, document, undefined) {
Expand Down Expand Up @@ -9064,7 +9037,7 @@ function renderLevelCss(containerId, depth, levelOfs, lineOfs, labelOfs, measure
*/
$.ui.fancytree.registerExtension({
name: "wide",
version: "2.22.3",
version: "2.22.4",
// Default options for this extension.
options: {
iconWidth: null, // Adjust this if @fancy-icon-width != "16px"
Expand Down
28 changes: 14 additions & 14 deletions dist/jquery.fancytree-all.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 60f4cd5

Please sign in to comment.