X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=jquery.openx.js;h=a2343bb139ec9f6467ef4696f32a3b5318fb80ea;hb=b6ffa68d8d04fa594ea7b11f5e38fea2e89cb991;hp=f5f22532d6a0d57f218426f693a1b3d25c65c278;hpb=95859482ad5fe50bd07fa8510e1168c8ed151d0c;p=openx

diff --git a/jquery.openx.js b/jquery.openx.js
index f5f2253..a2343bb 100644
--- a/jquery.openx.js
+++ b/jquery.openx.js
@@ -29,8 +29,9 @@
 
   count = 0,
   slots = {},
+  min_width = {},
+  max_width = {},
   queue = [],
-  ads = [],
   output = [];
 
 
@@ -86,11 +87,20 @@
    * charset:       string  Charset used, when delivering the banner-codes.
    *                        If empty, the charset is guessed by OpenX. Examples
    *                        for sensible values: "UTF-8", "ISO-8859-1".
+   *
+   *
+   * Other settings:
+   *
+   * selector:      string  A selector for selecting the DOM-elements, that
+   *                        should display ad-banners. DEFAULT: ".oa".
+   *                        See: http://api.jquery.com/category/selectors/
+   * min_prefix:    string  Prefix for the encoding of the minmal width as
+   *                        CSS-classname. DEFAULT: "min_".
+   * max_prefix:    string  Prefix for the encoding of the maximal width as
+   *                        CSS-classname. DEFAULT: "max_".
    */
   $.openx = function( options ) {
 
-    var name, src, errors = [], i;
-
     if (domain) {
       if (console.error) {
         console.error('jQuery.openx was already initialized!');
@@ -105,12 +115,9 @@
 
     _options = options;
 
-    if (!options.server)
-      errors.push('Required option "server" is missing!');
-    if (errors.length > 0) {
+    if (!options.server) {
       if (console.error) {
-        for (i=0; i<errors.length; i++)
-          console.error('Required option "server" is missing!');
+        console.error('Required option "server" is missing!');
         console.log('options: ', options);
       }
       return;
@@ -121,6 +128,9 @@
         'protocol': document.location.protocol,
         'delivery': '/www/delivery',
         'fl': 'fl.js',
+        'selector': '.oa',
+        'min_prefix': 'min_',
+        'max_prefix': 'max_',
         'cache': true
       },
       options
@@ -141,9 +151,6 @@
      */
     $.ajaxSetup({ 'cache': true });
 
-
-    src = domain + settings.delivery + '/spc.php';
-
     /**
      * jQuery.openx only works with "named zones", because it does not know,
      * which zones belong to which website. For mor informations about
@@ -156,20 +163,48 @@
      * template - and does not have to worry about performance penalties due
      * to unnecessarily fetched banners.
      */
-    src += '?zones=';
     for(name in OA_zones) {
-      $('.oa').each(function() {
+      $(settings.selector).each(function() {
         var
-        node = $(this),
-        id;
-        if (node.hasClass(name)) {
+        id,
+        classes,
+        i,
+        min = new RegExp('^' + settings.min_prefix + '([0-9]+)$'),
+        max = new RegExp('^' + settings.max_prefix + '([0-9]+)$'),
+        match;
+        if (this.id === name) {
           id = 'oa_' + ++count;
-          slots[id] = node;
-          queue.push(id);
-          src += escape(id + '=' + OA_zones[name] + "|");
+          slots[id] = this;
+          min_width[id] = 0;
+          max_width[id] = Number.MAX_VALUE;
+          classes = this.className.split(/\s+/);
+          for (i=0; i<classes.length; i++) {
+            match = min.exec(classes[i]);
+            if (match)
+              min_width[id] = match[1];
+            match = max.exec(classes[i]);
+            if (match)
+              max_width[id] = match[1];
+          }
         }
       });
     }
+
+    /** Fetch the JavaScript for Flash and schedule the initial fetch */
+    $.getScript(domain + settings.delivery + '/' + settings.fl, fetch_ads);
+
+  }
+
+  function fetch_ads() {
+
+    var name, src = domain + settings.delivery + '/spc.php';
+
+    /** Order banners for all zones that were found on the page */
+    src += '?zones=';
+    for(id in slots) {
+      queue.push(id);
+      src += escape(id + '=' + OA_zones[slots[id].id] + "|");
+    }
     src += '&nz=1'; // << We want to fetch named zones!
 
     /**
@@ -196,25 +231,20 @@
     if (typeof OA_source !== 'undefined')
       src += "&source=" + escape(OA_source);
 
-    /** Chain-load the scripts (next script to load is fl.js */
-    $.getScript(src, load_flash);
-
-  }
-
-  function load_flash() {
-
-    $.getScript(domain + settings.delivery + '/' + settings.fl, init_ads);
+    /** Fetch data from OpenX and schedule the render-preparation */
+    $.getScript(src, init_ads);
 
   }
 
   function init_ads() {
 
-    var i, id;
+    var i, id, ads = [];
     for (i=0; i<queue.length; i++) {
       id = queue[i];
       if (typeof(OA_output[id]) != 'undefined' && OA_output[id] != '')
         ads.push(id);
     }
+    queue = ads;
 
     document.write = document_write;
     document.writeln = document_write;
@@ -225,12 +255,12 @@
 
   function render_ads() {
 
-    while (ads.length > 0) {
+    while (queue.length > 0) {
 
       var result, src, inline;
 
-      id = ads.shift();
-      node = slots[id];
+      id = queue.shift();
+      node = $(slots[id]);
 
       node.slideDown();
 
@@ -273,7 +303,7 @@
             /** script-tag with src-URL! */
             if (OA_output[id].length > 0)
               /** The banner-code was not rendered completely yet! */
-              ads.unshift(id);
+              queue.unshift(id);
             /** Load the script and halt all work until the script is loaded and executed... */
             $.getScript(result[1], render_ads); // << jQuery.getScript() generates onload-Handler for _all_ browsers ;)
             return;
@@ -300,7 +330,7 @@
     for (var i=0; i<arguments.length; i++)
       output.push(arguments[i]);
 
-    if (id != ads[0])
+    if (id != queue[0])
       /**
        * Re-Add the last banner-code to the working-queue, because included
        * scripts had added markup via document.write(), which is not
@@ -308,7 +338,7 @@
        * Otherwise the added markup would be falsely rendered together with
        * the markup from the following banner-code.
        */
-      ads.unshift(id);
+      queue.unshift(id);
 
   }