Changeset 3308 for branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js

Timestamp:

09/29/10 17:00:23 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #986 - Na adicao de contatos ja esta sendo enviado o aceite do convite.

File:

• branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js (modified) (5 diffs)

branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js

@@ -370 +370 @@
                 try
                 {
-                var _divPhoto = getElement( jid + '__photo' );
-
-                if( _divPhoto.style.backgroundImage.indexOf('photo.png') > 0 )
-                {
-                        var _imgUser  = path_jabberit + 'inc/WebService.php?' + Date.parse( new Date );
-                                _imgUser += '&photo_ldap=' + jid;
-
-                        _divPhoto.style.backgroundImage = 'url(' + _imgUser + ')';
-                }
-                }
-                catch(e)
-                {}
+                        var _divPhoto = getElement( jid + '__photo' );
+        
+                        if( _divPhoto.style.backgroundImage.indexOf('photo.png') > 0 )
+                        {
+                                var _imgUser  = path_jabberit + 'inc/WebService.php?' + Date.parse( new Date );
+                                        _imgUser += '&photo_ldap=' + jid;
+        
+                                _divPhoto.style.backgroundImage = 'url(' + _imgUser + ')';
+                        }
+                }catch(e){}
         }
         
@@ -416 +414 @@
                 String = String.replace( /\*\*@#%/g             , " <img src='"+path_jabberit+"templates/default/images/smiles/14.gif'/> ");
                 String = String.replace( /\(I\)/g               , " <img src='"+path_jabberit+"templates/default/images/smiles/15.gif'/> ");
+                String = String.replace( /C28I/g                , " <img src='"+path_jabberit+"templates/default/images/smiles/16.gif'/> ");
  
                 return String;
@@ -507 +506 @@
                                         searchUser( element.value );    
                                 else
-                                        alert('Your search argument must be longer than 3 characters.');
+                                        alert( i18n.YOUR_SEARCH_ARGUMENT_MUST_BE_LONGER_THAN_3_CHARACTERS + '.' );
                 }
         }
@@ -884 +883 @@
                                 case 'from':
                                         
-                                        TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
+                                        TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribe');
                                 break;
 
                                 case 'subscribe' :
                                         
-                                        TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
+                                        TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed');
                                 break;
                                 
                                 case 'none' :                                   
                                 
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
+                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribe');
                                 break;
                                 
                         case 'to' :                             
                                 
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');                               
+                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed');                              
                                 removeElement( getElement('itenContactNotification_' + jidTo ) );                               
                                 break;
@@ -905 +904 @@
                         case 'not-in-roster':
                                         
-                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
+                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
                                 addUser.add( jidTo );
                                         break;
-                                        
-                                default:
-                                        
-                                        alert( "UNDEFINED : " + subscription );
                 }
         }