Changeset 6221

Show
Ignore:
Timestamp:
07/30/08 21:43:05 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 6220 via svnmerge from re #2854
http://svn.freepbx.org/freepbx/trunk

........

r6220 | p_lindheimer | 2008-07-30 18:41:38 -0700 (Wed, 30 Jul 2008) | 1 line


fixes #2854 select boxes disapearing on ie7 - could use some verification that IE6 still works

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/branches/2.4

    • Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838,5965,5974,6045,6056,6144,6215 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773,5779,5782,5819,5827,5836,5838,5965,5974,6045,6056,6144,6215,6220
  • freepbx/branches/2.4/amp_conf/htdocs/admin/common/libfreepbx.javascripts.js

    r5095 r6221  
    11 
    2 Is_DOM=(document.getElementById)?true:false;Is_NS4=(document.layers)?true:false;Is_IE=(document.all)?true:false;var detect=navigator.userAgent.toLowerCase();if(checkIt('konqueror')) 
     2Is_DOM=(document.getElementById)?true:false;Is_NS4=(document.layers)?true:false;Is_IE=(document.all)?true:false;Is_IE7=Is_IE&&window.XMLHttpRequest?true:false;var detect=navigator.userAgent.toLowerCase();if(checkIt('konqueror')) 
    33Is_IE=false;function checkIt(string) 
    44{place=detect.indexOf(string)+1;thestring=string;return place;} 
     
    2424{hideSelects(false);} 
    2525function setAllInfoToHideSelects() 
    26 {if(Is_IE
     26{if(Is_IE&&!Is_IE7
    2727{var allelems=document.all.tags('A');if(allelems!=null) 
    2828{var i,elem;for(i=0;elem=allelems[i];i++) 
  • freepbx/branches/2.4/amp_conf/htdocs/admin/common/script.legacy.js

    r5095 r6221  
    66Is_NS4 = (document.layers) ? true : false; 
    77Is_IE = (document.all) ? true : false; 
     8Is_IE7 = Is_IE && window.XMLHttpRequest ? true : false; 
    89 
    910// detect for konqueror, taken from 
     
    8384function setAllInfoToHideSelects() 
    8485{ 
    85       if (Is_IE
     86      if (Is_IE && !Is_IE7
    8687      { 
    8788              var allelems = document.all.tags('A');