jmplace/ScoDoc-Lille
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade jQuery to 3.7.1. (#943)

Browse Source
This commit is contained in:
Emmanuel Viennet 2024-07-28 19:15:51 +02:00
parent f6897a2c12
commit 77adda5c90
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/scodoc/html_sco_header.py
View File

@ -97,19 +97,10 @@ _HTML_BEGIN = f"""<!DOCTYPE html>
<link href="{scu.STATIC_DIR}/css/gt_table.css" rel="stylesheet" type="text/css" /> <link href="{scu.STATIC_DIR}/css/gt_table.css" rel="stylesheet" type="text/css" />
<script src="{scu.STATIC_DIR}/libjs/menu.js"></script> <script src="{scu.STATIC_DIR}/libjs/menu.js"></script>
<script src="{scu.STATIC_DIR}/libjs/bubble.js"></script> <script src="{scu.STATIC_DIR}/libjs/bubble.js"></script>
<script>
window.onload=function(){{
if (document.getElementById('gtrcontent')) {{
enableTooltips("gtrcontent");
}}
if (document.getElementById('sidebar')) {{
enableTooltips("sidebar");
}}
}};
</script>
<script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script> <script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script>
<script src="{scu.STATIC_DIR}/jQuery/jquery-migrate-1.2.0.min.js"></script> <script src="{scu.STATIC_DIR}/jQuery/jquery-migrate-3.5.2.min.js"></script>
<script src="{scu.STATIC_DIR}/libjs/jquery.field.min.js"></script> <script src="{scu.STATIC_DIR}/libjs/jquery.field.min.js"></script>
<script src="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script> <script src="{scu.STATIC_DIR}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
@ -126,6 +117,17 @@ _HTML_BEGIN = f"""<!DOCTYPE html>
<script src="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script> <script src="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
<link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" /> <link type="text/css" rel="stylesheet" href="{scu.STATIC_DIR}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
<script>
document.addEventListener('DOMContentLoaded', function() {{
if (document.getElementById('gtrcontent')) {{
enableTooltips("gtrcontent");
}}
if (document.getElementById('sidebar')) {{
enableTooltips("sidebar");
}}
}});
</script>
""" """

2
app/static/jQuery/jquery.js vendored
View File

@ -1 +1 @@
jquery-1.12.4.min.js jquery-3.7.1.min.js

11
app/static/libjs/menu.js
View File

@ -1,12 +1,13 @@
/* -*- mode: javascript -*- /* -*- mode: javascript -*-
* Legacy code used by old group editor. To be removed.
*/ */
function getMouseXY(e) // works on IE6,FF,Moz,Opera7 function getMouseXY(e) // works on IE6,FF,Moz,Opera7
{ {
if (!e) e = window.event; // works on IE, but not NS (we rely on NS passing us the event) if (!e) e = window.event; // works on IE, but not NS (we rely on NS passing us the event)
if (e) if (e)
{ {
if (e.pageY) if (e.pageY)
{ // this doesn't work on IE6!! (works on FF,Moz,Opera7) { // this doesn't work on IE6!! (works on FF,Moz,Opera7)
mousey = e.pageY; mousey = e.pageY;
@ -15,11 +16,11 @@ function getMouseXY(e) // works on IE6,FF,Moz,Opera7
} }
else if (e.clientY) else if (e.clientY)
{ // works on IE6,FF,Moz,Opera7 { // works on IE6,FF,Moz,Opera7
if ( document.documentElement && document.documentElement.scrollTop ) if ( document.documentElement && document.documentElement.scrollTop )
{ {
mousey = e.clientY + document.documentElement.scrollTop; mousey = e.clientY + document.documentElement.scrollTop;
} }
else else
{ {
mousey = e.clientY + document.body.scrollTop; mousey = e.clientY + document.body.scrollTop;
@ -53,7 +54,7 @@ function MenuDisplay(l_element)
l_element.childNodes[1].style.top = - l_element.childNodes[1].offsetHeight + 'px' ; l_element.childNodes[1].style.top = - l_element.childNodes[1].offsetHeight + 'px' ;
} }
} }
function MenuHide(l_element) function MenuHide(l_element)
{ {
if ( ! menu_firefox_flicker ) if ( ! menu_firefox_flicker )

2
app/templates/babase.j2
View File

@ -25,7 +25,7 @@
{% block scripts %} {% block scripts %}
<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script> <script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>
<script src="{{scu.STATIC_DIR}}/jQuery/jquery-migrate-1.2.0.min.js"></script> <script src="{{scu.STATIC_DIR}}/jQuery/jquery-migrate-3.5.2.min.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/jquery.field.min.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/jquery.field.min.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="{{scu.STATIC_DIR}}/libjs/bootstrap/js/bootstrap.min.js"></script> <script src="{{scu.STATIC_DIR}}/libjs/bootstrap/js/bootstrap.min.js"></script>

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.7.R" SCOVERSION = "9.7.R000"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"