Changeset 4346 for branches/2.2.0.1


Ignore:
Timestamp:
05/11/11 16:58:48 (13 years ago)
Author:
rafaelraymundo
Message:

Ticket #1726 - Uso do FF no array de browsers compativeis. r4341 r4343 r4345

Location:
branches/2.2.0.1/jabberit_messenger/jmessenger
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.0.1/jabberit_messenger/jmessenger/js/SnifferBrowser.js

    r3687 r4346  
    1010        var iePos               = appVer.indexOf('msie'); 
    1111     
    12         if ( iePos != -1 ) 
     12    if ( iePos != -1 ) 
    1313    { 
    1414       is_minor = parseFloat(appVer.substring(iePos+5,appVer.indexOf(';',iePos))); 
     
    6161                        ['firefox2', ( agt.indexOf('firefox/2') != -1 ) ], 
    6262                        ['firefox3', ( agt.indexOf('firefox/3') != -1 ) ], 
     63                        ['firefox4', ( agt.indexOf('firefox/4') != -1 ) ], 
    6364         
    6465                        // ICEWEASEL 
  • branches/2.2.0.1/jabberit_messenger/jmessenger/js/SnifferBrowser.mini.js

    r3687 r4346  
    55{is_konq=true;is_minor=parseFloat(agt.substring(kqPos+10,agt.indexOf(';',kqPos)));is_major=parseInt(is_minor);} 
    66var is_khtml=(((agt.indexOf('safari')!=-1)&&(agt.indexOf('mac')!=-1))&&(is_konq));var is_opera=(agt.indexOf("opera")!=-1);var is_ie=((iePos!=-1)&&(!is_opera)&&(!is_khtml));var is_gecko=((!is_khtml)&&(navigator.product)&&(navigator.product.toLowerCase()=="gecko"))?true:false;var is_gver=0;if(is_gecko) 
    7 is_gver=navigator.productSub;var is_moz=((agt.indexOf('mozilla/5')!=-1)&&(agt.indexOf('spoofer')==-1)&&(agt.indexOf('compatible')==-1)&&(agt.indexOf('opera')==-1)&&(agt.indexOf('webtv')==-1)&&(agt.indexOf('hotjava')==-1)&&(is_gecko)&&((navigator.vendor=="")||(navigator.vendor=="Mozilla")));var _browser=[['chrome8',(agt.indexOf('chrome/8')!=-1)],['epiphany2',(agt.indexOf('epiphany/2')!=-1)],['firefox1',(agt.indexOf('firefox/1')!=-1)],['firefox2',(agt.indexOf('firefox/2')!=-1)],['firefox3',(agt.indexOf('firefox/3')!=-1)],['iceweasel3',(agt.indexOf('iceweasel/3')!=-1)],['ie3',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major<4))],['ie4',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==4))],['ie5',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==5))],['ie55',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(agt.indexOf("msie 5.5")!=-1))],['ie6',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==6))],['ie7',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==7))],['ie8',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==8))],['is_ie',((iePos!=-1)&&(!is_opera)&&(!is_khtml))],['is_gecko',is_gecko],['is_opera',is_opera],['is_khtml',is_khtml],['is_moz',is_moz],['is_opera',is_opera],['opera2',(agt.indexOf("opera 2")!=-1||agt.indexOf("opera/2")!=-1)],['opera3',(agt.indexOf("opera 3")!=-1||agt.indexOf("opera/3")!=-1)],['opera4',(agt.indexOf("opera 4")!=-1||agt.indexOf("opera/4")!=-1)],['opera5',(agt.indexOf("opera 5")!=-1||agt.indexOf("opera/5")!=-1)],['opera6',(agt.indexOf("opera 6")!=-1||agt.indexOf("opera/6")!=-1)],['opera7',(agt.indexOf("opera 7")!=-1||agt.indexOf("opera/7")!=-1)],['opera8',(agt.indexOf("opera 8")!=-1||agt.indexOf("opera/8")!=-1)],['opera9',(agt.indexOf("opera 9")!=-1||agt.indexOf("opera/9")!=-1)],['safari',((agt.indexOf('safari')!=-1)&&(agt.indexOf('mac')!=-1))],['khtml',is_khtml]];function isCompatible() 
     7is_gver=navigator.productSub;var is_moz=((agt.indexOf('mozilla/5')!=-1)&&(agt.indexOf('spoofer')==-1)&&(agt.indexOf('compatible')==-1)&&(agt.indexOf('opera')==-1)&&(agt.indexOf('webtv')==-1)&&(agt.indexOf('hotjava')==-1)&&(is_gecko)&&((navigator.vendor=="")||(navigator.vendor=="Mozilla")));var _browser=[['chrome8',(agt.indexOf('chrome/8')!=-1)],['epiphany2',(agt.indexOf('epiphany/2')!=-1)],['firefox1',(agt.indexOf('firefox/1')!=-1)],['firefox2',(agt.indexOf('firefox/2')!=-1)],['firefox3',(agt.indexOf('firefox/3')!=-1)],['firefox4',(agt.indexOf('firefox/4')!=-1)],['iceweasel3',(agt.indexOf('iceweasel/3')!=-1)],['ie3',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major<4))],['ie4',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==4))],['ie5',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==5))],['ie55',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(agt.indexOf("msie 5.5")!=-1))],['ie6',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==6))],['ie7',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==7))],['ie8',(((iePos!=-1)&&(!is_opera)&&(!is_khtml))&&(is_major==8))],['is_ie',((iePos!=-1)&&(!is_opera)&&(!is_khtml))],['is_gecko',is_gecko],['is_opera',is_opera],['is_khtml',is_khtml],['is_moz',is_moz],['is_opera',is_opera],['opera2',(agt.indexOf("opera 2")!=-1||agt.indexOf("opera/2")!=-1)],['opera3',(agt.indexOf("opera 3")!=-1||agt.indexOf("opera/3")!=-1)],['opera4',(agt.indexOf("opera 4")!=-1||agt.indexOf("opera/4")!=-1)],['opera5',(agt.indexOf("opera 5")!=-1||agt.indexOf("opera/5")!=-1)],['opera6',(agt.indexOf("opera 6")!=-1||agt.indexOf("opera/6")!=-1)],['opera7',(agt.indexOf("opera 7")!=-1||agt.indexOf("opera/7")!=-1)],['opera8',(agt.indexOf("opera 8")!=-1||agt.indexOf("opera/8")!=-1)],['opera9',(agt.indexOf("opera 9")!=-1||agt.indexOf("opera/9")!=-1)],['safari',((agt.indexOf('safari')!=-1)&&(agt.indexOf('mac')!=-1))],['khtml',is_khtml]];function isCompatible() 
    88{if(arguments.length>0) 
    99{var _args=arguments;for(i=0;i<_args.length;i++) 
  • branches/2.2.0.1/jabberit_messenger/jmessenger/js/jscode/loadIM.js

    r3680 r4346  
    420420                String = String.replace( /C28I/g                , " <img src='"+path_jabberit+"templates/default/images/smiles/16.gif'/> "); 
    421421                String = String.replace( /CS2A/g                , " <img src='"+path_jabberit+"templates/default/images/smiles/17.gif' style='width:42px;height:36px;'/> "); 
     422                String = String.replace( /\(CzzzzI\)/g          , " <img src='"+path_jabberit+"templates/default/images/smiles/18.gif'/> ");                 
    422423  
    423424                return String; 
     
    821822                        } 
    822823                         
    823                         if( SnifferBrowser.isCompatible('ie8','firefox3','epiphany2','iceweasel3') ) 
     824                        if( SnifferBrowser.isCompatible('ie8','firefox3','firefox4','epiphany2','iceweasel3') ) 
    824825                        {        
    825826                                var _idUser     = Base64.decode(getUserCurrent().jid); 
     
    15411542                                        if( _preferencesIM[0] === 'openWindowJabberit:true' ) 
    15421543                                        { 
    1543                                                 if( SnifferBrowser.isCompatible('ie8','firefox3','epiphany2','iceweasel3') ) 
     1544                                                if( SnifferBrowser.isCompatible('ie8','firefox3','firefox4','epiphany2','iceweasel3') ) 
    15441545                                                        TrophyIM.load(); 
    15451546                                        } 
  • branches/2.2.0.1/jabberit_messenger/jmessenger/js/jscode/loadIM.mini.js

    r3687 r4346  
    9696return true;} 
    9797function getSmiles(String) 
    98 {String=String.replace(/:\)|:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/1.gif'/> ");String=String.replace(/:-D/g," <img src='"+path_jabberit+"templates/default/images/smiles/2.gif'/> ");String=String.replace(/;-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/3.gif'/> ");String=String.replace(/=-O/g," <img src='"+path_jabberit+"templates/default/images/smiles/4.gif'/> ");String=String.replace(/:P/g," <img src='"+path_jabberit+"templates/default/images/smiles/5.gif'/> ");String=String.replace(/8-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/6.gif'/> ");String=String.replace(/\>:o/g," <img src='"+path_jabberit+"templates/default/images/smiles/7.gif'/> ");String=String.replace(/:-\$/g," <img src='"+path_jabberit+"templates/default/images/smiles/8.gif'/> ");String=String.replace(/:s|:-X/g," <img src='"+path_jabberit+"templates/default/images/smiles/9.gif'/> ");String=String.replace(/:-\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/10.gif'/> ");String=String.replace(/:\'\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/11.gif'/> ");String=String.replace(/:\|/g," <img src='"+path_jabberit+"templates/default/images/smiles/12.gif'/> ");String=String.replace(/O:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/13.gif'/> ");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'/> ");String=String.replace(/CS2A/g," <img src='"+path_jabberit+"templates/default/images/smiles/17.gif' style='width:42px;height:36px;'/> ");return String;} 
     98{String=String.replace(/:\)|:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/1.gif'/> ");String=String.replace(/:-D/g," <img src='"+path_jabberit+"templates/default/images/smiles/2.gif'/> ");String=String.replace(/;-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/3.gif'/> ");String=String.replace(/=-O/g," <img src='"+path_jabberit+"templates/default/images/smiles/4.gif'/> ");String=String.replace(/:P/g," <img src='"+path_jabberit+"templates/default/images/smiles/5.gif'/> ");String=String.replace(/8-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/6.gif'/> ");String=String.replace(/\>:o/g," <img src='"+path_jabberit+"templates/default/images/smiles/7.gif'/> ");String=String.replace(/:-\$/g," <img src='"+path_jabberit+"templates/default/images/smiles/8.gif'/> ");String=String.replace(/:s|:-X/g," <img src='"+path_jabberit+"templates/default/images/smiles/9.gif'/> ");String=String.replace(/:-\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/10.gif'/> ");String=String.replace(/:\'\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/11.gif'/> ");String=String.replace(/:\|/g," <img src='"+path_jabberit+"templates/default/images/smiles/12.gif'/> ");String=String.replace(/O:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/13.gif'/> ");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'/> ");String=String.replace(/CS2A/g," <img src='"+path_jabberit+"templates/default/images/smiles/17.gif' style='width:42px;height:36px;'/> ");String=String.replace(/\(CzzzzI\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/18.gif'/> ");return String;} 
    9999function getStatusUserIM() 
    100100{return statusUserIM;} 
     
    180180{var winRosterDiv={id_window:"window_Roster_im",width:250,height:410,top:50,left:-1500,leftOld:50,draggable:true,visible:"display",resizable:true,zindex:zIndex++,title:"Expresso Messenger - Contatos",closeAction:"hidden",content:""};if(_preferencesIM[0]=="openWindowJabberit:false") 
    181181{winRosterDiv.left=50;winRosterDiv.leftOld=-1500;} 
    182 if(SnifferBrowser.isCompatible('ie8','firefox3','epiphany2','iceweasel3')) 
     182if(SnifferBrowser.isCompatible('ie8','firefox3','firefox4','epiphany2','iceweasel3')) 
    183183{var _idUser=Base64.decode(getUserCurrent().jid);var paramListContact={'idUser':_idUser,'full_name':((fullName.length<25)?fullName:(fullName.substring(0,25)+"...")),'path_jabberit':path_jabberit,'help_expresso':help_expresso,'zIndex_':zIndex++};winRosterDiv.content=Xtools.parse(Xtools.xml("contacts_list"),"contactsList.xsl",paramListContact)} 
    184184else 
     
    322322selectEditable=new SelectEditable();addIcon();setTimeout(function() 
    323323{if(_preferencesIM[0]==='openWindowJabberit:true') 
    324 {if(SnifferBrowser.isCompatible('ie8','firefox3','epiphany2','iceweasel3')) 
     324{if(SnifferBrowser.isCompatible('ie8','firefox3','firefox4','epiphany2','iceweasel3')) 
    325325TrophyIM.load();}},1500);autoStatus();configEvents(document,'onmousemove',autoStatus);configEvents(document,'onkeypress',autoStatus);},2000);}} 
    326326loadIM.prototype.adIcon=addIcon;loadIM.prototype.actionButton=actionButton;loadIM.prototype.addContact=addContact;loadIM.prototype.addNewUser=addNewUser;loadIM.prototype.clrAllContacts=clrAllContacts;loadIM.prototype.configEvents=configEvents;loadIM.prototype.createChatRooms=createChatRooms;loadIM.prototype.disabledNotificationNewUsers=disabledNotificationNewUsers;loadIM.prototype.enabledNotificationNewUsers=enabledNotificationNewUsers;loadIM.prototype.getListRooms=getListRooms;loadIM.prototype.getIsIE=getIsIE;loadIM.prototype.getPhotoUser=getPhotoUser;loadIM.prototype.getSmiles=getSmiles;loadIM.prototype.getStatusUserIM=getStatusUserIM;loadIM.prototype.getStatusMessage=getStatusMessage;loadIM.prototype.getShowContactsOffline=getShowContactsOffline;loadIM.prototype.getUserCurrent=getUserCurrent;loadIM.prototype.getZIndex=getZindex;loadIM.prototype.groupsHidden=groupsHidden;loadIM.prototype.groupsVisible=groupsVisible;loadIM.prototype.joinRoom=joinRoom;loadIM.prototype.keyPressSearch=keyPressSearch;loadIM.prototype.listRooms=listRooms;loadIM.prototype.loginPage=loginPage;loadIM.prototype.notification=notificationNewMessage;loadIM.prototype.parse=parse;loadIM.prototype.preferences=preferences;loadIM.prototype.searchUser=searchUser 
Note: See TracChangeset for help on using the changeset viewer.