Changeset 1059

Timestamp:

10/04/08 13:21:02 (2 months ago)

Author:

ray

Message:

#1292 change naming scheme of plugin files

Files:

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

trunk/XinhaCore.js

@@ -3331 +3331 @@
     return true;
   }
-
+/*
   if(!plugin_file)
   {
@@ -3338 +3338 @@
     plugin_file = dir + "/" + plugin;
   }
+*/
   
   Xinha._loadback(plugin_file, callback ? function() { callback(pluginName); } : null);
@@ -3374 +3375 @@
   var retVal = true;
   var nuPlugins = Xinha.cloneObject(plugins);
-
-  while ( nuPlugins.length )
-  {
-    var p = nuPlugins.pop();
+  for ( var i=0;i<nuPlugins.length;i++ )
+  {
+    var p = nuPlugins[i];
+
+    if (Xinha.externalPlugins[p])
+    {
+      url = Xinha.externalPlugins[p][0]+Xinha.externalPlugins[p][1];
+    }
+    else
+    {
+      var dir = this.getPluginDir(p);
+      var file = p + ".js";
+      url = dir + "/" + file;
+
+      if (typeof Xinha._pluginLoadStatus[p] == 'undefined')
+      {
+        if (!Xinha.ping(dir + "/" + file))
+        {
+          file = p.replace(/([a-z])([A-Z])([a-z])/g, function (str, l1, l2, l3) { return l1 + "-" + l2.toLowerCase() + l3; }).toLowerCase() + ".js";
+          if (Xinha.ping(dir + "/" + file))
+          {
+            url = dir + "/" + file;
+            Xinha.externalPlugins[p] = [dir,'/'+ file];
+            Xinha.debugMsg('You use an obsolete naming scheme for the Xinha plugin '+p+'. Please rename '+file+' to '+p+'.js' );
+          }
+          else
+          {
+            Xinha.debugMsg('Xinha was not able to find the plugin file '+url+'. Please make sure the plugin exist.')
+            Xinha._pluginLoadStatus[p] = 'failed';
+            continue;
+          }
+        }
+      }
+    }
+
     if (p == 'FullScreen' && !Xinha.externalPlugins['FullScreen'] ) continue; //prevent trying to load FullScreen plugin from the plugins folder
    
-    if ( typeof Xinha._pluginLoadStatus[p] == 'undefined' )
+    if ( typeof Xinha._pluginLoadStatus[p] == 'undefined' && typeof window[p] == 'undefined')
     {
       // Load it
@@ -3387 +3419 @@
         function(plugin)
         {
+          Xinha.setLoadingMessage (Xinha._lc("Finishing"));
           if ( typeof window[plugin] != 'undefined' )
           {
@@ -3400 +3433 @@
             Xinha._pluginLoadStatus[plugin] = 'failed';
           }
-        },(Xinha.externalPlugins[p] ? Xinha.externalPlugins[p][0]+Xinha.externalPlugins[p][1] : url)
+        }, url
       );
       retVal = false;
@@ -3435 +3468 @@
   if ( callbackIfNotReady )
   {
-    setTimeout(function() { if ( Xinha.loadPlugins(plugins, callbackIfNotReady) ) { callbackIfNotReady(); } }, 150);
+    setTimeout(function() { if ( Xinha.loadPlugins(plugins, callbackIfNotReady) ) { callbackIfNotReady(); } }, 50);
   }
   return retVal;
@@ -6219 +6252 @@
     return '';
   }
-
+};
+Xinha.ping = function(url)
+{
+  var req = null;
+  req = Xinha.getXMLHTTPRequestObject();
+
+  // Synchronous!
+  req.open('HEAD', url, false);
+  req.send(null);
+  if ( req.status >= 400  )
+  {
+    return false;
+  }
+  else
+  {
+    return true;
+  }
 };
 
@@ -7262 +7311 @@
   Xinha.addDom0Event(window,'unload',Xinha.collectGarbageForIE);
 }
+Xinha.debugMsg = function(text)
+{
+  if (typeof console != 'undefined' && typeof console.log == 'function') console.log(text);
+}
 Xinha.notImplemented = function(methodName) 
 {