Changeset 945

Timestamp:

01/26/08 23:55:05 (5 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:

• XinhaCore.js (modified) (3 diffs)
• modules/Gecko/paraHandlerDirty.js (deleted)

trunk/XinhaCore.js

@@ -2120 +2120 @@
 
   // If this is gecko, set up the paragraph handling now
-  if ( Xinha.is_gecko && ( editor.config.mozParaHandler == 'best' || editor.config.mozParaHandler == 'dirty' ) )
-  {
-    switch (this.config.mozParaHandler)
-    {
-      case 'dirty':
-        var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerDirty.js';
-      break;
-      default:
-        var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerBest.js';
-      break;
-    }
-    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, ParaHandlerPlugin ) )
+  if ( Xinha.is_gecko &&  editor.config.mozParaHandler != 'built-in' )
+  {
+    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, _editor_url + 'modules/Gecko/paraHandlerBest.js' ) )
     {
       return false;
@@ -4888 +4879 @@
   
   // remove disabling of inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.parent &amp;&amp; window\.parent\.Xinha\)\{return false\}/gi,'$1');
 
   // Figure out what our server name is, and how it's referenced
@@ -4949 +4940 @@
 
   // disable inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.parent &amp;&amp; window.parent.Xinha){return false}');
   
   html = this.inwardSpecialReplacements(html);