=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-12-18 08:26:45 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-12-18 09:42:14 +0000 @@ -39,6 +39,7 @@ ../dhis-web-commons/javascripts/dhis2/dhis2.storage.idb.js ../dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js ../dhis-web-commons/javascripts/dhis2/dhis2.storage.js +../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js ../dhis-web-commons/javascripts/jQuery/jquery.cookie.js ../dhis-web-commons/javascripts/jQuery/jquery.validate.js ../dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2013-12-18 08:26:45 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2013-12-18 09:42:14 +0000 @@ -35,6 +35,7 @@ javascripts/dhis2/dhis2.storage.ls.js javascripts/dhis2/dhis2.storage.idb.js javascripts/dhis2/dhis2.storage.js +javascripts/dhis2/dhis2.appcache.js javascripts/jQuery/jquery.cookie.js ../main.js ouwt/ouwt.js === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.appcache.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.appcache.js 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.appcache.js 2013-12-18 09:42:14 +0000 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2004-2013, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +var dhis2 = dhis2 || {}; +dhis2['appcache'] = dhis2['appcache'] || {}; + +$(function() { + $(window.applicationCache).on('updateready', function( e ) { + if( window.applicationCache.status == window.applicationCache.UPDATEREADY ) { + // Browser downloaded a new app cache. + if( confirm('An update is available. Refresh to update?') ) { + window.location.reload(); + } + } + }); + + $(document).on('dhis2.online', function() { + dhis2.appcache.updateAppCache(); + }); +}); + +dhis2.appcache.updateAppCache = function() { + // check and download updated appcache, will fire of updateready + window.applicationCache.update(); +}; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2013-12-18 08:58:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2013-12-18 09:42:14 +0000 @@ -26,7 +26,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - var dhis2 = dhis2 || {}; dhis2['util'] = dhis2['util'] || {}; @@ -154,14 +153,3 @@ console.log(str); } }; - -$(function() { - $(window.applicationCache).on('updateready', function( e ) { - if( window.applicationCache.status == window.applicationCache.UPDATEREADY ) { - // Browser downloaded a new app cache. - if( confirm('A new version of this site is available. Load it?') ) { - window.location.reload(); - } - } - }); -}); === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-12-03 10:57:23 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-12-18 09:42:14 +0000 @@ -59,6 +59,7 @@ +