Tickets #2788

inc/js/functions.js

@@ -733,11 +733,13 @@ function bx_time(sLang, isAutoupdate, sRootSel) {
     var iAutoupdate = 22*60*60; // autoupdate time in realtime if less than 22 hours
     var sSel = 'time';
 
-    if ('undefined' == typeof(sLang)) {
-        sLang = glBxTimeLang;
-    } else {
+    if (typeof(sLang) != 'undefined')
         glBxTimeLang = sLang;
-    }
+    else if(typeof(glBxTimeLang) != 'undefined')
+        sLang = glBxTimeLang;
+
+    if(!sLang)
+        return;
 
     if ('undefined' != typeof(isAutoupdate) && isAutoupdate)
         sSel += '.bx-time-autoupdate';
@@ -964,10 +966,13 @@ function on_copyright_click()
 
 function bx_activate_anim_icons(sColor)
 {
-    if ('undefined' == typeof(sColor))
+    if(typeof(sColor) != 'undefined')
+        glBxAnimIconColor = sColor;
+    else if(typeof(glBxAnimIconColor) != 'undefined')
         sColor = glBxAnimIconColor;
-    else
-       glBxAnimIconColor = sColor;
+
+    if(!sColor)
+        return;
 
     $('.sys-icon-a').not('.marka').each(function () {
         var e = $(this);

template/scripts/BxBaseFunctions.php

@@ -600,14 +600,14 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
         return $this->_oTemplate->_wrapInTagJsCode($sContent);
     }
 
-    protected function getInjFooterMenuLoading() 
+    protected function getInjHeaderPopupLoading() 
     {
-        return $this->_oTemplate->parsePageByName('menu_loading.html', array());  
+        return $this->transBox('bx-popup-loading', $this->_oTemplate->parsePageByName('popup_loading.html', array()), true);  
     }
-
-    protected function getInjFooterPopupLoading() 
+    
+    protected function getInjFooterMenuLoading() 
     {
-        return $this->transBox('bx-popup-loading', $this->_oTemplate->parsePageByName('popup_loading.html', array()), true);  
+        return $this->_oTemplate->parsePageByName('menu_loading.html', array());  
     }
 
     protected function getInjFooterPopupMenus()