dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9375
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-12-20 10:49:00 +0100
message:
  minor online/offline fix
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-12-19 14:41:00 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-12-20 09:49:00 +0000
@@ -114,7 +114,6 @@
         return "base";
     }
 
-
     @RequestMapping(value = "/data-entry")
     public String dataEntry( Model model, HttpServletRequest request )
     {

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-12-19 11:22:35 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-12-20 09:49:00 +0000
@@ -7,8 +7,7 @@
 
     function checkOnlineStatus() {
         return $.ajax({
-            url: '$contextPath/mobile',
-            async: false
+            url: '$contextPath/mobile'
         }).error(function() {
            onlineStatus = false;
            loggedInStatus = false;
@@ -80,10 +79,11 @@
     }
 
     function onlineTimer() {
-        setTimeout(function () {
-            checkOnlineStatus();
-            onlineTimer();
-        }, 5000);
+        setTimeout( function () {
+            checkOnlineStatus().complete( function () {
+                onlineTimer();
+            } );
+        }, 5000 );
     }
 
     function renderOfflineStatus() {