From fe62abc4d3b41d1b38146ff35a077ad2fe7145d1 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 25 Apr 2016 11:53:33 +0300
Subject: [PATCH] =?UTF-8?q?1240:=20=D1=80=D1=8D=D0=BD=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B3=20=D1=80=D0=B5=D0=BA=D0=BB=D0=B0=D0=BC=D1=8B?=
 =?UTF-8?q?=20added=20custom=20dom=20insert=20event=20for=20top.js=20and?=
 =?UTF-8?q?=20banners.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/client/js/rejs/banners.js |  7 +++----
 static/client/js/rejs/tops.js    | 13 -------------
 templates/client/blank.html      | 11 +++++++++++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/static/client/js/rejs/banners.js b/static/client/js/rejs/banners.js
index 51df677e..c331d6ed 100644
--- a/static/client/js/rejs/banners.js
+++ b/static/client/js/rejs/banners.js
@@ -54,9 +54,8 @@
         xhr.onreadystatechange = function (event) {
             if (event.target.readyState === 4) {
                 if (event.target.status === 200) {
-                    if (document.readyState === "loading") {
-                        console.info('setting DOMContentLoaded event listener');
-                        document.addEventListener("DOMContentLoaded", function() {
+                    if (document.readyState === "loading" && !window.marker_DOMbannersjsElementInserted) {
+                        document.addEventListener("DOMbannersjsElementInserted", function() {
                             runCallback(callback, event.target.responseText);
                         });
                     } else {
@@ -121,7 +120,7 @@
         getBanners(getUrl(), insertBanners);
     };
 
-    // window.addEventListener("load", main);
     main();
+    // window.addEventListener("load", main);
     // document.addEventListener("DOMContentLoaded", main);
 })();
diff --git a/static/client/js/rejs/tops.js b/static/client/js/rejs/tops.js
index f62fe629..465744f0 100644
--- a/static/client/js/rejs/tops.js
+++ b/static/client/js/rejs/tops.js
@@ -83,18 +83,5 @@
     // main();
     // window.addEventListener("load", main);
     // document.addEventListener("DOMContentLoaded", main);
-    document.addEventListener("DOMtopjsElementInserted", function() {
-        console.info("DOMtopjsElementInserted fired");
-        window.marker_DOMtopjsElementInserted = true
-    });
-    // Listen for the event.
-
     main();
-
-    // function ready() {
-    // console.info( 'DOM готов' );
-    // // alert( "Размеры картинки: " + img.offsetWidth + "x" + img.offsetHeight );
-    // }
-
-    // document.addEventListener("DOMContentLoaded", ready);
 })();
diff --git a/templates/client/blank.html b/templates/client/blank.html
index a4df0c0d..6aa9af84 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -59,6 +59,17 @@ This template include basic anf main styles and js files,
             "tag": "{{ tag }}"
         };
     </script>
+    <script>
+    (function() {
+      var DOMbannersjsElementInserted = new Event('DOMbannersjsElementInserted');
+      window.DOMbannersjsElementInserted = DOMbannersjsElementInserted;
+      window.marker_DOMbannersjsElementInserted = window.marker_DOMbannersjsElementInserted || false;
+      document.addEventListener("DOMbannersjsElementInserted", function() {
+          // console.info("DOMbannersjsElementInserted fired");
+          window.marker_DOMtopjsElementInserted = true
+      });
+    })();
+    </script>
     <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}" async></script>
 
 	{% if request.GET.debug == '1' %}