Changeset 3004
- Timestamp:
- 07/06/10 17:17:36 (14 years ago)
- Location:
- trunk/jmessenger/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/jmessenger/js/AddUser.js
r2996 r3004 13 13 var name = jidTo.substring(0, jidTo.indexOf('@')); 14 14 15 var _groups = " Sem Grupos";15 var _groups = ""; 16 16 17 17 if( TrophyIM.rosterObj) 18 18 { 19 _groups = "Geral";20 21 19 for (var group in TrophyIM.rosterObj.groups) 22 20 { … … 185 183 var infoUser = null; 186 184 var img = document.createElement('img'); 187 var _groups = " Sem Grupos";185 var _groups = ""; 188 186 189 187 if( TrophyIM.rosterObj) 190 188 { 191 _groups = "";192 193 189 for (var group in TrophyIM.rosterObj.groups) 194 190 { -
trunk/jmessenger/js/trophyim.js
r2998 r3004 594 594 group_array[group_array.length] = groups[g].firstChild.nodeValue; 595 595 } 596 597 /*if( getAttribute('jid') == 'teste9@im.pr.gov.br' || getAttribute('jid') == 'alexandrecorreia@im.pr.gov.br' ) 598 { 599 alert( "JID : " + getAttribute('jid') + "\n" + 600 "ASK : " + getAttribute('ask') + "\n" + 601 "SUBSCRIPTION : " + getAttribute('subscription') ); 602 }*/ 603 604 605 if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" ) 596 597 if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" ) 606 598 { 607 599 if( getAttribute('subscription').toString() === "none" ) … … 617 609 else 618 610 { 619 if( getAttribute('subscription').toString() === "remove" )611 if( ( getAttribute('ask') == null && getAttribute('subscription').toString() === "remove" ) || getAttribute('subscription').toString() === "remove" ) 620 612 { 621 613 TrophyIM.rosterObj.removeContact( getAttribute('jid').toString() ); … … 1896 1888 var jid_lower = barejid.toLowerCase(); 1897 1889 1898 /** 1899 * COMENTADO PARA TESTES 1900 * 1901 if( show != 'unavailable' && show != 'error' ) 1902 if( show != 'unavailable' ) 1903 { 1904 */ 1890 if( show != 'unavailable' || show != 'error' ) 1891 { 1905 1892 if (!this.roster[jid_lower]) 1906 1893 { 1907 this.addContact( barejid, 'not-in-roster');1894 this.addContact( barejid, 'not-in-roster' ); 1908 1895 } 1909 1896 … … 1922 1909 1923 1910 this.roster[jid_lower]['presence'][resource] = presence; 1924 1925 /** 1926 * COMENTADO PARA TESTES 1927 * 1928 } 1929 else 1930 { 1931 delete this.roster[jid_lower]; 1932 } 1933 1934 this.addChange(jid_lower); 1935 */ 1911 } 1936 1912 } 1937 1913
Note: See TracChangeset
for help on using the changeset viewer.