- Timestamp:
- 09/30/10 17:21:21 (14 years ago)
- Location:
- branches/2.2/jabberit_messenger/jmessenger/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js
r3308 r3314 640 640 if( msg.getAttribute('from').toString().indexOf( TROPHYIM_CHATROOM ) < 0 ) 641 641 { 642 TrophyIM.rosterObj.setPresence( msg.getAttribute('from'), priority, show, status ); 642 var _from = Strophe.getBareJidFromJid( msg.getAttribute('from') ); 643 var _flag = true; 644 645 if( TrophyIM.removeResult.idResult.length > 0 ) 646 { 647 for( var i = 0 ; i < TrophyIM.removeResult.idResult.length; i++ ) 648 { 649 if( TrophyIM.removeResult.idResult[i] == _from ) 650 { 651 _flag = false; 652 653 TrophyIM.removeResult.idResult.splice(i,1); 654 655 i--; 656 657 if( show.toLowerCase() === 'subscribe' ) 658 _flag = true; 659 } 660 } 661 } 662 663 if( _flag ) 664 TrophyIM.rosterObj.setPresence( msg.getAttribute('from'), priority, show, status ); 643 665 } 644 666 … … 1151 1173 addContact : function( jidTo, name, group ) 1152 1174 { 1153 // Add Contact 1154 var _id = TrophyIM.connection.getUniqueId('add'); 1155 var newContact = $iq({type: 'set', id: _id }); 1156 newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'}); 1157 newContact = newContact.c('item').attrs({jid: jidTo, name:name }); 1158 newContact = newContact.c('group').t(group).tree(); 1159 1160 TrophyIM.connection.send(newContact); 1175 var _flag = true; 1176 1177 if( TrophyIM.removeResult.idResult.length > 0 ) 1178 { 1179 for( var i = 0 ; i < TrophyIM.removeResult.idResult.length; i++ ) 1180 { 1181 if( TrophyIM.removeResult.idResult[i] == jidTo ) 1182 { 1183 _flag = false; 1184 1185 TrophyIM.removeResult.idResult.splice(i,1); 1186 1187 i--; 1188 } 1189 } 1190 } 1191 1192 if( _flag ) 1193 { 1194 // Add Contact 1195 var _id = TrophyIM.connection.getUniqueId('add'); 1196 var newContact = $iq({type: 'set', id: _id }); 1197 newContact = newContact.c('query').attrs({xmlns : 'jabber:iq:roster'}); 1198 newContact = newContact.c('item').attrs({jid: jidTo, name:name }); 1199 newContact = newContact.c('group').t(group).tree(); 1200 1201 TrophyIM.connection.send(newContact); 1202 } 1161 1203 }, 1162 1204 … … 1336 1378 1337 1379 // Controller Result 1338 //TrophyIM.removeResult.idResult[ TrophyIM.removeResult.idResult.length ] = jidTo;1380 TrophyIM.removeResult.idResult[ TrophyIM.removeResult.idResult.length ] = jidTo; 1339 1381 1340 1382 var delContact = $iq({type: 'set', id: _id}) -
branches/2.2/jabberit_messenger/jmessenger/js/trophyim.mini.js
r3308 r3314 100 100 return true;},onPresence:function(msg) 101 101 {TrophyIM.onPresenceChatRoom(msg);var type=msg.getAttribute('type')?msg.getAttribute('type'):'available';var show=msg.getElementsByTagName('show').length?Strophe.getText(msg.getElementsByTagName('show')[0]):type;var status=msg.getElementsByTagName('status').length?Strophe.getText(msg.getElementsByTagName('status')[0]):'';var priority=msg.getElementsByTagName('priority').length?parseInt(Strophe.getText(msg.getElementsByTagName('priority')[0])):0;if(msg.getAttribute('from').toString().indexOf(TROPHYIM_CHATROOM)<0) 102 {TrophyIM.rosterObj.setPresence(msg.getAttribute('from'),priority,show,status);} 102 {var _from=Strophe.getBareJidFromJid(msg.getAttribute('from'));var _flag=true;if(TrophyIM.removeResult.idResult.length>0) 103 {for(var i=0;i<TrophyIM.removeResult.idResult.length;i++) 104 {if(TrophyIM.removeResult.idResult[i]==_from) 105 {_flag=false;TrophyIM.removeResult.idResult.splice(i,1);i--;if(show.toLowerCase()==='subscribe') 106 _flag=true;}}} 107 if(_flag) 108 TrophyIM.rosterObj.setPresence(msg.getAttribute('from'),priority,show,status);} 103 109 return true;},onPresenceChatRoom:function(msg) 104 110 {var xquery=msg.getElementsByTagName("x");if(xquery.length>0) … … 183 189 {_send_message();}});var winChatRoom={id_window:"window_chat_room_"+arguments[0],barejid:jidChatRoom,width:500,height:450,top:TrophyIM.posWindow.top,left:TrophyIM.posWindow.left,draggable:true,visible:"display",resizable:true,zindex:loadscript.getZIndex(),title:titleWindow,closeAction:"hidden",content:_content} 184 190 _win=_winBuild(winChatRoom);return(_messages=_win.content().firstChild);},addContact:function(jidTo,name,group) 185 {var _id=TrophyIM.connection.getUniqueId('add');var newContact=$iq({type:'set',id:_id});newContact=newContact.c('query').attrs({xmlns:'jabber:iq:roster'});newContact=newContact.c('item').attrs({jid:jidTo,name:name});newContact=newContact.c('group').t(group).tree();TrophyIM.connection.send(newContact);},addMessage:function(chatBox,jid,msg) 191 {var _flag=true;if(TrophyIM.removeResult.idResult.length>0) 192 {for(var i=0;i<TrophyIM.removeResult.idResult.length;i++) 193 {if(TrophyIM.removeResult.idResult[i]==jidTo) 194 {_flag=false;TrophyIM.removeResult.idResult.splice(i,1);i--;}}} 195 if(_flag) 196 {var _id=TrophyIM.connection.getUniqueId('add');var newContact=$iq({type:'set',id:_id});newContact=newContact.c('query').attrs({xmlns:'jabber:iq:roster'});newContact=newContact.c('item').attrs({jid:jidTo,name:name});newContact=newContact.c('group').t(group).tree();TrophyIM.connection.send(newContact);}},addMessage:function(chatBox,jid,msg) 186 197 {msg.msg=loadscript.getSmiles(msg.msg);var messageDiv=document.createElement("div");messageDiv.style.margin="3px 0px 1em 3px";messageDiv.innerHTML=msg.contact+" : "+msg.msg;chatBox.appendChild(messageDiv);chatBox.scrollTop=chatBox.scrollHeight;},renameContact:function(jid) 187 198 {var name=TrophyIM.rosterObj.roster[jid].contact.name;if((name=prompt(i18n.ASK_NEW_NAME_QUESTION+name+"!",name))) … … 206 217 {alert("ERRO : Sem conexão com o servidor "+TROPHYIM_CHATROOM);}},removeContact:function(jidTo) 207 218 {var divItenContact=null;if((divItenContact=document.getElementById('itenContact_'+jidTo))) 208 {var _id=TrophyIM.connection.getUniqueId(); var delContact=$iq({type:'set',id:_id})219 {var _id=TrophyIM.connection.getUniqueId();TrophyIM.removeResult.idResult[TrophyIM.removeResult.idResult.length]=jidTo;var delContact=$iq({type:'set',id:_id}) 209 220 delContact=delContact.c('query').attrs({xmlns:'jabber:iq:roster'});delContact=delContact.c('item').attrs({jid:jidTo,subscription:'remove'}).tree();TrophyIM.connection.send(delContact);loadscript.removeElement(document.getElementById('itenContactNotification_'+jidTo));var spanShow=document.getElementById('span_show_itenContact_'+jidTo) 210 221 spanShow.parentNode.removeChild(spanShow);loadscript.removeGroup(divItenContact.parentNode);divItenContact.parentNode.removeChild(divItenContact);}},renderRoster:function()
Note: See TracChangeset
for help on using the changeset viewer.