diff options
| author | silverwind <me@silverwind.io> | 2020-01-21 18:32:33 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-21 19:32:33 +0200 |
| commit | 2982afe6b498f9d61bd48407c5408299a1cbbc60 (patch) | |
| tree | 391483c055d7a657968c8da4af63f9908adbcf77 /templates | |
| parent | 0e8b27afe8aaa9055be24f71e8543f2701f18291 (diff) | |
| download | gitea-2982afe6b498f9d61bd48407c5408299a1cbbc60.tar.gz gitea-2982afe6b498f9d61bd48407c5408299a1cbbc60.zip | |
move jquery and jquery-migrate to npm/webpack (#9813)
Currently, this needs to be its own chunk because fomantic depends
on jQuery being present. The next step is to move fomantic to webpack
too after which we can combine the index,fomantic and jquery files into
one.
jquery-migrate is still neccessary because our ancient version of Dropzone
seems to break without it. I imagine it can be removed after a Dropzone
upgrade.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/footer.tmpl | 5 | ||||
| -rw-r--r-- | templates/pwa/serviceworker_js.tmpl | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 94122e4b23..f59b34a983 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,8 +12,7 @@ {{template "base/footer_content" .}} - <script src="{{StaticUrlPrefix}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1"></script> - <script src="{{StaticUrlPrefix}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1"></script> + <script src="{{StaticUrlPrefix}}/js/jquery.js?v={{MD5 AppVer}}"></script> <script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js"></script> {{if .RequireSimpleMDE}} <script src="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js"></script> @@ -115,8 +114,6 @@ <script src="{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.custom.js"></script> <script src="{{StaticUrlPrefix}}/vendor/plugins/clipboard/clipboard.min.js"></script> <script src="{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js"></script> - - <!-- JavaScript --> <script src="{{StaticUrlPrefix}}/fomantic/semantic.min.js?v={{MD5 AppVer}}"></script> <script src="{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script> {{if .EnableHeatmap}} diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl index 04b4f451c4..0f92270b55 100644 --- a/templates/pwa/serviceworker_js.tmpl +++ b/templates/pwa/serviceworker_js.tmpl @@ -2,12 +2,11 @@ var STATIC_CACHE = 'static-cache-v1'; var urlsToCache = [ // js '{{StaticUrlPrefix}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js', - '{{StaticUrlPrefix}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1', - '{{StaticUrlPrefix}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1', '{{StaticUrlPrefix}}/fomantic/semantic.min.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/gitgraph.js?v={{MD5 AppVer}}', + '{{StaticUrlPrefix}}/js/jquery.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/vendor/plugins/clipboard/clipboard.min.js', '{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js', '{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.custom.js', |