Changeset 945


Ignore:
Timestamp:
01/26/08 23:55:05 (7 years ago)
Author:
ray
Message:

#918 mozParaHandler dirty broken for a long time; removed
#988 Javascript do disable inline event handler wrongly checked for Xinha in top frame instead of parent

Location:
trunk
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/XinhaCore.js

    r943 r945  
    21202120 
    21212121  // If this is gecko, set up the paragraph handling now 
    2122   if ( Xinha.is_gecko && ( editor.config.mozParaHandler == 'best' || editor.config.mozParaHandler == 'dirty' ) ) 
    2123   { 
    2124     switch (this.config.mozParaHandler) 
    2125     { 
    2126       case 'dirty': 
    2127         var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerDirty.js'; 
    2128       break; 
    2129       default: 
    2130         var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerBest.js'; 
    2131       break; 
    2132     } 
    2133     if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, ParaHandlerPlugin ) ) 
     2122  if ( Xinha.is_gecko &&  editor.config.mozParaHandler != 'built-in' ) 
     2123  { 
     2124    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, _editor_url + 'modules/Gecko/paraHandlerBest.js' ) ) 
    21342125    { 
    21352126      return false; 
     
    48884879   
    48894880  // remove disabling of inline event handle inside Xinha iframe 
    4890   html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1'); 
     4881  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.parent &amp;&amp; window\.parent\.Xinha\)\{return false\}/gi,'$1'); 
    48914882 
    48924883  // Figure out what our server name is, and how it's referenced 
     
    49494940 
    49504941  // disable inline event handle inside Xinha iframe 
    4951   html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}'); 
     4942  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.parent &amp;&amp; window.parent.Xinha){return false}'); 
    49524943   
    49534944  html = this.inwardSpecialReplacements(html); 
Note: See TracChangeset for help on using the changeset viewer.