Init broadcast + Piwik_Overlay after document is ready so angular app is available.

2 files changed, 10 insertions, 5 deletions

diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
index 0930180ca6..224758534b 100644
--- a/plugins/Overlay/javascripts/Piwik_Overlay.js
+++ b/plugins/Overlay/javascripts/Piwik_Overlay.js
@@ -170,6 +170,8 @@ var Piwik_Overlay = (function () {
 
             // handle hash change
             broadcast.loadAjaxContent = hashChangeCallback;
+
+            broadcast._isInit = false;
             broadcast.init();
 
             if (window.location.href.split('#').length == 1) {
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 7c400b9e57..a5ab981c05 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -63,11 +63,14 @@
     </div>
 
     <script type="text/javascript">
-        var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
-        Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
+        broadcast._isInit = true;
+        $(function () {
+            var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
+            Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
 
-        Piwik_Overlay_Translations = {
-            domain: "{{ 'Overlay_Domain'|translate }}"
-        };
+            window.Piwik_Overlay_Translations = {
+                domain: "{{ 'Overlay_Domain'|translate }}"
+            };
+        });
     </script>
 {% endblock %}