feat: Restructure scripts
- Combine app.js and functions.js - Rename functions.js to app.js - Rename variables.js to globals.js - Remove global.js and add setup call to screen template - Use local jquery in old templates
This commit is contained in:
parent
496b6e37d8
commit
b79edd4858
8 changed files with 243 additions and 242 deletions
|
|
@ -15,5 +15,5 @@
|
|||
|
||||
{% block script %}
|
||||
{{ super() }}
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<script src="/vendor/jquery.min.js"></script>
|
||||
{% endblock %}
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
{% block body %}{% endblock %}
|
||||
|
||||
{% block script %}
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<script src="{{ pageBase }}js/variables.js"></script>
|
||||
<script src="/vendor/jquery.min.js"></script>
|
||||
<script src="{{ pageBase }}js/globals.js"></script>
|
||||
<script src="{{ pageBase }}js/app.js"></script>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@
|
|||
{% block script %}
|
||||
{{ log.log('BODY :: Loading script assets...') }}
|
||||
{# <script src="{{ pageBase }}js/{{hippie.jsFile}}.min.js" type="text/javascript"></script> #}
|
||||
<!-- build:js js/main.concat.min.js -->
|
||||
{# // TODO: Remove dependecy to jQuery; at least maek it optional #}
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<script src="{{ pageBase }}js/variables.js"></script>
|
||||
<script src="{{ pageBase }}js/functions.js"></script>
|
||||
<script src="{{ pageBase }}js/global.js"></script>
|
||||
<script src="/vendor/jquery.min.js"></script>
|
||||
<script src="{{ pageBase }}js/globals.js"></script>
|
||||
<script src="{{ pageBase }}js/app.js"></script>
|
||||
<script>
|
||||
// Create instances of objects made by contructor functions
|
||||
// Setup global things for all screens
|
||||
setup();
|
||||
|
||||
// Create instances of objects made by constructor functions
|
||||
let scrollUi = new HippieScroll($('.js_scrolltop'), $('.js_scrolldown'));
|
||||
let helpUi = new HippieMeta($('.js_showmeta'), $('.js_pop'));
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
{% block script %}
|
||||
{{ block.super -}}
|
||||
<script src="/vendor/jquery.min.js"></script>
|
||||
<script src="{{ pageBase }}js/variables.js"></script>
|
||||
<script src="{{ pageBase }}js/globals.js"></script>
|
||||
<script src="{{ pageBase }}js/app.js"></script>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue