diff --git a/ui/core.js b/ui/core.js index 28e9841dd8a..224d12b1564 100644 --- a/ui/core.js +++ b/ui/core.js @@ -103,7 +103,7 @@ function focusable( element, isTabIndexNotNaN ) { img = $( "img[usemap='#" + mapName + "']" )[ 0 ]; return !!img && visible( img ); } - return ( /input|select|textarea|button|object/.test( nodeName ) ? + return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ? !element.disabled : "a" === nodeName ? element.href || isTabIndexNotNaN : diff --git a/ui/resizable.js b/ui/resizable.js index 0671fb7b507..7eb747e76e2 100644 --- a/ui/resizable.js +++ b/ui/resizable.js @@ -104,7 +104,7 @@ $.widget("ui.resizable", $.ui.mouse, { }); // Wrap the element if it cannot hold child nodes - if (this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) { + if (this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)) { this.element.wrap( $("
").css({ @@ -205,7 +205,7 @@ $.widget("ui.resizable", $.ui.mouse, { this.handles[i] = this.element.children( this.handles[ i ] ).first().show(); } - if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) { + if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) { axis = $(this.handles[i], this.element);