Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-03-16 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

namespaced $.fixedToolbars to $.mobile. Kept a deprecated pointer to $.fixedToolbars that we'll want to remove later. This feature can now be documented. Addresses Issue #2024

Browse source
This commit is contained in:
scottjehl 2011-07-31 20:35:18 -04:00
parent f020f0661b
commit faf26d8f6d
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
js/jquery.mobile.fixHeaderFooter.js
View file

@ -29,7 +29,7 @@ $.fn.fixHeaderFooter = function( options ) {
};
//single controller for all showing,hiding,toggling
$.fixedToolbars = (function() {
$.mobile.fixedToolbars = (function() {
if ( !$.support.scrollTop ) {
return;
@ -62,10 +62,10 @@ $.fixedToolbars = (function() {
// callbacks for the plugin will fire off a show when the scrolling has stopped.
if ( !autoHideMode && currentstate === "overlay" ) {
if ( !delayTimer ) {
$.fixedToolbars.hide( true );
$.mobile.fixedToolbars.hide( true );
}
$.fixedToolbars.startShowTimer();
$.mobile.fixedToolbars.startShowTimer();
}
}
@ -87,7 +87,7 @@ $.fixedToolbars = (function() {
}
if ( !scrollTriggered ) {
$.fixedToolbars.toggle( stateBefore );
$.mobile.fixedToolbars.toggle( stateBefore );
stateBefore = null;
}
}
@ -121,10 +121,10 @@ $.fixedToolbars = (function() {
autoHideMode = isOverlayState || !!delayTimer;
if ( autoHideMode ) {
$.fixedToolbars.clearShowTimer();
$.mobile.fixedToolbars.clearShowTimer();
if ( isOverlayState ) {
$.fixedToolbars.hide( true );
$.mobile.fixedToolbars.hide( true );
}
}
})
@ -137,7 +137,7 @@ $.fixedToolbars = (function() {
scrollTriggered = false;
if ( autoHideMode ) {
$.fixedToolbars.startShowTimer();
$.mobile.fixedToolbars.startShowTimer();
autoHideMode = false;
}
stateBefore = null;
@ -175,7 +175,7 @@ $.fixedToolbars = (function() {
}, 500);
}
$.fixedToolbars.show( true, this );
$.mobile.fixedToolbars.show( true, this );
});
//When a collapsiable is hidden or shown we need to trigger the fixed toolbar to reposition itself (#1635)
@ -244,7 +244,7 @@ $.fixedToolbars = (function() {
show: function( immediately, page ) {
$.fixedToolbars.clearShowTimer();
$.mobile.fixedToolbars.clearShowTimer();
currentstate = "overlay";
@ -314,13 +314,13 @@ $.fixedToolbars = (function() {
startShowTimer: function() {
$.fixedToolbars.clearShowTimer();
$.mobile.fixedToolbars.clearShowTimer();
var args = $.makeArray(arguments);
delayTimer = setTimeout(function() {
delayTimer = undefined;
$.fixedToolbars.show.apply( null, args );
$.mobile.fixedToolbars.show.apply( null, args );
}, showDelay);
},
@ -335,8 +335,8 @@ $.fixedToolbars = (function() {
if ( from ) {
currentstate = from;
}
return ( currentstate === "overlay" ) ? $.fixedToolbars.hide() :
$.fixedToolbars.show();
return ( currentstate === "overlay" ) ? $.mobile.fixedToolbars.hide() :
$.mobile.fixedToolbars.show();
},
setTouchToggleEnabled: function(enabled) {
@ -345,6 +345,9 @@ $.fixedToolbars = (function() {
};
})();
// TODO - Deprecated namepace on $. Remove in a later release
$.fixedToolbars = $.mobile.fixedToolbars;
//auto self-init widgets
$( document ).bind( "pagecreate create", function( e ){