diff --git a/static/client/js/rejs/tops.js b/static/client/js/rejs/tops.js index 64460e87..57a8fdab 100644 --- a/static/client/js/rejs/tops.js +++ b/static/client/js/rejs/tops.js @@ -51,9 +51,12 @@ if (event.target.readyState === 4) { if (event.target.status === 200) { console.info(document.readyState); - if (document.readyState === "loading") { - console.info('setting DOMContentLoaded event listener'); - document.addEventListener("DOMContentLoaded", function() { + if (document.readyState === "loading" && !window.marker_DOMtopjsElementInserted) { + // console.info('setting DOMContentLoaded event listener'); + console.info('setting DOMtopjsElementInserted event listener'); + // document.addEventListener("DOMContentLoaded", function() { + + document.addEventListener("DOMtopjsElementInserted", function() { runCallback(callback, event.target.responseText); }); } else { @@ -80,6 +83,14 @@ // main(); // window.addEventListener("load", main); // document.addEventListener("DOMContentLoaded", main); + var DOMtopjsElementInserted = new Event('DOMtopjsElementInserted'); + window.marker_DOMtopjsElementInserted = window.marker_DOMtopjsElementInserted || false; + document.addEventListener("DOMtopjsElementInserted", function() { + console.info("DOMtopjsElementInserted fired"); + window.marker_DOMtopjsElementInserted = true + }); + // Listen for the event. + main(); // function ready() { diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html index 2a06db05..6769930e 100644 --- a/templates/client/accounts/feed.html +++ b/templates/client/accounts/feed.html @@ -15,6 +15,16 @@ {% endblock %} {% if object_list %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/accounts/user_events.html b/templates/client/accounts/user_events.html index 13401e66..cb566028 100644 --- a/templates/client/accounts/user_events.html +++ b/templates/client/accounts/user_events.html @@ -19,6 +19,16 @@ {% if object_list %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/city/city.html b/templates/client/city/city.html index 59d22b80..022d4e6e 100644 --- a/templates/client/city/city.html +++ b/templates/client/city/city.html @@ -14,6 +14,16 @@ {% if object.get_events %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/country/country.html b/templates/client/country/country.html index 823db3fc..0eff29f3 100644 --- a/templates/client/country/country.html +++ b/templates/client/country/country.html @@ -14,6 +14,16 @@ {% if object.get_events %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/exposition/catalog.html b/templates/client/exposition/catalog.html index a10df870..30ccf0b7 100644 --- a/templates/client/exposition/catalog.html +++ b/templates/client/exposition/catalog.html @@ -23,6 +23,16 @@ {% if object_list %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/exposition/catalog_theme.html b/templates/client/exposition/catalog_theme.html index 5ee63b23..3cb16c47 100644 --- a/templates/client/exposition/catalog_theme.html +++ b/templates/client/exposition/catalog_theme.html @@ -5,6 +5,17 @@ {% if object_list %} {% block head_scripts %} + {% endblock head_scripts %} {% endif %} diff --git a/templates/client/includes/banners/tops.html b/templates/client/includes/banners/tops.html index 3a496741..731ccd0e 100644 --- a/templates/client/includes/banners/tops.html +++ b/templates/client/includes/banners/tops.html @@ -1 +1,15 @@
+ +