add some more loading prompts

diff --git a/functions.js b/functions.js
index 39b77d6a011b74aca2866829b8cda2d9ef6cd16c..72011568e4bf1991a8e55457960728322e09db3e 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1320,7 +1320,7 @@ function displayDlg(id, param) {
                return
        }
 
-       notify("");
+       notify_progress("Loading, please wait...");
 
        xmlhttp.open("GET", "backend.php?op=dlg&id=" +
                param_escape(id) + "&param=" + param_escape(param), true);

diff --git a/prefs.js b/prefs.js
index 53f9ecc98bf25ca4a769f3bd597768e3e78eed0e..cec724f4ed9bd9e5e45778d907922688e6cd0b03 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -284,6 +284,8 @@ function editLabel(id) {
                return
        }
 
+       notify_progress("Loading, please wait...");
+
        document.getElementById("label_create_btn").disabled = true;
 
        active_label = id;
@@ -305,6 +307,8 @@ function editUser(id) {
                return
        }
 
+       notify_progress("Loading, please wait...");
+
        selectTableRowsByIdPrefix('prefUserList', 'UMRR-', 'UMCHK-', false);
        selectTableRowById('UMRR-'+id, 'UMCHK-'+id, true);
 
@@ -322,6 +326,8 @@ function editFilter(id) {
                return
        }
 
+       notify_progress("Loading, please wait...");
+
        document.getElementById("create_filter_btn").disabled = true;
 
        selectTableRowsByIdPrefix('prefFilterList', 'FILRR-', 'FICHK-', false);
@@ -341,6 +347,8 @@ function editFeed(feed) {
                return
        }
 
+       notify_progress("Loading, please wait...");
+
        // clean selection from all rows & select row being edited
        selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
        selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
@@ -360,6 +368,8 @@ function editFeedCat(cat) {
                return
        }
 
+       notify_progress("Loading, please wait...");
+
        active_feed_cat = cat;
 
        xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editCats&action=edit&id=" +
@@ -665,6 +675,13 @@ function labelTest() {
 
 function displayHelpInfobox(topic_id) {
 
+       if (!xmlhttp_ready(xmlhttp)) {
+               printLockingError();
+               return
+       }
+
+       notify_progress("Loading help...");
+
        xmlhttp.open("GET", "backend.php?op=help&tid=" +
                param_escape(topic_id) + "&noheaders=1", true);
 
@@ -1142,7 +1159,7 @@ function selectTab(id, noupdate, subop) {
 
                        debug("selectTab: " + id + "(NU: " + noupdate + ")");
        
-                       notify_progress("Loading, please wait...", true);
+                       notify_progress("Loading, please wait...");
        
                        // close active infobox if needed
                        closeInfoBox();