Merge pull request #22 from frontier-sh/master

Handling injection after domready event
icehouse-ventures · Sep 14, 2024 · ea56302 · ea56302
2 parents 89c89b7 + 2eb8e5b
commit ea56302
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/resources/views/chart-template.blade.php b/src/resources/views/chart-template.blade.php
@@ -65,20 +65,26 @@
 @endonce
 
 <canvas id="{!! $element !!}" width="{!! $size['width'] !!}" height="{!! $size['height'] !!}">
-<script>
-    document.addEventListener("DOMContentLoaded", function(event) {
+    <script>
         (function() {
-    		"use strict";
-            var ctx = document.getElementById("{!! $element !!}");
-            window.{!! $element !!} = new Chart(ctx, {
-                type: @js($type),
-                data: {
-                    labels: {!! $labels !!},
-                    datasets: {!! $datasets !!}
-                },
-                options: {!! $options !!}
-            });
+            var init = function() {
+                "use strict";
+                var ctx = document.getElementById("{!! $element !!}");
+                window.{!! $element !!} = new Chart(ctx, {
+                    type: @js($type),
+                    data: {
+                        labels: {!! $labels !!},
+                        datasets: {!! $datasets !!}
+                    },
+                    options: {!! $options !!}
+                });
+            };
+    
+            if (document.readyState !== 'loading') {
+                init();
+            } else {
+                document.addEventListener("DOMContentLoaded", init);
+            }
         })();
-    });
-</script>
+    </script>
 </canvas>