Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-05-19 20:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into path-fixes

Browse source
This commit is contained in:
Kin Blas 2011-06-10 10:02:11 -07:00
commit 244385b9f9
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
experiments/scrollview/scrollview.js
View file

@ -55,6 +55,6 @@ $(":jqmData(role='page')").live("pageshow", function(event) {
ResizePageContentHeight(event.target);
});
$(document).live("orientationchange", function(event) {
$(window).bind("orientationchange", function(event) {
ResizePageContentHeight($(".ui-page"));
});

4
js/jquery.mobile.forms.checkboxradio.js
View file

@ -150,11 +150,11 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
},
disable: function(){
this.element.attr("disabled",true).parent().addClass("ui-disabled");
this.element.prop("disabled",true).parent().addClass("ui-disabled");
},
enable: function(){
this.element.attr("disabled",false).parent().removeClass("ui-disabled");
this.element.prop("disabled",false).parent().removeClass("ui-disabled");
}
});
})( jQuery );

2
js/jquery.mobile.listview.filter.js
View file

@ -53,7 +53,7 @@ $( ":jqmData(role='listview')" ).live( "listviewcreate", function() {
childItems = false,
itemtext="";
for (var i = listItems.length; i >= 0; i--) {
for ( var i = listItems.length - 1; i >= 0; i-- ) {
item = $( listItems[i] );
itemtext = item.jqmData( 'filtertext' ) || item.text();

3
js/jquery.mobile.navigation.js
View file

@ -605,7 +605,8 @@
if( !$.support.dynamicBaseTag ) {
var newPath = path.get( fileUrl );
page.find( "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]" ).each(function() {
var thisAttr = $( this ).is( '[href]' ) ? 'href' : 'src',
var thisAttr = $( this ).is( '[href]' ) ? 'href' :
$(this).is('[src]') ? 'src' : 'action',
thisUrl = $( this ).attr( thisAttr );
// XXX_jblas: We need to fix this so that it removes the document

2
themes/default/jquery.mobile.button.css
View file

@ -7,7 +7,7 @@
.ui-btn:focus, .ui-btn:active { outline: none; }
.ui-header .ui-btn, .ui-footer .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; }
.ui-btn-inline { display: inline-block; }
.ui-btn-inner { padding: .6em 25px; display: block; height: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; }
.ui-btn-inner { padding: .6em 25px; display: block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; position: relative; }
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }
.ui-btn-icon-notext { display: inline-block; width: 20px; height: 20px; padding: 2px 1px 2px 3px; text-indent: -9999px; }
.ui-btn-icon-notext .ui-btn-inner { padding: 0; }