Upgrade jQuery to 3.5.x

war/package.json

@@ -51,7 +51,7 @@
     "babel-loader": "^8.0.6",
     "bootstrap": "3.3.5",
     "jenkins-js-modules": "^1.5.0",
-    "jquery": "2.1.4",
+    "jquery": "3.5.1",
     "stylelint": "^13.0.0",
     "window-handle": "^1.0.0"
   },

war/src/main/js/config-scrollspy.js

@@ -44,6 +44,12 @@ $(function() {
         page.onWinScroll(function () {
             stickTabbar(tabBar);
         });
+
+        // Manually trigger a repaint, otherwise Folder forms will not position
+        // the buttons correctly. This is caused by upgrading jQuery to 3.5.x,
+        // and probably has something to do with event listeners running in
+        // different order.
+        layoutUpdateCallback.call()
     }, {trackSectionVisibility: true});
 });
 
@@ -91,7 +97,7 @@ function autoActivateTabs(tabBar) {
         if (!section.isVisible()) {
             return;
         }
-        
+
         // each section enters the viewport at its distance down the page, less the height of
         // the toolbar, which hangs down the page. Or it is zero if the section doesn't
         // match or was removed...

war/src/main/js/pluginSetupWizardGui.js

@@ -412,9 +412,9 @@ var createPluginSetupWizard = function(appendTarget) {
 			installPlugins(pluginManager.recommendedPluginNames());
 		});
 	};
-	
+
 	var enableButtonsAfterFrameLoad = function() {
-		$('iframe[src]').load(function() {
+		$('iframe[src]').on('load', function() {
 			$('button').prop({disabled:false});
 		});
 	};

war/src/main/js/util/page.js

@@ -19,7 +19,7 @@ function onload(selector, callback, contextEl) {
     }
     function scan() {
         var elements = $(selector, contextEl).not(loadedClass);
-        if (elements.size() > 0) {
+        if (elements.length > 0) {
             elements.addClass(loadedClass);
             if (callback(elements) === true) {
                 registerRescan();

war/src/main/js/widgets/config/model/ConfigRowGrouping.js

@@ -65,7 +65,7 @@ ConfigRowGrouping.prototype.updateVisibility = function() {
 ConfigRowGrouping.prototype.findToggleWidget = function(row) {
     var $ = getJQuery();
     var input = $(':input.block-control', row);
-    if (input.size() === 1) {
+    if (input.length === 1) {
         this.toggleWidget = input;
         this.label = input.parent().find('label').text();
         input.addClass('disable-behavior');

war/src/main/js/widgets/config/model/ConfigSection.js

@@ -90,7 +90,7 @@ ConfigSection.prototype.getRows = function() {
     var numNewRows = 0;
 
     rows.push(curTr);
-    while(curTr.size() === 1 && !curTr.hasClass('section-header-row')) {
+    while(curTr.length === 1 && !curTr.hasClass('section-header-row')) {
         rows.push(curTr);
         if (!curTr.hasClass(this.id)) {
             numNewRows++;
@@ -155,7 +155,7 @@ ConfigSection.prototype.hasText = function(text) {
         var row = sectionRows[i1];
         var elementsWithText = $(selector, row);
 
-        if (elementsWithText.size() > 0) {
+        if (elementsWithText.length > 0) {
             return true;
         }
     }

war/src/main/js/widgets/config/tabbar.js

@@ -30,7 +30,7 @@ export var addPageTabs = function(configSelector, onEachConfigTable, options) {
         page.onload('.block-control', function() {
             // Only do job configs for now.
             var configTables = $(configSelector);
-            if (configTables.size() > 0) {
+            if (configTables.length > 0) {
                 var tabBarShowPreference = jenkinsLocalStorage.getGlobalItem(tabBarShowPreferenceKey, "yes");
 
                 page.fixDragEvent(configTables);
@@ -78,7 +78,7 @@ export var addTabs = function(configTable, options) {
     } else if (typeof configTable === 'string') {
         // It's a config <table> selector
         var configTableEl = $(configTable);
-        if (configTableEl.size() === 0) {
+        if (configTableEl.length === 0) {
             throw "No config table found using selector '" + configTable + "'";
         } else {
             configTableMetadata = tableMetadata.fromConfigTable(configTableEl);

war/src/test/js/pluginSetupWizard.spec.js

@@ -242,7 +242,7 @@ describe("pluginSetupWizard.js", function () {
         test(function() {
             // Make sure the dialog was shown
             var $wizard = $body.find('.plugin-setup-wizard');
-            expect($wizard.size()).toBe(1);
+            expect($wizard.length).toBe(1);
 
             done();
         }, { $, $body });
@@ -296,10 +296,10 @@ describe("pluginSetupWizard.js", function () {
         test(function() {
             // Make sure the dialog was shown
             var wizard = $body.find('.plugin-setup-wizard');
-            expect(wizard.size()).toBe(1);
+            expect(wizard.length).toBe(1);
 
             var goButton = $body.find('.install-recommended');
-            expect(goButton.size()).toBe(1);
+            expect(goButton.length).toBe(1);
 
             // validate a call to installPlugins with our defaults
             validatePlugins(['subversion'], function() {
@@ -367,8 +367,8 @@ describe("pluginSetupWizard.js", function () {
         };
 
         test(function() {
-            expect($body.find('.install-done').size()).toBe(0);
-            expect($body.find('.install-done-restart').size()).toBe(1);
+            expect($body.find('.install-done').length).toBe(0);
+            expect($body.find('.install-done-restart').length).toBe(1);
             done();
         }, { ajaxMappings, $, $body });
     });
@@ -391,8 +391,8 @@ describe("pluginSetupWizard.js", function () {
             },
         };
         test(function() {
-            expect($body.find('.install-done').size()).toBe(0);
-            expect($body.find('.install-done-restart').size()).toBe(0);
+            expect($body.find('.install-done').length).toBe(0);
+            expect($body.find('.install-done-restart').length).toBe(0);
             done();
         }, { ajaxMappings, $, $body });
     });
@@ -415,8 +415,8 @@ describe("pluginSetupWizard.js", function () {
             },
         };
         test(function() {
-            expect($body.find('.install-done').size()).toBe(1);
-            expect($body.find('.install-done-restart').size()).toBe(0);
+            expect($body.find('.install-done').length).toBe(1);
+            expect($body.find('.install-done-restart').length).toBe(0);
             done();
         }, { ajaxMappings, $, $body });
     });
@@ -492,7 +492,7 @@ describe("pluginSetupWizard.js", function () {
         };
         test(function() {
             var goButton = $body.find('.install-recommended');
-            expect(goButton.size()).toBe(1);
+            expect(goButton.length).toBe(1);
 
             // validate a call to installPlugins with our defaults
             setTimeout(function() {