Changeset 81 for trunk/instant_messenger/js

Timestamp:

10/10/07 14:29:38 (17 years ago)

Author:

niltonneto

Message:

Atualização do CVS Interno com CVS Externo.
Modificações, vide changelog no arquivo changelog.txt ou no site do Expresso.

Location:

trunk/instant_messenger/js

Files:

• im_functions.js (modified) (2 diffs)
• im_preferences.js (modified) (6 diffs)
• im_templates.js (modified) (3 diffs)
• im_win.js (modified) (1 diff)

trunk/instant_messenger/js/im_functions.js

@@ -353 +353 @@
                                    else
                                       var nickname = from;
+                                  
+                                   if(nickname.indexOf('@') != -1)      
+                                                nickname = nickname.substr(0,nickname.indexOf('@'));
 
                        var win = document.getElementById(from + '_chatMessages');
@@ -442 +445 @@
                           nickname = nickname.substr(0,nickname.indexOf('|'));
                           nickname = nickname.substr(nickname.indexOf(':') + 1 , nickname.length);
-                          nickname = (func.trim(nickname) != "") ? nickname : IM_Preferences.jid;       
+                          nickname = (func.trim(nickname) != "") ? nickname : IM_Preferences.jid;
+                          if(nickname.indexOf('@') != -1)       
+                                nickname = nickname.substr(0,nickname.indexOf('@'));
                   }
 

trunk/instant_messenger/js/im_preferences.js

@@ -114 +114 @@
                                 text1.value = "";
                                 text2.value = "";       
+
                                 if(pFunc != 'divAddUser_im')
                                 {
@@ -131 +132 @@
                                         }
                                 }
-                                
+                                else
+                                {
+                                        Templates.Status_AddUser();
+                                        setTimeout("Templates.Status_AddUser();",3000);
+                                }                               
                                 if( IM.UsersNot.length == 0 )
                                         im_win.windowClose('divFormAuthUser_im');
@@ -219 +224 @@
                         for(var i in pJids)
                         {
-                                var opt = new Option(pJids[i], pJids[i], false, true);
+                                var opt = new Option(pJids[i].substr(0,pJids[i].indexOf('@')), pJids[i], false, true);
                                 sel_box[sel_box.length] = opt;
                         }
@@ -401 +406 @@
                 var Nvcard = new Array('FN','NICKNAME','ORGNAME','ORGUNIT','ROLE','BDAY','DESC');
                 var vcard = "";
+                var new_vcard = "";
                 var value = "";
                 for(var i in Nvcard)
@@ -409 +415 @@
                                 document.getElementById('span_nickname').innerHTML = "<b>" + nn.substring(0,15) + "</b>";
                         }
-
+                        
                         value = document.getElementById(Nvcard[i]).value;
+                        new_vcard += '<'+Nvcard[i]+'>'+value+'</'+Nvcard[i]+'>';
                         value = (func.trim(value) != "") ? value : "";
                         vcard += value + "_vkrd_";
                 }
-                
+
+                document.getElementById("vcard_" + this.jid).innerHTML = new_vcard;
                 vcard = vcard.substr(0,vcard.length - 6 );              
-                
+
                 var handler_vcard_add = function(XMLdata)
                 {
@@ -422 +430 @@
                 XMLTools.request('$this.Ujabber.newVcard','POST',handler_vcard_add,"vcard="+escape(vcard));     
                 alert('Informações Cadastradas / Adicionadas !!!');     
+                im_win.windowClose('divInfoUser_im');
         }
         

trunk/instant_messenger/js/im_templates.js

@@ -57 +57 @@
                 _this.conf_form("divUpdateUser",300,110,parse_XmlXsl(_XmlupdUser,'upd_user.xsl'),":: " + IM.get_lang('Add New Contact') + " - Expresso ::");
         }
+        
+        Templates.prototype.Status_AddUser = function()
+        {
+                if( document.getElementById('im_status_add') != null )
+                        if( document.getElementById('im_status_add').innerHTML != "" )
+                                document.getElementById('im_status_add').innerHTML = "";
+                        else
+                                document.getElementById('im_status_add').innerHTML = IM.get_lang('Contact Add') + ' ... !!!';
+        }
 
    /*
@@ -66 +75 @@
                 var _this = this;
                 var _XmlDelUser = '<deluser>' +
-                                                        '<body lang1="'+IM.get_lang('Contact')+'" lang2="'+IM.get_lang('Remove')+'" />' +
+                                                        '<body lang1="'+IM.get_lang('Contact')+'" lang2="'+IM.get_lang('Remove')+'" lang3="'+IM.get_lang('close')+'"/>' +
                                                   '</deluser>';
 
@@ -113 +122 @@
                                                                         '<DESC>' + IM.get_lang('Status') + '</DESC>' +
                                                                         '<SAVE>' +IM.get_lang('save') + '</SAVE>' +
+                                                                        '<CLOSE>' +IM.get_lang('close') + '</CLOSE>' +                                                                  
                                                                 '</getlang>' +
                                                    '</info_user>';      

trunk/instant_messenger/js/im_win.js

@@ -118 +118 @@
                         this.windowMinimize(pId + '_im');
 
-                        main_menu_head.innerHTML += '<span id="span_menu_pref" style="float: left;" onmousedown="IM.menu_preferences(event ,\'menu_preferences\'); document.oncontextmenu = new Function(\'return false\');"></span>';
+                        main_menu_head.innerHTML += '<span id="span_menu_pref" style="float: left;cursor: pointer;" onmousedown="IM.menu_preferences(event ,\'menu_preferences\'); document.oncontextmenu = new Function(\'return false\');"></span>';
 
                         var br3 = func.newEl('br');