X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=jquery.openx.js;h=f156ba5aac65cd8c2a410288fbf3c9d764806e27;hb=9b00ed74c64f696a03334e59364ac6341ce1627a;hp=66d91cb5e3717bd5cb1740706a9d60a6f93f3288;hpb=2ecb24dcf0f59b9ea7f016bc0e24b92fa2dc4d9f;p=openx

diff --git a/jquery.openx.js b/jquery.openx.js
index 66d91cb..f156ba5 100644
--- a/jquery.openx.js
+++ b/jquery.openx.js
@@ -25,7 +25,7 @@
 
   var
 
-  settings, domain, id, node,
+  settings, _zones, _options, domain, id, node,
 
   count = 0,
   slots = {},
@@ -36,16 +36,34 @@
 
   $.openx = function( zones, options ) {
 
+    var name, src, errors = [], i;
+
     if (domain) {
-      if (console.error)
+      if (console.error) {
         console.error('jQuery.openx was already initialized!');
+        console.log('Configured zones: ', _zones);
+        console.log('Configured options: ', _options);
+      }
+      return;
+    }
+
+    _zones = zones;
+    _options = options;
+
+    if (!options.server)
+      errors.push('Required option "server" is missing!');
+    if (errors.length > 0) {
+      if (console.error) {
+        for (i=0; i<errors.length; i++)
+          console.error('Required option "server" is missing!');
+        console.log('options: ', options);
+      }
       return;
     }
 
     settings = $.extend(
       {
-        'protocol': document.location.protocol,
-        'server': 'localhost'
+        'protocol': document.location.protocol
       },
       options
       );
@@ -57,10 +75,6 @@
     if (settings.protocol === 'https:' && settings.https_port)
       domain += ':' + settings.https_port;
 
-    var
-    name,
-    src = domain;
-
     /**
      * Without this option, jQuery appends an timestamp to every URL, that
      * is fetched via $.getScript(). This can mess up badly written
@@ -69,7 +83,7 @@
      */
     $.ajaxSetup({ cache: true });
 
-    src += "/www/delivery/spc.php?zones=";
+    src = domain + '/www/delivery/spc.php?zones=';
 
     /** Only fetch banners, that are really included in this page */
     for(name in zones) {