Changeset 980 for trunk


Ignore:
Timestamp:
03/21/08 17:16:28 (11 years ago)
Author:
ray
Message:

#30 disabled Xinha.collectGarbageForIE()
#1173 IE8 beta toolbars broken
#1174 IE8 beta no text cursor in wysiwyg
#1175 IE8 beta DomWalk? broken

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Xinha.css

    r951 r980  
    11.htmlarea { background: #fff; } 
    22.htmlarea td { margin:0;padding:0; } 
     3 
     4.htmlarea .toolbarRow { 
     5  width:1px; 
     6} 
    37 
    48.htmlarea .toolbar { 
  • trunk/XinhaCore.js

    r973 r980  
    21492149    editor.registerPlugin('EnterParagraphs'); 
    21502150  } 
     2151  //TEMPORARY FIX FOR IE8 see #1175 
     2152  if (Xinha.ie_version == 8) 
     2153  { 
     2154    this.config.getHtmlMethod = 'TransformInnerHTML'; 
     2155  } 
    21512156 
    21522157  switch (this.config.getHtmlMethod) 
     
    61246129          console.log(prop + ' = ' + o[prop] + '\n'); 
    61256130      } 
    6126       else  
     6131      else 
     6132      { 
    61276133        s += prop + ' = ' + o[prop] + '\n'; 
     6134      } 
     6135 
    61286136    } 
    61296137    if (s)  
    61306138    { 
    6131       var x = window.open("", "debugger"); 
    6132       x.document.write('<pre>' + s + '</pre>'); 
     6139      if (document.getElementById('errors')) 
     6140      { 
     6141        document.getElementById('errors').value += s; 
     6142      } 
     6143      else 
     6144      { 
     6145        var x = window.open("", "debugger"); 
     6146        x.document.write('<pre>' + s + '</pre>'); 
     6147      } 
     6148 
    61336149    } 
    61346150  } 
     
    71347150Xinha.init(); 
    71357151 
    7136 if (Xinha.is_ie) 
     7152if ( Xinha.ie_version < 8 ) 
    71377153{ 
    71387154  Xinha.addDom0Event(window,'unload',Xinha.collectGarbageForIE); 
  • trunk/modules/InternetExplorer/InternetExplorer.js

    r976 r980  
    638638Xinha.getDoctype = function (doc) 
    639639{ 
    640   return (doc.compatMode == "CSS1Compat") ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : ''; 
    641 }; 
     640  return (doc.compatMode == "CSS1Compat" && Xinha.ie_version < 8 ) ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : ''; 
     641}; 
Note: See TracChangeset for help on using the changeset viewer.