Changeset 1079

Timestamp:

10/11/08 14:06:27 (2 months ago)

Author:

ray

Message:

* #1301 loading should not fail if plugin omits _pluginInfo
* #1300 create namespace for plugins within Xinha namespace

Files:

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

trunk/XinhaCore.js

@@ -2114 +2114 @@
     return false;
   }
-  else if ( typeof ColorPicker != 'undefined' && !this.plugins['colorPicker']) editor.registerPlugin('ColorPicker');
+  else if ( typeof Xinha.getPluginConstructor('ColorPicker') != 'undefined' && !this.plugins['colorPicker']) editor.registerPlugin('ColorPicker');
 
   var toolbar = editor.config.toolbar;
@@ -2132 +2132 @@
             return false;
           }
-          else if ( typeof InsertImage != 'undefined' && !this.plugins['InsertImage']) editor.registerPlugin('InsertImage');
+          else if ( typeof Xinha.getPluginConstructor('InsertImage') != 'undefined' && !this.plugins['InsertImage']) editor.registerPlugin('InsertImage');
         break;
         case "createlink":
           url = _editor_url + 'modules/CreateLink/link.js';
-          if ( typeof Linker == 'undefined' && !Xinha.loadPlugins([{plugin:"CreateLink",url:url}], function() { editor.generate(); } ))
+          if ( typeof Xinha.getPluginConstructor('Linker') == 'undefined' && !Xinha.loadPlugins([{plugin:"CreateLink",url:url}], function() { editor.generate(); } ))
           {
             return false;
           }
-          else if ( typeof CreateLink != 'undefined' && !this.plugins['CreateLink']) editor.registerPlugin('CreateLink');
+          else if ( typeof Xinha.getPluginConstructor('CreateLink') != 'undefined' && !this.plugins['CreateLink']) editor.registerPlugin('CreateLink');
         break;
         case "inserttable":
@@ -2148 +2148 @@
             return false;
           }
-          else if ( typeof InsertTable != 'undefined' && !this.plugins['InsertTable']) editor.registerPlugin('InsertTable');
+          else if ( typeof Xinha.getPluginConstructor('InsertTable') != 'undefined' && !this.plugins['InsertTable']) editor.registerPlugin('InsertTable');
         break;
       }
@@ -3235 +3235 @@
  *  Category: PLUGINS
  ***************************************************/
-
+/** Plugins may either reside in the golbal scope (not recommended) or in Xinha.plugins. 
+ *  This function looks in both locations and is used to check the loading status and finally retrieve the plugin's constructor
+ * @private
+ * @type {Function|undefined}
+ * @param {String} pluginName
+ */
+Xinha.getPluginConstructor = function(pluginName)
+{
+  return Xinha.plugins[pluginName] || window[pluginName];
+}
 
 /** Create the specified plugin and register it with this Xinha
@@ -3248 +3257 @@
 
   // We can only register plugins that have been succesfully loaded
-  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && typeof window[plugin] == 'undefined') )
+  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && Xinha.getPluginConstructor(plugin) == 'undefined') )
   {
     return false;
@@ -3267 +3276 @@
 Xinha.prototype.registerPlugin2 = function(plugin, args)
 {
-  if ( typeof plugin == "string" && typeof window[plugin] == 'function' )
-  {
-    plugin = window[plugin];
+  if ( typeof plugin == "string" && typeof Xinha.getPluginConstructor(plugin) == 'function' )
+  {
+    var pluginName = plugin;
+    plugin = Xinha.getPluginConstructor(plugin);
   }
   if ( typeof plugin == "undefined" )
@@ -3276 +3286 @@
     return false;
   }
-
+  if (!plugin._pluginInfo) plugin._pluginInfo =  {name:pluginName};
   var obj = new plugin(this, args);
   if ( obj )
@@ -3314 +3324 @@
   if (forceUnsupported ||
       // If the plugin is fully loaded, it's supported status is already set.
-      (window[plugin] && (typeof window[plugin].supported != 'undefined') && !window[plugin].supported))
+      (Xinha.getPluginConstructor(plugin) && (typeof Xinha.getPluginConstructor(plugin).supported != 'undefined') && !Xinha.getPluginConstructor(plugin).supported))
   {
     return _editor_url + "unsupported_plugins/" + plugin ;
@@ -3333 +3343 @@
 
   // Might already be loaded
-  if ( typeof window[pluginName] != 'undefined' )
+  if ( typeof Xinha.getPluginConstructor(pluginName) != 'undefined' )
   {
     if ( callback )
@@ -3404 +3414 @@
     function statusCallback(pluginName)
     {
-      window[pluginName].supported = stage.indexOf('unsupported') != 0;
+      Xinha.getPluginConstructor(pluginName).supported = stage.indexOf('unsupported') != 0;
       callback(pluginName);
     }
@@ -3431 +3441 @@
  */
 Xinha._pluginLoadStatus = {};
-
+/** Stores the paths to plugins that are not in the default location
+ * @private
+ * @type {Object}
+ */
 Xinha.externalPlugins = {};
+/** The namespace for plugins
+ * @private
+ * @type {Object}
+ */
+Xinha.plugins = {};
 
 /** Static function that loads the plugins (see xinha_plugins in NewbieGuide)
@@ -3472 +3490 @@
           Xinha.setLoadingMessage (Xinha._lc("Finishing"));
 
-          if ( typeof window[plugin] != 'undefined' )
+          if ( typeof Xinha.getPluginConstructor(plugin) != 'undefined' )
           {
             Xinha._pluginLoadStatus[plugin] = 'ready';