Changeset 2293 for sandbox/jabberit_messenger/trophy
- Timestamp:
- 03/18/10 11:43:53 (14 years ago)
- Location:
- sandbox/jabberit_messenger/trophy
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/jabberit_messenger/trophy/js/loadIM.js
r2290 r2293 165 165 } 166 166 167 function parse(pXml, pXsl) 168 { 169 return _xtools.parse(_xtools.xml(pXml), pXsl); 167 function parse() 168 { 169 if( arguments.length == 2 ) 170 return _xtools.parse(_xtools.xml(arguments[0]), arguments[1] ); 171 172 if( arguments.length === 3 ) 173 return _xtools.parse(_xtools.xml(arguments[0]), arguments[1], arguments[2] ); 170 174 } 171 175 -
sandbox/jabberit_messenger/trophy/js/trophyim.js
r2290 r2293 592 592 * Message handler 593 593 */ 594 onMessage : function(msg) { 594 onMessage : function(msg) 595 { 595 596 Strophe.debug("Message handler"); 597 596 598 var from = msg.getAttribute('from'); 597 599 var type = msg.getAttribute('type'); 598 600 var elems = msg.getElementsByTagName('body'); 599 601 600 if ((type == 'chat' || type == 'normal') && elems.length > 0) { 601 var barejid = Strophe.getBareJidFromJid(from); 602 var jid_lower = barejid.toLowerCase(); 603 var contact = TrophyIM.rosterObj.roster[barejid.toLowerCase()]['contact']; 604 if (contact) { //Do we know you? 605 if (contact['name'] != null) { 602 if ( (type == 'chat' || type == 'normal') && elems.length > 0 ) 603 { 604 var barejid = Strophe.getBareJidFromJid(from); 605 var jid_lower = barejid.toLowerCase(); 606 var contact = ""; 607 608 if( TrophyIM.rosterObj.roster[barejid.toLowerCase()] ) 609 { 610 contact = TrophyIM.rosterObj.roster[barejid.toLowerCase()]['contact']['name']; 611 } 612 else 613 { 614 contact = barejid.toLowerCase(); 615 contact = contact.substring(0, contact.indexOf('@')); 616 } 617 618 var message = 619 { 620 contact : contact, 621 msg : Strophe.getText(elems[0]) 622 }; 623 624 TrophyIM.makeChat(from); //Make sure we have a chat window 625 TrophyIM.addMessage(message, jid_lower); 626 627 /* 628 if ( contact ) 629 { 630 631 //Do we know you? 632 if ( contact['name'] != null ) 633 { 606 634 message = contact['name'] + " (" + barejid + "): "; 607 } else { 635 } 636 else 637 { 608 638 message = contact['jid'] + ": "; 609 639 } 610 message += Strophe.getText(elems[0]); 611 TrophyIM.makeChat(from); //Make sure we have a chat window 640 641 message += Strophe.getText(elems[0]); 642 643 TrophyIM.makeChat(from); //Make sure we have a chat window 612 644 TrophyIM.addMessage(message, jid_lower); 613 645 614 /* 615 if (TrophyIM.activeChats['current'] != jid_lower) { 616 TrophyIM.activeChats['divs'][jid_lower][ 617 'tab'].className = "trophyimchattab trophyimchattab_a"; 618 TrophyIM.setTabPresence(from, 619 TrophyIM.activeChats['divs'][jid_lower]['tab']); 620 } 621 */ 622 } 646 647 //if (TrophyIM.activeChats['current'] != jid_lower) { 648 // TrophyIM.activeChats['divs'][jid_lower][ 649 // 'tab'].className = "trophyimchattab trophyimchattab_a"; 650 // TrophyIM.setTabPresence(from, 651 // TrophyIM.activeChats['divs'][jid_lower]['tab']); 652 //} 653 }*/ 623 654 } 624 655 return true; … … 633 664 634 665 var barjid = Strophe.getBareJidFromJid(fulljid); 666 667 var paramsChatBox = 668 { 669 'idChatBox' : barjid + "__chatBox", 670 }; 671 635 672 636 673 var winChatBox = … … 647 684 title : barjid.substring(0, barjid.indexOf('@')), 648 685 closeAction : "hidden", 649 content : loadIM.parse("chat_box","chatBox.xsl" )686 content : loadIM.parse("chat_box","chatBox.xsl", paramsChatBox) 650 687 } 651 688 … … 747 784 addMessage : function(msg, jid) 748 785 { 749 alert(jid + " : " + msg); 750 786 var chatBox = document.getElementById(jid + "__chatBox"); 787 var messageDiv = document.createElement("div"); 788 messageDiv.style.margin = "3px 0px 3px 3px"; 789 messageDiv.innerHTML = "<font style='font-weight:bold;'>" + msg.contact + "</font> : " + msg.msg ; 790 791 chatBox.appendChild(messageDiv); 792 chatBox.scrollTop = chatBox.scrollHeight; 793 751 794 /* 752 795 * Codigo Original Comentado -
sandbox/jabberit_messenger/trophy/xsl/chatBox.xsl
r2290 r2293 3 3 <xsl:output method="html" omit-xml-declaration="yes"/> 4 4 5 <xsl:param name="idChatBox" /> 6 5 7 <xsl:template match="chat_box"> 6 8 7 <div id="trophyimchat">8 <div style="height:190px; width:370px; overflow-y:scroll"></div>9 <div> 10 <div id="{$idChatBox}" style="height:190px; width:370px; overflow-y:scroll"></div> 9 11 <div style="margin:2px;"> 10 12 <form name="chat" onsubmit="TrophyIM.sendMessage(this); return(false);">
Note: See TracChangeset
for help on using the changeset viewer.