From 055bf14e3ff2d2693efb06a851853c32a4e16e10 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Thu, 11 Nov 2010 15:03:24 -0500 Subject: [PATCH] moved changePage, pageLoading, and silentScroll methods to $.mobile obj. --- experiments/themeswitcher/jquery.mobile.themeswitcher.js | 4 ++-- js/jquery.mobile.dialog.js | 2 +- js/jquery.mobile.forms.select.js | 4 ++-- js/jquery.mobile.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/experiments/themeswitcher/jquery.mobile.themeswitcher.js b/experiments/themeswitcher/jquery.mobile.themeswitcher.js index 5ecf2f88..0709dca7 100644 --- a/experiments/themeswitcher/jquery.mobile.themeswitcher.js +++ b/experiments/themeswitcher/jquery.mobile.themeswitcher.js @@ -31,7 +31,7 @@ //finished with this function done(){ - $.changePage([menuPage, currentPage], 'pop', true); + $.mobile.changePage([menuPage, currentPage], 'pop', true); menuPage.bind('pagehide',function(){ menuPage.remove(); }); @@ -45,6 +45,6 @@ menuPage.page(); //change page now - $.changePage([currentPage, menuPage], 'pop', false); + $.mobile.changePage([currentPage, menuPage], 'pop', false); }; })(jQuery); diff --git a/js/jquery.mobile.dialog.js b/js/jquery.mobile.dialog.js index b5d33946..772ba260 100644 --- a/js/jquery.mobile.dialog.js +++ b/js/jquery.mobile.dialog.js @@ -52,7 +52,7 @@ $.widget( "mobile.dialog", $.mobile.widget, { }, close: function(){ - $.changePage([this.element, $.activePage], undefined, true, true ); + $.mobile.changePage([this.element, $.activePage], undefined, true, true ); } }); })( jQuery ); \ No newline at end of file diff --git a/js/jquery.mobile.forms.select.js b/js/jquery.mobile.forms.select.js index 4fa9fc9c..3db0f945 100644 --- a/js/jquery.mobile.forms.select.js +++ b/js/jquery.mobile.forms.select.js @@ -217,7 +217,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, { self.menuType = "page"; self.menuPageContent.append( self.list ); - $.changePage(self.menuPage, 'pop', false, false); + $.mobile.changePage(self.menuPage, 'pop', false, false); } else { self.menuType = "overlay"; @@ -251,7 +251,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, { } if(self.menuType == "page"){ - $.changePage([self.menuPage,self.thisPage], 'pop', true, false); + $.mobile.changePage([self.menuPage,self.thisPage], 'pop', true, false); self.menuPage.one("pagehide",function(){ focusButton(); //return false; diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js index feb9dd6f..324eec5f 100644 --- a/js/jquery.mobile.js +++ b/js/jquery.mobile.js @@ -182,7 +182,7 @@ url = getBaseURL() + url; } - $.changePage({ + changePage({ url: url, type: type, data: $(this).serialize() @@ -604,7 +604,7 @@ }; //TODO - add to jQuery.mobile, not $ - $.extend({ + $.extend($.mobile, { pageLoading: pageLoading, changePage: changePage, silentScroll: silentScroll