diff options
Diffstat (limited to 'ui/jquery.ui.selectmenu.js')
| -rw-r--r-- | ui/jquery.ui.selectmenu.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js index ba1f140cf..4f9a16a96 100644 --- a/ui/jquery.ui.selectmenu.js +++ b/ui/jquery.ui.selectmenu.js @@ -38,10 +38,10 @@ $.widget("ui.selectmenu", { var self = this, o = this.options; // set a default id value, generate a new random one if not set by developer - var selectmenuId = this.element.attr( 'id' ).replace(/(:|\.)/g,'\\$1') || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 ); + var selectmenuId = this.element.attr( 'id' ).replace(':', '\\:') || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 ); // quick array of button and menu id's - this.ids = [ selectmenuId + '-button', selectmenuId + '-menu' ]; + this.ids = [ selectmenuId, selectmenuId + '-button', selectmenuId + '-menu' ]; // define safe mouseup for future toggling this._safemouseup = true; @@ -49,12 +49,12 @@ $.widget("ui.selectmenu", { // create menu button wrapper this.newelement = $( '<a />', { 'class': this.widgetBaseClass + ' ui-widget ui-state-default ui-corner-all', - 'id' : this.ids[ 0 ], + 'id' : this.ids[ 1 ], 'role': 'button', 'href': '#nogo', 'tabindex': this.element.attr( 'disabled' ) ? 1 : 0, 'aria-haspopup': true, - 'aria-owns': this.ids[ 1 ] + 'aria-owns': this.ids[ 2 ] }); this.newelementWrap = $( o.wrapperElement ) .append( this.newelement ) @@ -78,7 +78,7 @@ $.widget("ui.selectmenu", { // make associated form label trigger focus $( 'label[for="' + selectmenuId + '"]' ) - .attr( 'for', this.ids[0] ) + .attr( 'for', this.ids[1] ) .bind( 'click.selectmenu', function() { self.newelement[0].focus(); return false; @@ -183,8 +183,8 @@ $.widget("ui.selectmenu", { 'class': 'ui-widget ui-widget-content', 'aria-hidden': true, 'role': 'listbox', - 'aria-labelledby': this.ids[0], - 'id': this.ids[1] + 'aria-labelledby': this.ids[1], + 'id': this.ids[2] }); this.listWrap = $( o.wrapperElement ) .addClass( self.widgetBaseClass + '-menu' ) @@ -447,8 +447,8 @@ $.widget("ui.selectmenu", { $( document ).unbind( ".selectmenu" ); // unbind click on label, reset its for attr - $( 'label[for=' + this.newelement.attr('id') + ']' ) - .attr( 'for', this.element.attr( 'id' ) ) + $( 'label[for=' + this.ids[0] + ']' ) + .attr( 'for', this.ids[0] ) .unbind( '.selectmenu' ); this.newelementWrap.remove(); |