Skip to content

Commit 6d0859f

Browse files
kborchersjzaefferer
authored andcommitted
Menu: Changed closeAll to collapseAll and updated in Menubar, also updated a reference to left in Menubar to collapse.
1 parent 11d24ee commit 6d0859f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ui/jquery.ui.menu.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ $.widget( "ui.menu", {
176176
this._bind( document, {
177177
click: function( event ) {
178178
if ( !$( event.target ).closest( ".ui-menu" ).length ) {
179-
this.closeAll();
179+
this.collapseAll();
180180
}
181181
}
182182
});
@@ -336,7 +336,7 @@ $.widget( "ui.menu", {
336336
.position( position );
337337
},
338338

339-
closeAll: function() {
339+
collapseAll: function() {
340340
this.element
341341
.find( "ul" )
342342
.hide()
@@ -466,11 +466,11 @@ $.widget( "ui.menu", {
466466
},
467467

468468
select: function( event ) {
469-
// save active reference before closeAll triggers blur
469+
// save active reference before collapseAll triggers blur
470470
var ui = {
471471
item: this.active
472472
};
473-
this.closeAll();
473+
this.collapseAll();
474474
this._trigger( "select", event, ui );
475475
}
476476
});

ui/jquery.ui.menubar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ $.widget( "ui.menubar", {
151151
});
152152
that._bind( {
153153
keydown: function( event ) {
154-
if ( event.keyCode == $.ui.keyCode.ESCAPE && that.active && that.active.menu( "left", event ) !== true ) {
154+
if ( event.keyCode == $.ui.keyCode.ESCAPE && that.active && that.active.menu( "collapse", event ) !== true ) {
155155
var active = that.active;
156156
that.active.blur();
157157
that._close( event );
@@ -206,7 +206,7 @@ $.widget( "ui.menubar", {
206206
if ( !this.active || !this.active.length )
207207
return;
208208
this.active
209-
.menu( "closeAll" )
209+
.menu( "collapseAll" )
210210
.hide()
211211
.attr( "aria-hidden", "true" )
212212
.attr( "aria-expanded", "false" );
@@ -226,7 +226,7 @@ $.widget( "ui.menubar", {
226226
// TODO refactor, almost the same as _close above, but don't remove tabIndex
227227
if ( this.active ) {
228228
this.active
229-
.menu( "closeAll" )
229+
.menu( "collapseAll" )
230230
.hide()
231231
.attr( "aria-hidden", "true" )
232232
.attr( "aria-expanded", "false" );

0 commit comments

Comments
 (0)