Changeset 169

Timestamp:

05/18/05 17:25:13 (8 years ago)

Author:

gogo

Message:

Fix to the plugin loading system to prevent spinlocking when a plugin
fails to load.

See #226

Files:

• trunk/htmlarea.js (modified) (5 diffs)

trunk/htmlarea.js

@@ -1691 +1691 @@
         edcellheight  -= parseInt(this.config.panel_dimensions.bottom);
       }
-      this._iframe.style.height   = (edcellheight - this._toolBar.offsetHeight - this._statusBar.offsetHeight) + 'px';
+      this._iframe.style.height   = edcellheight + 'px';
     }
     else
@@ -2081 +2081 @@
 // return the plugin created to allow refresh when necessary
 HTMLArea.prototype.registerPlugin = function() {
+  // We can only register plugins that have been succesfully loaded
+  if
+  (
+    plugin == null
+    || typeof plugin == 'undefined'
+    || (typeof plugin == 'string' && eval('typeof ' + plugin) == 'undefined')
+  ) return false;
+
   var plugin = arguments[0];
   var args = [];
@@ -2126 +2134 @@
     if(callback)
     {
-      callback();
-    }
-    return;
+      callback(pluginName);
+    }
+    return true;
   }
 
@@ -2140 +2148 @@
   if(callback)
   {
-    HTMLArea._loadback(plugin_file, callback);
+    HTMLArea._loadback(plugin_file, function() { callback(pluginName); });
   }
   else
@@ -2146 +2154 @@
     document.write("<script type='text/javascript' src='" + plugin_file + "'></script>");
   }
-};
-
+  return false;
+};
+
+HTMLArea._pluginLoadStatus = { };
 HTMLArea.loadPlugins = function(plugins, callbackIfNotReady)
 {
+  // Rip the ones that are loaded and look for ones that have failed
+  var retVal = true;
   var nuPlugins = HTMLArea.cloneObject(plugins);
-
   while(nuPlugins.length)
   {
-    // Might already be loaded
-    if(eval('typeof ' + nuPlugins[nuPlugins.length-1]) != 'undefined')
-    {
-      nuPlugins.pop();
+    var p = nuPlugins.pop();
+    if(typeof HTMLArea._pluginLoadStatus[p] == 'undefined')
+    {
+      // Load it
+      HTMLArea._pluginLoadStatus[p] = 'loading';
+      HTMLArea.loadPlugin(p,
+          function(plugin)
+          {
+            if(eval('typeof ' + plugin) != 'undefined')
+            {
+              HTMLArea._pluginLoadStatus[plugin] = 'ready';
+            }
+            else
+            {
+              // Actually, this won't happen, because if the script fails
+              // it will throw an exception preventing the callback from
+              // running.  This will leave it always in the "loading" state
+              // unfortunatly that means we can't fail plugins gracefully
+              // by just skipping them.
+              HTMLArea._pluginLoadStatus[plugin] = 'failed';
+            }
+          }
+      );
+      retVal = false;
     }
     else
     {
-      break;
-    }
-  }
-
-  if(!nuPlugins.length)
-  {
-    return true;
-  }
-
-  HTMLArea.loadPlugin
-  (nuPlugins.pop(),
-      function()
-      {
-        if(HTMLArea.loadPlugins(nuPlugins, callbackIfNotReady))
-        {
-          if(typeof callbackIfNotReady == 'function')
-          {
-            callbackIfNotReady();
-          }
-        }
-      }
-  );
-  return false;
+      switch(HTMLArea._pluginLoadStatus[p])
+      {
+        case 'failed':
+        case 'ready' :
+        break;
+
+        case 'loading':
+        default       :
+         document.getElementsByTagName('form').item(0).parentNode.appendChild(document.createTextNode(p));
+         retVal = false;
+         break;
+      }
+    }
+  }
+
+  if(retVal) return true; // All done, just return
+
+  // Waiting on plugins to load, return false now and come back a bit later
+  // if we have to callback
+  if(callbackIfNotReady)
+  {
+    setTimeout(function() { if(HTMLArea.loadPlugins(plugins, callbackIfNotReady)) callbackIfNotReady(); }, 150);
+  }
+  return retVal;
 }