From: Kai Moritz <kai@coolibri.de>
Date: Tue, 25 Sep 2012 15:04:12 +0000 (+0200)
Subject: Another fix to the render-order, for from document.write() collected output
X-Git-Tag: 0.1.0~8
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=125e70f94f5f64ffbb47305665f4f23488aa30f5;p=openx

Another fix to the render-order, for from document.write() collected output

If inline-code was executed directly via jQuery.globalEval(), the
collected output from calls to document.write() was not written
emidiately. Because of that, the ordering of the rendered output was
messed up.
---

diff --git a/openx.js b/openx.js
index 3499345..579b16f 100644
--- a/openx.js
+++ b/openx.js
@@ -87,13 +87,7 @@
        * If output was added via document.write(), this output must be
        * rendered before other banner-code from the OpenX-server is rendered!
        */
-      if (output.length > 0) {
-        output.push(OA_output[id]);
-        OA_output[id] = "";
-        for (i=0; i<output.length; i++)
-          OA_output[id] += output[i];
-        output = [];
-      }
+      insert_output();
 
       while ((result = /<script/i.exec(OA_output[id])) != null) {
         node.append(OA_output[id].slice(0,result.index));
@@ -120,6 +114,7 @@
               inline = inline.slice(result[0].length,inline.length);
             }
             $.globalEval(inline);
+            insert_output(); // << The executed inline-code might have called document.write()!
           }
           else {
             /** script-tag with src-URL! */
@@ -141,6 +136,7 @@
     node = undefined;
   }
 
+  /** This function is used to overwrite document.write and document.writeln */
   function document_write() {
 
     for (var i=0; i<arguments.length; i++)
@@ -158,6 +154,22 @@
 
   }
 
+  /**
+   * This function prepends the collected output from calls to
+   * document_write() to the current banner-code.
+   */
+  function insert_output() {
+
+    if (output.length > 0) {
+      output.push(OA_output[id]);
+      OA_output[id] = "";
+      for (i=0; i<output.length; i++)
+        OA_output[id] += output[i];
+      output = [];
+    }
+
+  }
+
 } ( window.openx = window.openx || {}, jQuery ));
 
 var OA_output = {}; // << Needed, because IE will complain loudly otherwise!