You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2022/08/19 20:11:45 UTC
[allura] 03/05: [#8453] jquery-ui upgrade 1.11.4 -> 1.13.2
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8453
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 04bfd600597f59c8d4d7b284e2f19cfc10d001a4
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Fri Aug 19 11:13:36 2022 -0600
[#8453] jquery-ui upgrade 1.11.4 -> 1.13.2
---
Allura/LICENSE | 4 ++--
Allura/allura/ext/admin/templates/project_groups.html | 2 +-
Allura/allura/ext/admin/widgets.py | 4 ++--
Allura/allura/lib/widgets/form_fields.py | 12 ++++++------
.../nf/css/smoothness/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes
.../nf/css/smoothness/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes
.../nf/css/smoothness/images/ui-icons_444444_256x240.png | Bin 0 -> 7090 bytes
.../nf/css/smoothness/images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes
.../nf/css/smoothness/images/ui-icons_555555_256x240.png | Bin 0 -> 7074 bytes
.../nf/css/smoothness/images/ui-icons_777620_256x240.png | Bin 0 -> 4618 bytes
.../nf/css/smoothness/images/ui-icons_777777_256x240.png | Bin 0 -> 7111 bytes
.../nf/css/smoothness/images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes
.../nf/css/smoothness/images/ui-icons_cc0000_256x240.png | Bin 0 -> 4618 bytes
.../nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes
.../nf/css/smoothness/images/ui-icons_ffffff_256x240.png | Bin 0 -> 6487 bytes
.../public/nf/css/smoothness/jquery-ui-1.13.2.min.css | 7 +++++++
Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js | 6 ++++++
Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
Allura/allura/templates/neighborhood_add_project.html | 2 +-
.../templates_responsive/jinja_master/theme_macros.html | 2 +-
.../templates/discussionforums/stats_graph.html | 4 ++--
ForgeTracker/forgetracker/widgets/ticket_search.py | 4 ++--
LICENSE | 4 ++--
rat-excludes.txt | 4 ++--
24 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 768c15108..95c86d724 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -216,8 +216,8 @@ jQuery, jQueryUI, and various related plugins, which are available
under the MIT license. For details, see the individual files:
allura/public/nf/js/jquery-3.6.0.min.js
allura/public/nf/js/jquery.cookie-1.4.1.js
- allura/public/nf/js/jquery-ui.min.js
- allura/public/nf/css/smoothness/jquery-ui.min.css
+ allura/public/nf/js/jquery-ui-1.13.2.min.js
+ allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css
allura/public/nf/js/jquery.daterangepicker.js
allura/public/nf/css/forge/ui.daterangepicker.css
allura/lib/widgets/resources/css/autocomplete.css
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index 9796b7b93..bb5571010 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -19,7 +19,7 @@
{% extends g.theme.master %}
{% do g.register_forge_css('css/forge/deck.css') %}
-{% do g.register_forge_js('js/jquery-ui.min.js', location='body_top_js') %}
+{% do g.register_forge_js('js/jquery-ui-1.13.2.min.js', location='body_top_js') %}
{% do g.register_forge_js('js/project_groups.js', location='body_js_tail') %}
{% block title %}{{c.project.name}} / User Permissions {% endblock %}
diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py
index d41ef33ae..5a2e0e3cb 100644
--- a/Allura/allura/ext/admin/widgets.py
+++ b/Allura/allura/ext/admin/widgets.py
@@ -154,8 +154,8 @@ class FeaturesField(ew.CompoundField):
fields = [ew.TextField(name='feature', attrs={'style': 'width:89%'})]
def resources(self):
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css', compress=False) # compress will also serve from a different location, breaking image refs
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
+ yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css', compress=False) # compress will also serve from a different location, breaking image refs
class MetadataAdmin(ff.AdminForm):
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index e73c6ca7b..957630f7c 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -76,7 +76,7 @@ class LabelEdit(ew.InputField):
return ','.join(value)
def resources(self):
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
yield ew.JSLink('js/jquery.tagsinput.js')
yield ew.CSSLink('css/jquery.tagsinput.css')
yield onready('''
@@ -123,7 +123,7 @@ class ProjectUserSelect(ew.InputField):
def resources(self):
yield from super().resources()
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css
yield onready('''
$('input.project_user_select').autocomplete({
@@ -157,7 +157,7 @@ class ProjectUserCombo(ew.SingleSelectField):
def resources(self):
yield from super().resources()
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css
yield ew.CSSLink('css/combobox.css')
yield ew.JSLink('js/combobox.js')
@@ -187,7 +187,7 @@ class NeighborhoodProjectSelect(ew.InputField):
def resources(self):
yield from super().resources()
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
yield ew.CSSLink('css/autocomplete.css') # customized in [6b78ed] so we can't just use jquery-ui.min.css
yield onready('''
$('input.neighborhood-project-select').autocomplete({
@@ -464,8 +464,8 @@ class DateField(JQueryMixin, ew.TextField):
def resources(self):
yield from super().resources()
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
- yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css', compress=False) # compress will also serve from a different location, breaking image refs
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
+ yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css', compress=False) # compress will also serve from a different location, breaking image refs
class FieldCluster(ew.CompoundField):
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png
deleted file mode 100644
index e9c8e16ac..000000000
Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index f2bf83883..000000000
Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png
new file mode 100644
index 000000000..53e342a0c
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_444444_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png
deleted file mode 100644
index d6169e8bf..000000000
Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png
new file mode 100644
index 000000000..47470e84c
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_555555_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png
new file mode 100644
index 000000000..07d6289f3
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_777620_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png
new file mode 100644
index 000000000..2e644ee42
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_777777_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png
deleted file mode 100644
index d3e6e02a0..000000000
Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png
new file mode 100644
index 000000000..a72c0cfd4
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_cc0000_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 493701892..000000000
Binary files a/Allura/allura/public/nf/css/smoothness/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png b/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 000000000..f40680d81
Binary files /dev/null and b/Allura/allura/public/nf/css/smoothness/images/ui-icons_ffffff_256x240.png differ
diff --git a/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css b/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css
new file mode 100644
index 000000000..57b1df88f
--- /dev/null
+++ b/Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.12.1 - 2022-08-19
+* http://jqueryui.com
+* Includes: draggable.css, sortable.css, core.css, autocomplete.css, menu.css, datepicker.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&bor [...]
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;borde [...]
diff --git a/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js b/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js
new file mode 100644
index 000000000..c23102ec0
--- /dev/null
+++ b/Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.12.1 - 2022-08-19
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, keycode.js, scroll-parent.js, unique-id.js, widgets/draggable.js, widgets/sortable.js, widgets/autocomplete.js, widgets/datepicker.js, widgets/menu.js, widgets/mouse.js, effect.js, effects/effect-fade.js, effects/effect-highlight.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+!function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(w){w.ui=w.ui||{};w.ui.version="1.12.1";var n,i=0,a=Array.prototype.slice;w.cleanData=(n=w.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)try{(e=w._data(i,"events"))&&e.remove&&w(i).triggerHandler("remove")}catch(t){}n(t)}),w.widget=function(t,i,e){var s,n,o,r={},a=t.split(".")[0],l=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=w.Widget),w.isArray(e)&&(e=w.extend.apply(null,[{}].concat(e))), [...]
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index a79f09e64..164c7f65a 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -159,7 +159,7 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
{% if not login_overlay %}
{%- macro login_overlay() %}
{% do g.register_js('js/jquery.lightbox_me.js') %}
- {% do g.register_forge_js('js/jquery-ui.min.js') %}
+ {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %}
{% do g.register_js('js/login_overlay.js') %}
<div id="login_overlay" class="ui-widget-content">
<h2 class="dark title">Login Required</h2>
diff --git a/Allura/allura/templates/neighborhood_add_project.html b/Allura/allura/templates/neighborhood_add_project.html
index 79b637118..e6a70d4a9 100644
--- a/Allura/allura/templates/neighborhood_add_project.html
+++ b/Allura/allura/templates/neighborhood_add_project.html
@@ -25,7 +25,7 @@
{% block content %}
{% if c.show_phone_verification_overlay %}
- {% do g.register_forge_js('js/jquery-ui.min.js') %}
+ {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %}
{% do g.register_js('js/jquery.lightbox_me.js') %}
<div id="phone_verification_overlay" class="ui-widget-content">
<h2 class="dark title">Phone Verification Required</h2>
diff --git a/Allura/allura/templates_responsive/jinja_master/theme_macros.html b/Allura/allura/templates_responsive/jinja_master/theme_macros.html
index 242074424..be7accc2a 100644
--- a/Allura/allura/templates_responsive/jinja_master/theme_macros.html
+++ b/Allura/allura/templates_responsive/jinja_master/theme_macros.html
@@ -178,7 +178,7 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
{% if not login_overlay %}
{%- macro login_overlay() %}
{% do g.register_js('js/jquery.lightbox_me.js') %}
- {% do g.register_forge_js('js/jquery-ui.min.js') %}
+ {% do g.register_forge_js('js/jquery-ui-1.13.2.min.js') %}
{% do g.register_js('js/login_overlay.js') %}
<div id="login_overlay" class="ui-widget-content">
<h2 class="dark title">Login Required</h2>
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
index f3fe8c6f4..d1a1376e4 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/stats_graph.html
@@ -66,10 +66,10 @@
{% endblock %}
-{% do g.register_forge_js('js/jquery-ui.min.js', location='body_top_js') %}
+{% do g.register_forge_js('js/jquery-ui-1.13.2.min.js', location='body_top_js') %}
{% block extra_css %}
-<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/smoothness/jquery-ui.min.css')}}"/>
+<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/smoothness/jquery-ui-1.13.2.min.css')}}"/>
<link rel="stylesheet" type="text/css" href="{{g.forge_static('css/forge/ui.daterangepicker.css')}}"/>
{% endblock %}
diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py
index ae834721b..8139becf6 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -55,9 +55,9 @@ class TicketSearchResults(ew_core.SimpleForm):
options.append({'value': '', 'label': 'Not set', 'selected': False})
def resources(self):
- yield ew.JSLink('allura/js/jquery-ui.min.js', location='body_top_js')
+ yield ew.JSLink('allura/js/jquery-ui-1.13.2.min.js', location='body_top_js')
yield ew.JSLink('tracker_js/jquery.multiselect.min.js')
- yield ew.CSSLink('allura/css/smoothness/jquery-ui.min.css')
+ yield ew.CSSLink('allura/css/smoothness/jquery-ui-1.13.2.min.css')
yield ew.CSSLink('tracker_css/jquery.multiselect.css')
yield ew.JSLink('tracker_js/ticket-list.js')
yield ew.CSSLink('tracker_css/ticket-list.css')
diff --git a/LICENSE b/LICENSE
index c531ce0c0..83e2c9b96 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,8 +217,8 @@ jQuery, jQueryUI, and various related plugins, which are available
under the MIT license. For details, see the individual files:
Allura/allura/public/nf/js/jquery-3.6.0.min.js
Allura/allura/public/nf/js/jquery.cookie-1.4.1.js
- Allura/allura/public/nf/js/jquery-ui.min.js
- Allura/allura/public/nf/css/smoothness/jquery-ui.min.css
+ Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js
+ Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css
Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/css/forge/ui.daterangepicker.css
Allura/allura/lib/widgets/resources/css/autocomplete.css
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 72cc7f540..78ed16995 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -32,7 +32,7 @@ Allura/allura/public/nf/css/chosen.min.css
Allura/allura/public/nf/css/font-awesome.min.css
Allura/allura/public/nf/css/forge/tooltipster.css
Allura/allura/public/nf/css/forge/ui.daterangepicker.css
-Allura/allura/public/nf/css/smoothness/jquery-ui.min.css
+Allura/allura/public/nf/css/smoothness/jquery-ui-1.13.2.min.css
Allura/allura/public/nf/fonts/
Allura/allura/public/nf/js/browser-polyfill.min.js
Allura/allura/public/nf/js/chosen.jquery.min.js
@@ -42,7 +42,7 @@ Allura/allura/public/nf/js/foundation.min.js.map
Allura/allura/public/nf/js/hidpi-canvas.min.js
Allura/allura/public/nf/js/jquery-3.6.0.min.js
Allura/allura/public/nf/js/jquery.cookie-1.4.1.js
-Allura/allura/public/nf/js/jquery-ui.min.js
+Allura/allura/public/nf/js/jquery-ui-1.13.2.min.js
Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js