Permalink
Browse files

missed a few files in that last commit.

  • Loading branch information...
1 parent 055bf14 commit b7b553da848c123617b56ce5286ab76e18209462 scottjehl committed Nov 11, 2010
Showing with 9 additions and 9 deletions.
  1. +3 −3 js/jquery.mobile.dialog.js
  2. +2 −2 js/jquery.mobile.fixHeaderFooter.js
  3. +4 −4 js/jquery.mobile.js
@@ -10,7 +10,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
_create: function(){
var self = this,
$el = self.element,
- $prevPage = $.activePage,
+ $prevPage = $.mobile.activePage,
$closeBtn = $('<a href="#" data-icon="delete" data-iconpos="notext">Close</a>');
$el.delegate("a, submit", "click submit", function(e){
@@ -19,7 +19,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
return false;
}
//otherwise, assume we're headed somewhere new. set activepage to dialog so the transition will work
- $.activePage = this.element;
+ $.mobile.activePage = this.element;
});
this.element
@@ -52,7 +52,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
},
close: function(){
- $.mobile.changePage([this.element, $.activePage], undefined, true, true );
+ $.mobile.changePage([this.element, $.mobile.activePage], undefined, true, true );
}
});
})( jQuery );
@@ -139,7 +139,7 @@ $.fixedToolbars = (function(){
return {
show: function(immediately){
currentstate = 'overlay';
- var $ap = $.activePage ? $.activePage : $(".ui-page-active");
+ var $ap = $.mobile.activePage ? $.mobile.activePage : $(".ui-page-active");
return $ap.children( toolbarSelector ).each(function(){
var el = $(this),
fromTop = $(window).scrollTop(),
@@ -161,7 +161,7 @@ $.fixedToolbars = (function(){
},
hide: function(immediately){
currentstate = 'inline';
- var $ap = $.activePage ? $.activePage : $(".ui-page-active");
+ var $ap = $.mobile.activePage ? $.mobile.activePage : $(".ui-page-active");
return $ap.children( toolbarSelector ).each(function(){
var el = $(this);
View
@@ -310,7 +310,7 @@
//from is always the currently viewed page
var toIsArray = $.type(to) === "array",
- from = toIsArray ? to[0] : $.activePage,
+ from = toIsArray ? to[0] : $.mobile.activePage,
to = toIsArray ? to[1] : to,
url = fileUrl = $.type(to) === "string" ? to.replace( /^#/, "" ) : null,
data = undefined,
@@ -362,7 +362,7 @@
pageLoading( true );
//trigger show/hide events, allow preventing focus change through return false
if( from.data("page")._trigger("hide", null, {nextPage: to}) !== false && to.data("page")._trigger("show", null, {prevPage: from}) !== false ){
- $.activePage = to;
+ $.mobile.activePage = to;
}
reFocus( to );
if( changeHash && url ){
@@ -527,7 +527,7 @@
}
//there's no hash, the active page is not the start page, and it's not manually triggered hashchange
// > probably backed out to the first page visited
- else if( $.activePage.length && !$startPage.is( $.activePage ) && !triggered ) {
+ else if( $.mobile.activePage.length && !$startPage.is( $.mobile.activePage ) && !triggered ) {
changePage( $startPage, transition, true );
}
else{
@@ -614,7 +614,7 @@
$(function(){
var $pages = $("[data-role='page']");
//set up active page
- $startPage = $.activePage = $pages.first();
+ $startPage = $.mobile.activePage = $pages.first();
//set page container
$pageContainer = $startPage.parent().addClass('ui-mobile-viewport');

0 comments on commit b7b553d

Please sign in to comment.