diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-07-09 22:55:35 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-07-09 22:55:35 +0200 |
| commit | 05832d6b6a1e313c172a903be54e98dd46fa2b5c (patch) | |
| tree | caee34ff88b3af85c8bb9bf0f03b198c3f5e8f0c /ui | |
| parent | 009aa6a953ac0a7376baf0a7615e4c119ea59b23 (diff) | |
| parent | afeaf565bb0b91c399603a0ddd82a925cabef6aa (diff) | |
| download | jquery-ui-05832d6b6a1e313c172a903be54e98dd46fa2b5c.tar.gz jquery-ui-05832d6b6a1e313c172a903be54e98dd46fa2b5c.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.tabs.js | 12 | ||||
| -rw-r--r-- | ui/jquery.ui.widget.js | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 4362421db..5f81cda10 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -477,11 +477,7 @@ $.widget( "ui.tabs", { }, _setupEvents: function( event ) { - var events = { - click: function( event ) { - event.preventDefault(); - } - }; + var events = {}; if ( event ) { $.each( event.split(" "), function( index, eventName ) { events[ eventName ] = "_eventHandler"; @@ -489,6 +485,12 @@ $.widget( "ui.tabs", { } this._off( this.anchors.add( this.tabs ).add( this.panels ) ); + // Always prevent the default action, even when disabled + this._on( true, this.anchors, { + click: function( event ) { + event.preventDefault(); + } + }); this._on( this.anchors, events ); this._on( this.tabs, { keydown: "_tabKeydown" } ); this._on( this.panels, { keydown: "_panelKeydown" } ); diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 9fc0136c4..958f62e55 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -271,9 +271,6 @@ $.Widget.prototype = { // all event bindings should go through this._on() this.element .unbind( this.eventNamespace ) - // 1.9 BC for #7810 - // TODO remove dual storage - .removeData( this.widgetName ) .removeData( this.widgetFullName ) // support: jquery <1.6.3 // http://bugs.jquery.com/ticket/9413 |