mcramer
2012-10-09 2dbabef16f34079d724326b6978d2001a03a8e92
Bugfix: removed "flickering" of lading indicator on change of module

1 files modified
18 ■■■■ changed files
interface/web/js/scrigo.js.php 18 ●●●● patch | view | raw | blame | history
interface/web/js/scrigo.js.php
@@ -93,7 +93,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(jqXHR.responseText != '') {
                                                    if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                        var parts = jqXHR.responseText.split(':');
@@ -106,6 +105,7 @@
                                                    }
                                                }
                                                loadMenus();
                                                hideLoadIndicator();
                                            },
                                            error: function() {
                                                hideLoadIndicator();
@@ -135,7 +135,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                    var parts = jqXHR.responseText.split(':');
                                                    //alert(parts[1]);
@@ -151,6 +150,7 @@
                                                    pageFormChanged = false;
                                                }
                                                loadMenus();
                                                hideLoadIndicator();
                                            },
                                            error: function() {
                                                hideLoadIndicator();
@@ -176,7 +176,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                    var parts = jqXHR.responseText.split(':');
                                                    //alert(parts[1]);
@@ -188,6 +187,7 @@
                                                    onAfterContentLoad();
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
                                            },
                                            error: function(jqXHR, textStatus, errorThrown) {
                                                hideLoadIndicator();
@@ -214,7 +214,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(successMessage) alert(successMessage);
                                                if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                    var parts = jqXHR.responseText.split(':');
@@ -227,6 +226,7 @@
                                                    onAfterContentLoad();
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
                                            },
                                            error: function(jqXHR, textStatus, errorThrown) {
                                                hideLoadIndicator();
@@ -288,7 +288,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                    var parts = jqXHR.responseText.split(':');
                                                    loadContent(parts[1]);
@@ -305,6 +304,7 @@
                                                    onAfterContentLoad();
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
                                            },
                                            error: function() {
                                                hideLoadIndicator();
@@ -323,7 +323,6 @@
                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                                if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
                                                    var parts = jqXHR.responseText.split(":");
                                                    loadContent(parts[1]);
@@ -332,6 +331,7 @@
                                                    onAfterContentLoad();
                                                    pageFormChanged = false;
                                                }
                                                hideLoadIndicator();
                                            },
                                            error: function() {
                                                hideLoadIndicator();
@@ -455,10 +455,10 @@
                                            url: pagename,
                                            dataType: "html",
                                            beforeSend: function() {
                                                showLoadIndicator();
//                                                showLoadIndicator();
                                            },
                                            success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
//                                                hideLoadIndicator();
                                                var teste = jqXHR.responseText;
                                                var elemente = teste.split('#');
                                                el=document.getElementById(elementid);
@@ -472,7 +472,7 @@
                                                }
                                            },
                                            error: function() {
                                                hideLoadIndicator();
//                                                hideLoadIndicator();
                                                reportError('Ajax Request was not successful. 119');
                                            }
                                        });