Changeset 651

Timestamp:

01/30/09 13:25:20 (15 years ago)

Author:

niltonneto

Message:

• Correção de condicionais com variáveis nulas.
• Otimização da função get_lang.
• Correção do ícone do JMessenger.

File:

• trunk/expressoMail1_2/js/common_functions.js (modified) (5 diffs)

trunk/expressoMail1_2/js/common_functions.js

@@ -82 +82 @@
                         var _value = array_lang[key];
                 else
-                        return _key+"*";
-
-        if(_arg1 || _arg2 ||_arg3 || _arg4) {
-                for(j = 1; j <= 4; j++){
-                        if(eval("_arg"+j)) {
-                                var regExp = new RegExp("%"+j+"");
-                                _value = _value.replace(regExp,eval("_arg"+j));
-                        }
-                }
-        }
-
+                        var _value = _key+"*";
+
+        if(_arg1)
+                for(j = 1; eval("_arg"+j); j++)
+                                _value = _value.replace("%"+j,eval("_arg"+j));
         return _value;
-}
-
+} 
 // Make decimal round, using in size message
 function round(value, decimal){
@@ -117 +110 @@
 function msg_is_read(msg_number, selected){
         tr_message = Element(msg_number);
-
-        if (tr_message.className.indexOf('unread')!=-1)
+        if (tr_message && LTrim(tr_message.className).match('tr_msg_unread'))
                 return false;
         else
@@ -316 +308 @@
         
         if( document.getElementById('JabberMessenger'))
-        {
-                msg_div.innerHTML  = '<div id="jabberWriteMsg"/>';
-                msg_div.innerHTML += '<table bgcolor="#f7f8fa" width="100%" cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>';
-                loadscript.adIcon();                            
-        }
-        else
-                msg_div.innerHTML = '<table bgcolor="#f7f8fa" width="100%" cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>';
+                loadscript.adIcon();
+
+        msg_div.innerHTML = '<table bgcolor="#f7f8fa" width="100%" cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>';
 
         old_divStatusBar.style.display = 'none';
@@ -697 +685 @@
 
 function add_className(obj, className){
-        if (!exist_className(obj, className))
+        if (obj && !exist_className(obj, className))
                 obj.className = obj.className + ' ' + className;
 }
@@ -708 +696 @@
 
 function exist_className(obj, className){
-        if ( obj && obj.className.indexOf(className) != -1 )
-                return true;
-        return false;
+        return ( obj && obj.className.indexOf(className) != -1 )
 }