mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-03-16 22:10:25 +00:00
Merge remote branch 'origin/master'
This commit is contained in:
commit
fcbbb58de2
2 changed files with 9 additions and 9 deletions
|
|
@ -120,7 +120,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
|
|||
.not( $(event.target).closest( ".ui-collapsible-contain" ) )
|
||||
.not( "> .ui-collapsible-contain .ui-collapsible-contain" )
|
||||
.trigger( "collapse" );
|
||||
})
|
||||
});
|
||||
var set = collapsibleParent.find( ":jqmData(role=collapsible)" )
|
||||
|
||||
set.first()
|
||||
|
|
|
|||
|
|
@ -139,21 +139,21 @@
|
|||
|
||||
|
||||
// Monkey-patching Sizzle to filter the :jqmData selector
|
||||
var oldFind = jQuery.find;
|
||||
var oldFind = $.find;
|
||||
|
||||
jQuery.find = function( selector, context, ret, extra ) {
|
||||
selector = selector.replace(/:jqmData\(([^)]*)\)/g, "[data-" + (jQuery.mobile.ns || "") + "$1]");
|
||||
$.find = function( selector, context, ret, extra ) {
|
||||
selector = selector.replace(/:jqmData\(([^)]*)\)/g, "[data-" + ($.mobile.ns || "") + "$1]");
|
||||
|
||||
return oldFind.call( this, selector, context, ret, extra );
|
||||
};
|
||||
|
||||
jQuery.extend( jQuery.find, oldFind );
|
||||
$.extend( $.find, oldFind );
|
||||
|
||||
jQuery.find.matches = function( expr, set ) {
|
||||
return jQuery.find( expr, null, null, set );
|
||||
$.find.matches = function( expr, set ) {
|
||||
return $.find( expr, null, null, set );
|
||||
};
|
||||
|
||||
jQuery.find.matchesSelector = function( node, expr ) {
|
||||
return jQuery.find( expr, null, null, [node] ).length > 0;
|
||||
$.find.matchesSelector = function( node, expr ) {
|
||||
return $.find( expr, null, null, [node] ).length > 0;
|
||||
};
|
||||
})( jQuery, this );
|
||||
|
|
|
|||
Loading…
Reference in a new issue