Merge pull request #2938 from eddiemonge/patch-4

code style cleanup
This commit is contained in:
Ghislain Seguin 2011-11-06 15:37:40 -08:00
commit 2dfa82d5f3

View file

@ -1,50 +1,45 @@
function ResizePageContentHeight(page)
{
var $page = $(page);
var $content = $page.children(".ui-content");
var hh = $page.children(".ui-header").outerHeight(); hh = hh ? hh : 0;
var fh = $page.children(".ui-footer").outerHeight(); fh = fh ? fh : 0;
var pt = parseFloat($content.css("padding-top"));
var pb = parseFloat($content.css("padding-bottom"));
var wh = window.innerHeight;
function ResizePageContentHeight(page) {
var $page = $(page),
$content = $page.children( ".ui-content" ),
hh = $page.children( ".ui-header" ).outerHeight() : 0,
fh = $page.children( ".ui-footer" ).outerHeight() : 0,
pt = parseFloat($content.css( "padding-top" )),
pb = parseFloat($content.css( "padding-bottom" )),
wh = window.innerHeight;
$content.height(wh - (hh + fh) - (pt + pb));
}
$(":jqmData(role='page')").live("pageshow", function(event) {
var $page = $(this);
$( ":jqmData(role='page')" ).live( "pageshow", function(event) {
var $page = $( this );
// For the demos that use this script, we want the content area of each
// page to be scrollable in the 'y' direction.
$page.find(".ui-content").attr("data-"+ $.mobile.ns +"scroll", "y");
$page.find( ".ui-content" ).attr( "data-" + $.mobile.ns + "scroll", "y" );
// This code that looks for [data-scroll] will eventually be folded
// into the jqm page processing code when scrollview support is "official"
// instead of "experimental".
$page.find(":jqmData(scroll):not(.ui-scrollview-clip)").each(function(){
var $this = $(this);
$page.find( ":jqmData(scroll):not(.ui-scrollview-clip)" ).each(function () {
var $this = $( this );
// XXX: Remove this check for ui-scrolllistview once we've
// integrated list divider support into the main scrollview class.
if ($this.hasClass("ui-scrolllistview"))
if ( $this.hasClass( "ui-scrolllistview" ) ) {
$this.scrolllistview();
else
{
var st = $this.jqmData("scroll") + "";
var paging = st && st.search(/^[xy]p$/) != -1;
var dir = st && st.search(/^[xy]/) != -1 ? st.charAt(0) : null;
} else {
var st = $this.jqmData( "scroll" ) + "",
paging = st && st.search(/^[xy]p$/) != -1,
dir = st && st.search(/^[xy]/) != -1 ? st.charAt(0) : null,
var opts = {};
if (dir)
opts.direction = dir;
if (paging)
opts.pagingEnabled = true;
opts = {
direction: dir || undefined,
paging: paging || undefined,
scrollMethod: $this.jqmData("scroll-method") || undefined
};
var method = $this.jqmData("scroll-method");
if (method)
opts.scrollMethod = method;
$this.scrollview(opts);
$this.scrollview( opts );
}
});
@ -52,9 +47,9 @@ $(":jqmData(role='page')").live("pageshow", function(event) {
// area that is sized to fit completely within the viewport. This should
// also handle the case where pages are loaded dynamically.
ResizePageContentHeight(event.target);
ResizePageContentHeight( event.target );
});
$(window).bind("orientationchange", function(event) {
ResizePageContentHeight($(".ui-page"));
});
$( window ).bind( "orientationchange", function( event ) {
ResizePageContentHeight( $( ".ui-page" ) );
});