Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade jQuery from 1.x to 3.x #69

Merged
merged 2 commits into from
May 9, 2023
Merged

Upgrade jQuery from 1.x to 3.x #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853fbbe
Upgrade jQuery from 1.x to 3.x
basil May 4, 2023
13e9d89
Use jQuery3 global
basil May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<properties>
<revision>2.6.6</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.332.3</jenkins.version>
<jenkins.version>2.332.4</jenkins.version>
<gitHubRepo>jenkinsci/active-choices-plugin</gitHubRepo>
</properties>

Expand Down Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1409.v7659b_c072f18</version>
<version>1763.v092b_8980a_f5e</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -81,15 +81,8 @@
</dependency>
<!-- JQuery is included only once -->
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-adjunct-jquery</artifactId> <!-- TODO why is this not using org.jenkins-ci.plugins:jquery instead?! -->
<version>1.12.4-0</version>
<exclusions>
<exclusion> <!-- TODO INFRA-1310 pending 1.12.4-0 -->
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
</exclusion>
</exclusions>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jquery3-api</artifactId>
</dependency>
<!-- script-security plug-in integration -->
<dependency>
Expand All @@ -100,7 +93,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>antisamy-markup-formatter</artifactId>
<version>2.7</version>
</dependency>
<!-- testing -->
<dependency>
Expand All @@ -111,7 +103,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>3.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/org/biouno/unochoice/DynamicReferenceParameter/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?jelly escape-by-default='true' ?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
${it.parameters.clear()}
<st:adjunct includes="org.kohsuke.stapler.jquery"/>
<st:adjunct includes="io.jenkins.plugins.jquery3"/>
<st:adjunct includes="org.biouno.unochoice.stapler.unochoice"/>
<j:set var="choiceType" value="${it.choiceType}"/>
<j:set var="omitValueField" value="${it.omitValueField}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
<st:adjunct includes="org.kohsuke.stapler.jquery"/>
<st:adjunct includes="io.jenkins.plugins.jquery3"/>
<st:adjunct includes="org.biouno.unochoice.stapler.unochoice"/>
<j:set var="paramName" value="${h.escape(it.randomName)}" scope="parent" />
<j:set var="choiceType" value="${it.choiceType}"/>
Expand Down
98 changes: 49 additions & 49 deletions src/main/resources/org/biouno/unochoice/stapler/unochoice/unochoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
'use strict';
jQuery.noConflict();
jQuery3.noConflict();
/**
* <h2>Uno Choice Javascript module.</h2>
*
Expand All @@ -35,7 +35,7 @@ jQuery.noConflict();
*
* <p>This module <strong>depends on JQuery</strong> only.</p>
*
* @param $ jQuery global var
* @param $ jQuery3 global var
* @author Bruno P. Kinoshita <[email protected]>
* @since 0.20
*/
Expand Down Expand Up @@ -226,7 +226,7 @@ var UnoChoice = UnoChoice || (function($) {
var table = parameterElement.children[0];
var tbody = table.children[0];
if (tbody) {
jQuery(tbody).empty();
jQuery3(tbody).empty();
} else {
tbody = document.createElement('tbody');
table.appendChild(tbody);
Expand Down Expand Up @@ -357,7 +357,7 @@ var UnoChoice = UnoChoice || (function($) {
} // if (parameterElement.children.length > 0 && parameterElement.children[0].tagName === 'TABLE') {
if (parameterElement.children.length > 0 && (parameterElement.children[0].tagName === 'DIV' || parameterElement.children[0].tagName === 'SPAN')) {
var tbody = parameterElement.children[0];
jQuery(tbody).empty();
jQuery3(tbody).empty();
var originalArray = [];
// Check whether it is a radio or checkbox element
if (parameterElement.className === 'dynamic_checkbox') {
Expand Down Expand Up @@ -488,8 +488,8 @@ var UnoChoice = UnoChoice || (function($) {
});
// propagate change
// console.log('Propagating change event from ' + this.getParameterName());
// var e = jQuery.Event('change', {parameterName: this.getParameterName()});
// jQuery(this.getParameterElement()).trigger(e);
// var e = jQuery3.Event('change', {parameterName: this.getParameterName()});
// jQuery3(this.getParameterElement()).trigger(e);
if (!avoidRecursion) {
if (cascadeParameters && cascadeParameters.length > 0) {
for (var i = 0; i < cascadeParameters.length; i++) {
Expand Down Expand Up @@ -542,18 +542,18 @@ var UnoChoice = UnoChoice || (function($) {
this.cascadeParameter = cascadeParameter;
// Add event listener
var _self = this;
jQuery(this.paramElement).change(function (e) {
jQuery3(this.paramElement).change(function (e) {
if (e.parameterName === _self.paramName) {
console.log('Skipping self reference to avoid infinite loop!');
e.stopImmediatePropagation();
} else {
console.log('Cascading changes from parameter ' + _self.paramName + '...');
//_self.cascadeParameter.loading(true);
jQuery(".behavior-loading").show();
jQuery3(".behavior-loading").show();
// start updating in separate async function so browser will be able to repaint and show 'loading' animation , see JENKINS-34487
setTimeout(function () {
_self.cascadeParameter.update();
jQuery(".behavior-loading").hide();
jQuery3(".behavior-loading").hide();
}, 0);
}
});
Expand Down Expand Up @@ -613,7 +613,7 @@ var UnoChoice = UnoChoice || (function($) {
if (parameterElement.tagName === 'OL') { // handle OL's
console.log('Calling Java server code to update HTML elements...');
this.proxy.getChoicesForUI(function (t) {
jQuery(parameterElement).empty(); // remove all children elements
jQuery3(parameterElement).empty(); // remove all children elements
var choices = t.responseText;
console.log('Values returned from server: ' + choices);
var data = JSON.parse(choices);
Expand All @@ -626,7 +626,7 @@ var UnoChoice = UnoChoice || (function($) {
}
});
} else if (parameterElement.tagName === 'UL') { // handle OL's
jQuery(parameterElement).empty(); // remove all children elements
jQuery3(parameterElement).empty(); // remove all children elements
console.log('Calling Java server code to update HTML elements...');
this.proxy.getChoicesForUI(function (t) {
var choices = t.responseText;
Expand All @@ -652,8 +652,8 @@ var UnoChoice = UnoChoice || (function($) {
}
// propagate change
// console.log('Propagating change event from ' + this.getParameterName());
// var e = jQuery.Event('change', {parameterName: this.getParameterName()});
// jQuery(this.getParameterElement()).trigger(e);
// var e = jQuery3.Event('change', {parameterName: this.getParameterName()});
// jQuery3(this.getParameterElement()).trigger(e);
if (!avoidRecursion) {
if (cascadeParameters && cascadeParameters.length > 0) {
for (var i = 0; i < cascadeParameters.length; i++) {
Expand Down Expand Up @@ -683,52 +683,52 @@ var UnoChoice = UnoChoice || (function($) {
this.originalArray = [];
// push existing values into originalArray array
if (this.paramElement.tagName === 'SELECT') { // handle SELECTS
var options = jQuery(paramElement).children().toArray();
var options = jQuery3(paramElement).children().toArray();
for (var i = 0; i < options.length; ++i) {
this.originalArray.push(options[i]);
}
} else if (paramElement.tagName === 'DIV' || paramElement.tagName === 'SPAN') { // handle CHECKBOXES
if (jQuery(paramElement).children().length > 0 && paramElement.children[0].tagName === 'TABLE') {
if (jQuery3(paramElement).children().length > 0 && paramElement.children[0].tagName === 'TABLE') {
var table = paramElement.children[0];
var tbody = table.children[0];
if (paramElement.className === 'dynamic_checkbox') {
var trs = jQuery(tbody).find('tr');
var trs = jQuery3(tbody).find('tr');
for (var i = 0; i < trs.length ; ++i) {
var tds = jQuery(trs[i]).find('td');
var inputs = jQuery(tds[0]).find('input');
var tds = jQuery3(trs[i]).find('td');
var inputs = jQuery3(tds[0]).find('input');
var input = inputs[0];
this.originalArray.push(input);
}
} else {
var trs = jQuery(tbody).find('tr');
var trs = jQuery3(tbody).find('tr');
for (var i = 0; i < trs.length ; ++i) {
var tds = jQuery(trs[i]).find('td');
var inputs = jQuery(tds[0]).find('input');
var tds = jQuery3(trs[i]).find('td');
var inputs = jQuery3(tds[0]).find('input');
var input = inputs[0];
this.originalArray.push(input);
}
}
} // if (jQuery(paramElement).children().length > 0 && paramElement.children[0].tagName === 'TABLE') {
if (jQuery(paramElement).children().length > 0 && (paramElement.children[0].tagName === 'DIV' || paramElement.children[0].tagName === 'SPAN')) {
} // if (jQuery3(paramElement).children().length > 0 && paramElement.children[0].tagName === 'TABLE') {
if (jQuery3(paramElement).children().length > 0 && (paramElement.children[0].tagName === 'DIV' || paramElement.children[0].tagName === 'SPAN')) {
var tbody = paramElement.children[0];
if (paramElement.className === 'dynamic_checkbox') {
var trs = jQuery(tbody).find('div');
var trs = jQuery3(tbody).find('div');
for (var i = 0; i < trs.length ; ++i) {
var tds = jQuery(trs[i]).find('div');
var inputs = jQuery(tds[0]).find('input');
var tds = jQuery3(trs[i]).find('div');
var inputs = jQuery3(tds[0]).find('input');
var input = inputs[0];
this.originalArray.push(input);
}
} else {
var trs = jQuery(tbody).find('div');
var trs = jQuery3(tbody).find('div');
for (var i = 0; i < trs.length ; ++i) {
var tds = jQuery(trs[i]).find('div');
var inputs = jQuery(tds[0]).find('input');
var tds = jQuery3(trs[i]).find('div');
var inputs = jQuery3(tds[0]).find('input');
var input = inputs[0];
this.originalArray.push(input);
}
}
} // if (jQuery(paramElement).children().length > 0 && paramElement.children[0].tagName === 'DIV') {
} // if (jQuery3(paramElement).children().length > 0 && paramElement.children[0].tagName === 'DIV') {
}
this.initEventHandler();
}
Expand Down Expand Up @@ -787,7 +787,7 @@ var UnoChoice = UnoChoice || (function($) {
*/
FilterElement.prototype.initEventHandler = function() {
var _self = this;
jQuery(_self.filterElement).keyup(function(e) {
jQuery3(_self.filterElement).keyup(function(e) {
//var filterElement = e.target;
var filterElement = _self.getFilterElement();
var filteredElement = _self.getParameterElement();
Expand Down Expand Up @@ -817,18 +817,18 @@ var UnoChoice = UnoChoice || (function($) {
}
var tagName = filteredElement.tagName;
if (tagName === 'SELECT') { // handle SELECT's
jQuery(filteredElement).children().remove();
jQuery3(filteredElement).children().remove();
for (var i = 0; i < newOptions.length ; ++i) {
var opt = document.createElement('option');
opt.value = newOptions[i].value;
opt.innerHTML = newOptions[i].innerHTML;
jQuery(filteredElement).append(opt);
jQuery3(filteredElement).append(opt);
}
} else if (tagName === 'DIV' || tagName === 'SPAN') { // handle CHECKBOXES, RADIOBOXES and other elements (Jenkins renders them as tables)
if (jQuery(filteredElement).children().length > 0 && jQuery(filteredElement).children()[0].tagName === 'TABLE') {
if (jQuery3(filteredElement).children().length > 0 && jQuery3(filteredElement).children()[0].tagName === 'TABLE') {
var table = filteredElement.children[0];
var tbody = table.children[0];
jQuery(tbody).empty();
jQuery3(tbody).empty();
if (filteredElement.className === 'dynamic_checkbox') {
for (var i = 0; i < newOptions.length; i++) {
var entry = newOptions[i];
Expand Down Expand Up @@ -914,10 +914,10 @@ var UnoChoice = UnoChoice || (function($) {
tbody.appendChild(tr);
}
}
} // if (jQuery(filteredElement).children().length > 0 && jQuery(filteredElement).children()[0].tagName === 'TABLE') {
if (jQuery(filteredElement).children().length > 0 && (jQuery(filteredElement).children()[0].tagName === 'DIV' || jQuery(filteredElement).children()[0].tagName === 'SPAN')) {
} // if (jQuery3(filteredElement).children().length > 0 && jQuery3(filteredElement).children()[0].tagName === 'TABLE') {
if (jQuery3(filteredElement).children().length > 0 && (jQuery3(filteredElement).children()[0].tagName === 'DIV' || jQuery3(filteredElement).children()[0].tagName === 'SPAN')) {
var tbody = filteredElement.children[0];
jQuery(tbody).empty();
jQuery3(tbody).empty();
if (filteredElement.className === 'dynamic_checkbox') {
for (var i = 0; i < newOptions.length; i++) {
var entry = newOptions[i];
Expand Down Expand Up @@ -1005,12 +1005,12 @@ var UnoChoice = UnoChoice || (function($) {
tbody.appendChild(tr);
}
}
} // if (jQuery(filteredElement).children().length > 0 && jQuery(filteredElement).children()[0].tagName === 'DIV') {
} // if (jQuery3(filteredElement).children().length > 0 && jQuery3(filteredElement).children()[0].tagName === 'DIV') {
} // if (tagName === 'SELECT') { // } else if (tagName === 'DIV') {
// Propagate the changes made by the filter
console.log('Propagating change event after filtering');
var e = jQuery.Event('change', {parameterName: 'Filter Element Event'});
jQuery(filteredElement).trigger(e);
var e = jQuery3.Event('change', {parameterName: 'Filter Element Event'});
jQuery3(filteredElement).trigger(e);
});
}
// HTML utility methods
Expand All @@ -1034,11 +1034,11 @@ var UnoChoice = UnoChoice || (function($) {
* @see issue #21 in GitHub - github.com/biouno/uno-choice-plugin/issues
*/
/* public */ function fakeSelectRadioButton(clazzName, id) {
var element = jQuery('#'+id).get(0);
var element = jQuery3('#'+id).get(0);
// deselect all radios with the class=clazzName
var radios = jQuery('input[class="'+clazzName+'"]');
var radios = jQuery3('input[class="'+clazzName+'"]');
radios.each(function(index) {
jQuery(this).attr('name', '');
jQuery3(this).attr('name', '');
});
// select the radio with the id=id
var parent = element.parentNode;
Expand Down Expand Up @@ -1066,7 +1066,7 @@ var UnoChoice = UnoChoice || (function($) {
* @return <code>String</code> the value of the HTML element used as parameter value in Jenkins, as a string
*/
/* public */ function getParameterValue(htmlParameter) {
var e = jQuery(htmlParameter);
var e = jQuery3(htmlParameter);
var value = '';
if (e.attr('name') === 'value') {
value = getElementValue(htmlParameter);
Expand All @@ -1075,7 +1075,7 @@ var UnoChoice = UnoChoice || (function($) {
if (subElements) {
var valueBuffer = Array();
subElements.each(function() {
var tempValue = getElementValue(jQuery(this));
var tempValue = getElementValue(jQuery3(this));
if (tempValue)
valueBuffer.push(tempValue);
});
Expand All @@ -1101,7 +1101,7 @@ var UnoChoice = UnoChoice || (function($) {
*/
function getElementValue(htmlParameter) {
var value = '';
var e = jQuery(htmlParameter);
var e = jQuery3(htmlParameter);
if (e.prop('tagName') === 'SELECT') {
value = getSelectValues(e);
} else if (e.attr('type') === 'checkbox' || e.attr('type') === 'radio') {
Expand Down Expand Up @@ -1157,7 +1157,7 @@ var UnoChoice = UnoChoice || (function($) {
var a = [];
for (var i=0; i<args.length-(callback!=null?1:0); i++)
a.push(args[i]);
if(window.jQuery === window.$) { //Is jQuery the active framework?
if(window.jQuery3 === window.$) { //Is jQuery the active framework?
$.ajax({
type: "POST",
url: url+methodName,
Expand Down Expand Up @@ -1209,4 +1209,4 @@ var UnoChoice = UnoChoice || (function($) {
instance.makeStaplerProxy2 = makeStaplerProxy2;
instance.cascadeParameters = cascadeParameters;
return instance;
})(jQuery);
})(jQuery3);