+ function invalidatePageCache( to ) {
+ pageCacheStrategy = to.data('cache');
+ forcePageReload = false;
+
+ if( pageCacheStrategy != undefined ) {
+ forcePageReload = ( pageCacheStrategy == 'never' );
+
+ if( !forcePageReload ) {
+ // Page is allowed to cache. Check if the expiration time is there.
+ pageCacheExpiry = parseInt(pageCacheStrategy, 10);
+ pageCacheExpiration = parseInt(to.data('cache-expiration'), 10);
+ currentTime = new Date().getTime();
+ if( !isNaN(pageCacheExpiry) && !isNaN(pageCacheExpiration) && pageCacheExpiration < currentTime ) {
+ // Page cache expiration is there and page has expired. Mark it for reload.
+ forcePageReload = true;
+ }
+ }
+ }
+
+ return forcePageReload;
+ }
+
//if url is a string
if( url ){
to = $( "[id='" + url + "']" ),
@@ -426,8 +469,10 @@
}
}
+ forcePageReload = invalidatePageCache(to);
+
// find the "to" page, either locally existing in the dom or by creating it through ajax
- if ( to.length && !isFormRequest ) {
+ if ( !forcePageReload && to.length && !isFormRequest ) {
if( fileUrl ){
setBaseURL(fileUrl);
}
From 879477af289f71d3f24cc20b446c00d32c92c66f Mon Sep 17 00:00:00 2001
From: Andre Medeiros
Date: Thu, 4 Nov 2010 22:36:15 +0100
Subject: [PATCH 5/6] Use vars; code cleanup;(cherry picked from commit
ba32a4b9482bce548d119cebd45b519f23d2a800)
---
js/jquery.mobile.js | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
index da9ca1ddb04..3d47ed064a5 100644
--- a/js/jquery.mobile.js
+++ b/js/jquery.mobile.js
@@ -415,14 +415,12 @@
// Marks the page for a timed cache expiry
function markPageCache( to ) {
- pageCacheStrategy = to.data('cache');
- if( pageCacheStrategy != undefined && pageCacheStrategy != 'never' ) {
- pageCacheExpiry = parseInt(pageCacheStrategy, 10);
- pageCacheExpiration = parseInt(to.data('cache-expiration'), 10);
- currentTime = new Date().getTime();
- if( !isNaN(pageCacheExpiry) && isNaN(pageCacheExpiration) ) {
+ var pageCacheStrategy = to.data('cache');
+ if( pageCacheStrategy && pageCacheStrategy != 'never' ) {
+ var currentTime = +new Date;
+ if( !isNaN(pageCacheStrategy) && !to.data('cache-expiration') ) {
// Page cache expiration isn't there. Put it there for future reference.
- to.data('cache-expiration', ((pageCacheExpiry * 1000) + currentTime));
+ to.data('cache-expiration', ((pageCacheStrategy * 1000) + currentTime));
}
}
}
@@ -434,18 +432,15 @@
// - page not being allowed to cache
//
function invalidatePageCache( to ) {
- pageCacheStrategy = to.data('cache');
- forcePageReload = false;
+ var pageCacheStrategy = to.data('cache'),
+ forcePageReload = false;
- if( pageCacheStrategy != undefined ) {
+ if( pageCacheStrategy ) {
forcePageReload = ( pageCacheStrategy == 'never' );
-
if( !forcePageReload ) {
// Page is allowed to cache. Check if the expiration time is there.
- pageCacheExpiry = parseInt(pageCacheStrategy, 10);
- pageCacheExpiration = parseInt(to.data('cache-expiration'), 10);
- currentTime = new Date().getTime();
- if( !isNaN(pageCacheExpiry) && !isNaN(pageCacheExpiration) && pageCacheExpiration < currentTime ) {
+ var currentTime = +new Date;
+ if( !isNaN(pageCacheStrategy) && !isNaN(to.data('cache-expiration')) && to.data('cache-expiration') < currentTime ) {
// Page cache expiration is there and page has expired. Mark it for reload.
forcePageReload = true;
}
From 5ccadc3c4e9da24fd0f238839f15c07646a17c49 Mon Sep 17 00:00:00 2001
From: sunkencity
Date: Wed, 17 Nov 2010 21:25:55 +0100
Subject: [PATCH 6/6] added flash message widget for growl style notifications
---
Makefile | 4 ++-
js/jquery.mobile.flashMessage.js | 29 +++++++++++++++++++
themes/default/jquery.mobile.flashMessage.css | 4 +++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 js/jquery.mobile.flashMessage.js
create mode 100644 themes/default/jquery.mobile.flashMessage.css
diff --git a/Makefile b/Makefile
index 57892cb0b46..aed9b0fdae0 100755
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ FILES = js/jquery.ui.widget.js \
js/jquery.mobile.dialog.js \
js/jquery.mobile.navbar.js \
js/jquery.mobile.grid.js \
+ js/jquery.mobile.flashMessage.js \
js/jquery.mobile.js
CSSFILES = themes/default/jquery.mobile.theme.css \
@@ -46,7 +47,8 @@ CSSFILES = themes/default/jquery.mobile.theme.css \
themes/default/jquery.mobile.forms.select.css \
themes/default/jquery.mobile.forms.textinput.css \
themes/default/jquery.mobile.listview.css \
- themes/default/jquery.mobile.forms.slider.css
+ themes/default/jquery.mobile.forms.slider.css \
+ themes/default/jquery.mobile.flashMessage.css
all: mobile min css cssmin
diff --git a/js/jquery.mobile.flashMessage.js b/js/jquery.mobile.flashMessage.js
new file mode 100644
index 00000000000..3b9620fe886
--- /dev/null
+++ b/js/jquery.mobile.flashMessage.js
@@ -0,0 +1,29 @@
+/*
+* jQuery Mobile Framework : "flashMessage" plugin
+* flashes a brief message displaying whatever is in a
+* container with data-role=flash, useful for short notices
+* like "Your settings has been saved"
+*/
+
+(function($, undefined ) {
+
+$.widget( "mobile.flashMessage", $.mobile.widget, {
+ options: {
+ fadeOutTime: 1000
+ },
+ _create: function(o){
+ $elem = this.element;
+ $elem.addClass('ui-flash');
+ $elem.fadeOut( this.options.fadeOutTime, function(){
+ $elem.remove();
+ });
+ }
+});
+
+$('.ui-page').live('pageshow', function(){
+ $("[data-role='flash']").flashMessage();
+});
+
+})( jQuery );
+
+
diff --git a/themes/default/jquery.mobile.flashMessage.css b/themes/default/jquery.mobile.flashMessage.css
new file mode 100644
index 00000000000..b32c9e5c542
--- /dev/null
+++ b/themes/default/jquery.mobile.flashMessage.css
@@ -0,0 +1,4 @@
+.ui-flash { position: absolute; opacity: .85; z-index: 10; top: 75px; left: 50%; width: 200px; margin-left: -130px; padding: 20px 30px; }
+.ui-flash.error { background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+.ui-flash.notice { background:#FFF6BF;color:#514721;border-color:#FFD324;}
+.ui-flash.success { background:#E6EFC2;color:#264409;border-color:#C6D880;}