Changeset 1071

Timestamp:

10/07/08 11:42:23 (2 months ago)

Author:

ray

Message:

* fix repeated calls for registerPlugin() in module loading
* remove temporary fix for IE8, issue is resolved in beta2 (#1175)

Files:

• trunk/XinhaCore.js (modified) (15 diffs)

trunk/XinhaCore.js

@@ -2062 +2062 @@
       return false;
     }
-    editor._browserSpecificPlugin = editor.registerPlugin('InternetExplorer');
+    if (!this.plugins['InternetExplorer']) editor._browserSpecificPlugin = editor.registerPlugin('InternetExplorer');
   }
   else if (Xinha.is_webkit)
@@ -2072 +2072 @@
       return false;
     }
-    editor._browserSpecificPlugin = editor.registerPlugin('WebKit');
+    if (!this.plugins['Webkit']) editor._browserSpecificPlugin = editor.registerPlugin('WebKit');
   }
   else if (Xinha.is_opera)
@@ -2081 +2081 @@
       return false;
     }
-    editor._browserSpecificPlugin = editor.registerPlugin('Opera');
+    if (!this.plugins['Opera']) editor._browserSpecificPlugin = editor.registerPlugin('Opera');
   }
   else if (Xinha.is_gecko)
@@ -2090 +2090 @@
       return false;
     }
-    editor._browserSpecificPlugin = editor.registerPlugin('Gecko');
+    if (!this.plugins['Gecko']) editor._browserSpecificPlugin = editor.registerPlugin('Gecko');
   }
 
@@ -2114 +2114 @@
     return false;
   }
-  else if ( typeof ColorPicker != 'undefined') editor.registerPlugin('ColorPicker');
+  else if ( typeof ColorPicker != 'undefined' && !this.plugins['colorPicker']) editor.registerPlugin('ColorPicker');
 
   var toolbar = editor.config.toolbar;
@@ -2124 +2124 @@
       {
         case "popupeditor":
-          editor.registerPlugin('FullScreen');
+          if (!this.plugins['FullScreen']) editor.registerPlugin('FullScreen');
         break;
         case "insertimage":
@@ -2132 +2132 @@
             return false;
           }
-          else if ( typeof InsertImage != 'undefined') editor.registerPlugin('InsertImage');
+          else if ( typeof InsertImage != 'undefined' && !this.plugins['InsertImage']) editor.registerPlugin('InsertImage');
         break;
         case "createlink":
@@ -2140 +2140 @@
             return false;
           }
-          else if ( typeof CreateLink != 'undefined') editor.registerPlugin('CreateLink');
+          else if ( typeof CreateLink != 'undefined' && !this.plugins['CreateLink']) editor.registerPlugin('CreateLink');
         break;
         case "inserttable":
@@ -2148 +2148 @@
             return false;
           }
-          else if ( typeof InsertTable != 'undefined') editor.registerPlugin('InsertTable');
+          else if ( typeof InsertTable != 'undefined' && !this.plugins['InsertTable']) editor.registerPlugin('InsertTable');
         break;
       }
@@ -2161 +2161 @@
       return false;
     }
-    editor.registerPlugin('EnterParagraphs');
-  }
-  //TEMPORARY FIX FOR IE8 see #1175
-  if (Xinha.ie_version == 8)
-  {
-    this.config.getHtmlMethod = 'TransformInnerHTML';
+    if (!this.plugins['EnterParagraphs']) editor.registerPlugin('EnterParagraphs');
   }
 
@@ -2183 +2178 @@
     return false;        
   }
-  else editor.registerPlugin('GetHtmlImplementation');
+  else if (!this.plugins['GetHtmlImplementation']) editor.registerPlugin('GetHtmlImplementation');
   
   // create the editor framework, yah, table layout I know, but much easier
@@ -3248 +3243 @@
     return false;
   }
-
   var args = [];
   for ( var i = 1; i < arguments.length; ++i )
@@ -3273 +3267 @@
     return false;
   }
+
   var obj = new plugin(this, args);
   if ( obj )
@@ -3289 +3284 @@
   else
   {
-    alert("Can't register plugin " + plugin.toString() + ".");
+    Xinha.debugMsg("Can't register plugin " + plugin.toString() + ".", 'warn');
   }
 };
@@ -5703 +5698 @@
 Xinha.htmlEncode = function(str)
 {
+  if (!str) return '';
   if ( typeof str.replace == 'undefined' )
   {