Skip to content

Commit

Permalink
Merge pull request #499 from Xpirix/upgrade_jquery
Browse files Browse the repository at this point in the history
Upgrade jquery to 3.7.1
  • Loading branch information
Xpirix authored Jan 8, 2025
2 parents ce9fdb6 + fb90fdd commit bd47195
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion qgis-app/plugins/templates/plugins/plugin_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
});

// Handle URL anchor for tabs
$(window).load(function() {
$(function() {

// Store the current scroll position
var scrollPosition = 0;
Expand Down
2 changes: 1 addition & 1 deletion qgis-app/plugins/templates/plugins/plugin_form.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'plugins/plugin_base.html' %}{% load static i18n %}
{% block extrajs %}
{{ block.super }}
<script src="{% static "js/jquery-1.12.4.min.js" %}" type="text/javascript"></script>
<script src="{% static "js/jquery-3.7.1.min.js" %}" type="text/javascript"></script>
<link rel="stylesheet" media="all" type="text/css" href="{% static "jquery-autosuggest/css/autoSuggest.css" %}">
<link rel="stylesheet" media="all" type="text/css" href="{% static "js/chosen.min.css" %}">
<style type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion qgis-app/static/jquery-ratings/example.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<link type="text/css" rel="stylesheet" href="jquery.ratings.1.0.css" />
<script src="jquery-1.3.2.min.js"></script>
<script src="jquery-3.7.1.min.js"></script>
<script src="jquery.ratings.1.0.js"></script>
<script src="example.js"></script>
</head>
Expand Down
5 changes: 0 additions & 5 deletions qgis-app/static/js/jquery-1.11.1.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions qgis-app/static/js/jquery-1.12.4.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions qgis-app/static/js/jquery-3.7.1.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion qgis-app/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<link rel="shortcut icon" href="{% static "images/favicon.ico" %}"/>

<script type="text/javascript" src="{% static "js/jquery-1.11.1.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/jquery-3.7.1.min.js" %}"></script>
<script type="text/javascript" src="{% static "bootstrap/js/bootstrap-3.4.1.min.js" %}"></script>

<!-- Cookie disclaimer -->
Expand Down

0 comments on commit bd47195

Please sign in to comment.