[Nagvis-checkins] SF.net Git: nagvis: Bugfix: Re-added "loading..." message on page rederin

[lars]

Author:   Lars Michelsen <l...@larsmichelsen.com>
Date:     Mon Oct 22 11:34:00 2012 +0200
Committer:   Lars Michelsen <l...@larsmichelsen.com>
Commit-Date: Mon Oct 22 11:34:00 2012 +0200

Bugfix: Re-added "loading..." message on page rederin

---

 ChangeLog                               |    4 ++++
 TODO                                    |    1 +
 share/frontend/nagvis-js/js/frontend.js |   21 ++++++++++++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95564d6..9a5735d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.7.3
+Frontend:
+  * Bugfix: Re-added "loading..." message on page redering
+
 1.7.2
 Core:
   * Multisite auth module: Removed deprecated permission
diff --git a/TODO b/TODO
index a9126b3..b1ce93d 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,7 @@ Offene Punkte:
     - Automap Migration
 
 - WUI: printLang() durch neuen _() Mechnismus ersetzen
+- Overview-Seite: Bei HTTP Fehler, z.b. 500 wegen Memory-Limit, ordentlichen 
Fehler zeigen
 
 -------------------------------------------------------------------------------
 
diff --git a/share/frontend/nagvis-js/js/frontend.js 
b/share/frontend/nagvis-js/js/frontend.js
index ac9d9be..d96fe49 100644
--- a/share/frontend/nagvis-js/js/frontend.js
+++ b/share/frontend/nagvis-js/js/frontend.js
@@ -1310,6 +1310,7 @@ function parseOverviewMaps(aMapsConf) {
     // Exit this function on invalid call
     if(aMapsConf === null)  {
         eventlog("worker", "warning", "parseOverviewMaps: Invalid call - maybe 
broken ajax response");
+        hideStatusMessage();
         return false;
     }
 
@@ -1317,6 +1318,7 @@ function parseOverviewMaps(aMapsConf) {
     if(oPageProperties.showmaps === 1) {
         if(aMapsConf.length == 0) {
             document.getElementById('overviewMaps').parentNode.style.display = 
'none';
+            hideStatusMessage();
             return false;
         }
 
@@ -1364,6 +1366,10 @@ function parseOverviewMaps(aMapsConf) {
 
     eventlog("worker", "debug", "parseOverviewMaps: End setting maps");
     getAndParseTemplates();
+
+    // Hide the "Loading..." message. This is not the best place since 
geomaps/rotations 
+    // might not have been loaded now but in most cases this is the longest 
running request
+    hideStatusMessage();
 }
 
 /**
@@ -1641,6 +1647,8 @@ function parseMap(iMapCfgAge, type, mapName) {
 function parseMapHandler(oObjects, params) {
     // Only perform the reparsing actions when all information are there
     if(!oPageProperties || !oObjects) {
+        // Close the status message window ("Loading...")
+        hideStatusMessage();
         return;
     }
 
@@ -1688,6 +1696,9 @@ function parseMapHandler(oObjects, params) {
 
     oObjects = null;
 
+    // Close the status message window ("Loading...")
+    hideStatusMessage();
+
     // Updates are allowed again
     bBlockUpdates = false;
 }
@@ -1768,14 +1779,14 @@ function workerInitialize(iCount, sType, sIdentifier) {
         eventlog("worker", "debug", "Parsing url page");
         parseUrl(sIdentifier);
 
-        // Load the file ages of the important configuration files
-        eventlog("worker", "debug", "Loading the file ages");
+        // Hide the "loading ..." message
+        hideStatusMessage();
     } else {
         eventlog("worker", "error", "Unknown view type: "+sType);
-    }
 
-    // Close the status message window
-    hideStatusMessage();
+        // Hide the "loading ..." message
+        hideStatusMessage();
+    }
 }
 
 function getAndParseTemplates() {


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins