Skip to content

Commit ebb219b

Browse files
authored
Refactor assets loading (#3295)
2 parents e25554d + 1acb805 commit ebb219b

25 files changed

+100
-103
lines changed

gravity.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
2727
<button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
2828
<pre id="output" style="width: 100%; height: 100%;" hidden></pre>
2929

30-
<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
30+
<script defer src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
3131
<? mg.include('scripts/lua/footer.lp','r')?>

groups-clients.lp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9595
</div>
9696
</div>
9797

98-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102-
<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102+
<script defer src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
103103

104104
<? mg.include('scripts/lua/footer.lp','r')?>

groups-domains.lp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
156156
</div>
157157
</div>
158158

159-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162-
<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
159+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162+
<script defer src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
163163

164164
<? mg.include('scripts/lua/footer.lp','r')?>

groups-lists.lp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9494
</div>
9595
</div>
9696

97-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
97+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
101101

102102
<? mg.include('scripts/lua/footer.lp','r')?>

groups.lp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
7979
</div>
8080
</div>
8181

82-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85-
<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
82+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85+
<script defer src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
8686

8787
<? mg.include('scripts/lua/footer.lp','r')?>

index.lp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
279279
</div>
280280
<!-- /.row -->
281281

282-
<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
283-
<script src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
282+
<script defer src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
283+
<script defer src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
284284

285285
<? mg.include('scripts/lua/footer.lp','r')?>

interfaces.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
3232

3333
<pre id="output" style="width: 100%; height: 100%;" hidden></pre>
3434

35-
<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
35+
<script defer src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
3636
<? mg.include('scripts/lua/footer.lp','r')?>

login.lp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ mg.include('scripts/lua/header.lp','r')
117117
<strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
118118
</div>
119119
</div>
120-
<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
121-
<script src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
120+
<script defer src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
121+
<script defer src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
122122
</body>
123123
</html>

messages.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ mg.include('scripts/lua/header_authenticated.lp','r')
4141
</div>
4242
</div>
4343

44-
<script src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
44+
<script defer src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
4545

4646
<? mg.include('scripts/lua/footer.lp','r')?>

network.lp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
6464
</div>
6565
<!-- /.row -->
6666

67-
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
68-
<script src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
67+
<script defer src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
68+
<script defer src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
6969

7070
<? mg.include('scripts/lua/footer.lp','r')?>

0 commit comments

Comments
 (0)