Skip to content

Commit dd0de2a

Browse files
committed
Merge branch 'pr/194', @smeyfroi, Render noExpander icon for leaf nodes
Closed #194
1 parent cc1152a commit dd0de2a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* [Improved] [ext-table] #93 renderColumns called for status nodes
99
(added 'customStatus' option)
1010
* [Improved] [ext-dnd] #196 Make draggable/droppable options configurable
11+
* [Fixed] [ext-glyph] #194 Render noExpander icon from icon map for leaf nodes
1112
* [Fixed] #197: Allow special characters in tooltips
1213
* [Fixed] #68: renderStatus method doesn't render 'loading' status
1314
* [Fixed] #201: originalEvent not passed along to activate callback

src/jquery.fancytree.glyph.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ $.ui.fancytree.registerExtension({
4545
expanderOpen: "icon-caret-down",
4646
folder: "icon-folder-close-alt",
4747
folderOpen: "icon-folder-open-alt",
48-
loading: "icon-refresh icon-spin"
48+
loading: "icon-refresh icon-spin",
4949
// loading: "icon-spinner icon-spin"
50+
noExpander: ""
5051
},
5152
icon: null // TODO: allow callback here
5253
},
@@ -82,8 +83,10 @@ $.ui.fancytree.registerExtension({
8283
icon = "expanderOpen";
8384
}else if( node.isUndefined() ){
8485
icon = "expanderLazy";
85-
}else{
86+
}else if( node.hasChildren() ){
8687
icon = "expanderClosed";
88+
}else{
89+
icon = "noExpander";
8790
}
8891
span.className = "fancytree-expander " + map[icon];
8992
}

0 commit comments

Comments
 (0)