activeadmin 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3421560bc8ebcddcb2685e3a296c5dbecd08d53f90c858f747dd57729e63136b
-  data.tar.gz: 53a03320dfd11b59d81392a942a138d84c50403119f2f8007700e433a1ac32db
+  metadata.gz: afa1c1c32021e663fdfbf9f57274716deb64f84ac184453bc2b73b6073053303
+  data.tar.gz: 183d57d9d1d7bf90399aaeb8e46ba97077ec30f3028ead82d34d976de1cd295c
 SHA512:
-  metadata.gz: 25514fe7c810b5df4cd6f91fb5af09f1997d67a0b350003d47c1d3a9bb7c8a4e240045c83a32c07c6207e79a2d3ff29ddbffb0d73801751b8b6f1b0defa354ec
-  data.tar.gz: 338c4417858bd84fa539e983c841412d8ebeab3ae1c069410fa015bfc1b5f16506f73d05f3b3e5e95462d1a899d9451359496eddfb519cd33f23d09fd93c9bfc
+  metadata.gz: 6bb9e12a1b4efcf8ed33044499cffb92019ca3e5b9b81b02aa94586f142fb8f22f68e7659c01551c07d2a37fecea912cf7ac61e28c05c2e4a531b5ea74f262e2
+  data.tar.gz: 6de75bee7cec2b1241ce989d55186a19801d272ccc4d2b06e73e022043f20e16c1781ae9ca00906681d6a2f5db22f1f6f6baa3f67b05703e2b7dacefd863f896

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 3.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.4.0..v3.5.0)
+
+### Enhancements
+
+* Backport Devise 5 support [#8964] by @tagliala
+* Backport Drop legacy connection support [#8965] by @tagliala
+
+### Dependency Changes
+
+* Update vendored jQuery UI to 1.14.2 [#8670] by @tagliala (thanks to @tobischo)
+
 ## 3.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.3.0..v3.4.0)
 
 * Add Rails 8.1 compatibility and drop Ruby < 3.0 support [#8837] by [@tagliala]
@@ -988,7 +999,10 @@ Please check [0-6-stable] for previous changes.
 [#8614]: https://github.com/activeadmin/activeadmin/pull/8614
 [#8650]: https://github.com/activeadmin/activeadmin/pull/8650
 [#8652]: https://github.com/activeadmin/activeadmin/pull/8652
+[#8670]: https://github.com/activeadmin/activeadmin/pull/8670
 [#8837]: https://github.com/activeadmin/activeadmin/pull/8837
+[#8964]: https://github.com/activeadmin/activeadmin/pull/8964
+[#8965]: https://github.com/activeadmin/activeadmin/pull/8965
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -1113,6 +1127,7 @@ Please check [0-6-stable] for previous changes.
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
 [@timwis]: https://github.com/timwis
+[@tobischo]: https://github.com/tobischo
 [@tomgilligan]: https://github.com/tomgilligan
 [@TonyArra]: https://github.com/TonyArra
 [@tordans]: https://github.com/tordans

data/app/assets/javascripts/active_admin/base.js

@@ -187,6 +187,7 @@
       };
       var options = input.data("datepicker-options");
       input.datepicker($.extend(defaults, options));
+      input.datepicker("show");
     });
   })(jQuery);
   var DropdownMenu = function() {

data/app/javascript/active_admin/initializers/datepicker.js

@@ -11,6 +11,9 @@
       const options  = input.data('datepicker-options');
 
       input.datepicker($.extend(defaults, options));
+
+      // See https://github.com/jquery/jquery-ui/issues/2385
+      input.datepicker('show');
     });
 
 })(jQuery);

data/lib/active_admin/dependency.rb

@@ -2,7 +2,7 @@
 module ActiveAdmin
   module Dependency
     module Requirements
-      DEVISE = ">= 4.0", "< 5"
+      DEVISE = ">= 4.0", "< 6"
     end
 
     # Provides a clean interface to check for gem dependencies at runtime.

data/lib/active_admin/resource.rb

@@ -70,7 +70,7 @@ module ActiveAdmin
     module Base
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
-        @resource_class_name = "::#{resource_class.name}"
+        @resource_class_name = resource_class.respond_to?(:name) ? "::#{resource_class.name}" : resource_class.to_s
         @options = options
         @sort_order = options[:sort_order]
         @member_actions = []
@@ -119,7 +119,13 @@ module ActiveAdmin
     end
 
     def resource_quoted_column_name(column)
-      resource_class.connection.quote_column_name(column)
+      if resource_class.respond_to?(:with_connection)
+        resource_class.with_connection do |connection|
+          connection.quote_column_name(column)
+        end
+      else
+        resource_class.connection.quote_column_name(column)
+      end
     end
 
     # Clears all the member actions this resource knows about

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

data/vendor/assets/javascripts/jquery-ui/data.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI :data 1.13.3
+ * jQuery UI :data 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -30,16 +30,10 @@
 "use strict";
 
 return $.extend( $.expr.pseudos, {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo( function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		} ) :
-
-		// Support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		}
+	data: $.expr.createPseudo( function( dataName ) {
+		return function( elem ) {
+			return !!$.data( elem, dataName );
+		};
+	} )
 } );
 } );

data/vendor/assets/javascripts/jquery-ui/disable-selection.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Disable Selection 1.13.3
+ * jQuery UI Disable Selection 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/focusable.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Focusable 1.13.3
+ * jQuery UI Focusable 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -64,20 +64,10 @@ $.ui.focusable = function( element, hasTabindex ) {
 		focusableIfVisible = hasTabindex;
 	}
 
-	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
+	return focusableIfVisible && $( element ).is( ":visible" ) &&
+		$( element ).css( "visibility" ) === "visible";
 };
 
-// Support: IE 8 only
-// IE 8 doesn't resolve inherit to visible/hidden for computed values
-function visible( element ) {
-	var visibility = element.css( "visibility" );
-	while ( visibility === "inherit" ) {
-		element = element.parent();
-		visibility = element.css( "visibility" );
-	}
-	return visibility === "visible";
-}
-
 $.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );

data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js

@@ -1,8 +1,7 @@
-//= require jquery-ui/form
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Form Reset Mixin 1.13.3
+ * jQuery UI Form Reset Mixin 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -23,7 +22,6 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
-			"./form",
 			"./version"
 		], factory );
 	} else {
@@ -48,7 +46,7 @@ return $.ui.formResetMixin = {
 	},
 
 	_bindFormResetHandler: function() {
-		this.form = this.element._form();
+		this.form = $( this.element.prop( "form" ) );
 		if ( !this.form.length ) {
 			return;
 		}

data/vendor/assets/javascripts/jquery-ui/keycode.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Keycode 1.13.3
+ * jQuery UI Keycode 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/labels.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Labels 1.13.3
+ * jQuery UI Labels 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -41,9 +41,8 @@ return $.fn.labels = function() {
 		return this.pushStack( this[ 0 ].labels );
 	}
 
-	// Support: IE <= 11, FF <= 37, Android <= 2.3 only
-	// Above browsers do not support control.labels. Everything below is to support them
-	// as well as document fragments. control.labels does not work on document fragments
+	// If `control.labels` is empty - e.g. inside of document fragments - find
+	// the labels manually
 	labels = this.eq( 0 ).parents( "label" );
 
 	// Look for the label based on the id
@@ -58,7 +57,7 @@ return $.fn.labels = function() {
 		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
 
 		// Create a selector for the label based on the id
-		selector = "label[for='" + $.escapeSelector( id ) + "']";
+		selector = "label[for='" + CSS.escape( id ) + "']";
 
 		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
 

data/vendor/assets/javascripts/jquery-ui/position.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Position 1.13.3
+ * jQuery UI Position 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/scroll-parent.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Scroll Parent 1.13.3
+ * jQuery UI Scroll Parent 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/tabbable.js

@@ -2,7 +2,7 @@
 //= require jquery-ui/focusable
 
 /*!
- * jQuery UI Tabbable 1.13.3
+ * jQuery UI Tabbable 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/unique-id.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Unique ID 1.13.3
+ * jQuery UI Unique ID 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors

data/vendor/assets/javascripts/jquery-ui/version.js

@@ -15,6 +15,6 @@
 
 $.ui = $.ui || {};
 
-return $.ui.version = "1.13.3";
+return $.ui.version = "1.14.2";
 
 } );

data/vendor/assets/javascripts/jquery-ui/widget.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -58,6 +58,9 @@ $.widget = function( name, base, prototype ) {
 
 	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
+	if ( name === "__proto__" || name === "constructor" ) {
+		return $.error( "Invalid widget name: " + name );
+	}
 	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {

data/vendor/assets/javascripts/jquery-ui/widgets/button.js

@@ -4,7 +4,7 @@
 //= require jquery-ui/widget
 
 /*!
- * jQuery UI Button 1.13.3
+ * jQuery UI Button 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -47,7 +47,7 @@
 "use strict";
 
 $.widget( "ui.button", {
-	version: "1.13.3",
+	version: "1.14.2",
 	defaultElement: "<button>",
 	options: {
 		classes: {
@@ -114,9 +114,9 @@ $.widget( "ui.button", {
 					if ( event.keyCode === $.ui.keyCode.SPACE ) {
 						event.preventDefault();
 
-						// Support: PhantomJS <= 1.9, IE 8 Only
-						// If a native click is available use it so we actually cause navigation
-						// otherwise just trigger a click event
+						// If a native click is available use it, so we
+						// actually cause navigation. Otherwise, just trigger
+						// a click event.
 						if ( this.element[ 0 ].click ) {
 							this.element[ 0 ].click();
 						} else {
@@ -292,7 +292,7 @@ $.widget( "ui.button", {
 } );
 
 // DEPRECATED
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Text and Icons options
 	$.widget( "ui.button", $.ui.button, {

data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js

@@ -3,7 +3,7 @@
 //= require jquery-ui/widget
 
 /*!
- * jQuery UI Checkboxradio 1.13.3
+ * jQuery UI Checkboxradio 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -42,7 +42,7 @@
 "use strict";
 
 $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.13.3",
+	version: "1.14.2",
 	options: {
 		disabled: null,
 		label: null,
@@ -160,7 +160,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 	_getRadioGroup: function() {
 		var group;
 		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
+		var nameSelector = "input[name='" + CSS.escape( name ) + "']";
 
 		if ( !name ) {
 			return $( [] );
@@ -172,7 +172,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 			// Not inside a form, check all inputs that also are not inside a form
 			group = $( nameSelector ).filter( function() {
-				return $( this )._form().length === 0;
+				return $( $( this ).prop( "form" ) ).length === 0;
 			} );
 		}
 

data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/widget
 
 /*!
- * jQuery UI Controlgroup 1.13.3
+ * jQuery UI Controlgroup 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -39,7 +39,7 @@
 var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
 
 return $.widget( "ui.controlgroup", {
-	version: "1.13.3",
+	version: "1.14.2",
 	defaultElement: "<div>",
 	options: {
 		direction: "horizontal",

data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js

@@ -1,9 +1,9 @@
 //= require jquery-ui/version
 //= require jquery-ui/keycode
 
-/* eslint-disable max-len, camelcase */
+/* eslint-disable max-len */
 /*!
- * jQuery UI Datepicker 1.13.3
+ * jQuery UI Datepicker 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -39,7 +39,7 @@
 } )( function( $ ) {
 "use strict";
 
-$.extend( $.ui, { datepicker: { version: "1.13.3" } } );
+$.extend( $.ui, { datepicker: { version: "1.14.2" } } );
 
 var datepicker_instActive;
 
@@ -438,6 +438,7 @@ $.extend( Datepicker.prototype, {
 			$target.removeClass( this.markerClassName ).empty();
 		}
 
+		$.datepicker._hideDatepicker();
 		if ( datepicker_instActive === inst ) {
 			datepicker_instActive = null;
 			this._curInst = null;
@@ -537,7 +538,7 @@ $.extend( Datepicker.prototype, {
 	_getInst: function( target ) {
 		try {
 			return $.data( target, "datepicker" );
-		} catch ( err ) {
+		} catch ( _err ) {
 			throw "Missing instance data for this datepicker";
 		}
 	},
@@ -770,7 +771,7 @@ $.extend( Datepicker.prototype, {
 					$.datepicker._updateAlternate( inst );
 					$.datepicker._updateDatepicker( inst );
 				}
-			} catch ( err ) {
+			} catch ( _err ) {
 			}
 		}
 		return true;
@@ -913,11 +914,8 @@ $.extend( Datepicker.prototype, {
 		}
 	},
 
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
 	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" );
 	},
 
 	/* Check positioning to remain on screen. */
@@ -974,8 +972,7 @@ $.extend( Datepicker.prototype, {
 				$.datepicker._tidyDialog( inst );
 			};
 
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+			if ( $.effects && ( $.effects.effect[ showAnim ] ) ) {
 				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
 			} else {
 				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
@@ -1546,7 +1543,7 @@ $.extend( Datepicker.prototype, {
 
 		try {
 			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
-		} catch ( event ) {
+		} catch ( _err ) {
 			dates = ( noDefault ? "" : dates );
 		}
 		inst.selectedDay = date.getDate();
@@ -1575,7 +1572,7 @@ $.extend( Datepicker.prototype, {
 				try {
 					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
 						offset, $.datepicker._getFormatConfig( inst ) );
-				} catch ( e ) {
+				} catch ( _e ) {
 
 					// Ignore
 				}
@@ -2236,7 +2233,7 @@ $.fn.datepicker = function( options ) {
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.13.3";
+$.datepicker.version = "1.14.2";
 
 return $.datepicker;
 

data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js

@@ -5,15 +5,13 @@
 //= require jquery-ui/focusable
 //= require jquery-ui/keycode
 //= require jquery-ui/position
-//= require jquery-ui/safe-active-element
-//= require jquery-ui/safe-blur
 //= require jquery-ui/tabbable
 //= require jquery-ui/unique-id
 //= require jquery-ui/version
 //= require jquery-ui/widget
 
 /*!
- * jQuery UI Dialog 1.13.3
+ * jQuery UI Dialog 1.14.2
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -45,8 +43,6 @@
 			"../focusable",
 			"../keycode",
 			"../position",
-			"../safe-active-element",
-			"../safe-blur",
 			"../tabbable",
 			"../unique-id",
 			"../version",
@@ -61,7 +57,7 @@
 "use strict";
 
 $.widget( "ui.dialog", {
-	version: "1.13.3",
+	version: "1.14.2",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -97,6 +93,7 @@ $.widget( "ui.dialog", {
 		resizable: true,
 		show: null,
 		title: null,
+		uiDialogTitleHeadingLevel: 0,
 		width: 300,
 
 		// Callbacks
@@ -243,7 +240,7 @@ $.widget( "ui.dialog", {
 			// Hiding a focused element doesn't trigger blur in WebKit
 			// so in case we have nothing to focus on, explicitly blur the active element
 			// https://bugs.webkit.org/show_bug.cgi?id=47182
-			$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
+			$( this.document[ 0 ].activeElement ).trigger( "blur" );
 		}
 
 		this._hide( this.uiDialog, this.options.hide, function() {
@@ -287,7 +284,7 @@ $.widget( "ui.dialog", {
 		}
 
 		this._isOpen = true;
-		this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+		this.opener = $( this.document[ 0 ].activeElement );
 
 		this._size();
 		this._position();
@@ -343,7 +340,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_restoreTabbableFocus: function() {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+		var activeElement = this.document[ 0 ].activeElement,
 			isActive = this.uiDialog[ 0 ] === activeElement ||
 				$.contains( this.uiDialog[ 0 ], activeElement );
 		if ( !isActive ) {
@@ -354,11 +351,6 @@ $.widget( "ui.dialog", {
 	_keepFocus: function( event ) {
 		event.preventDefault();
 		this._restoreTabbableFocus();
-
-		// support: IE
-		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
-		// so we check again later
-		this._delay( this._restoreTabbableFocus );
 	},
 
 	_createWrapper: function() {
@@ -368,7 +360,8 @@ $.widget( "ui.dialog", {
 
 				// Setting tabIndex makes the div focusable
 				tabIndex: -1,
-				role: "dialog"
+				role: "dialog",
+				"aria-modal": this.options.modal ? "true" : null
 			} )
 			.appendTo( this._appendTo() );
 
@@ -441,9 +434,6 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		// Support: IE
-		// Use type="button" to prevent enter keypresses in textboxes from closing the
-		// dialog in IE (#9312)
 		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
 			.button( {
 				label: $( "<a>" ).text( this.options.closeText ).html(),
@@ -460,7 +450,13 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		uiDialogTitle = $( "<span>" ).uniqueId().prependTo( this.uiDialogTitlebar );
+		var uiDialogHeadingLevel = Number.isInteger( this.options.uiDialogTitleHeadingLevel ) &&
+			this.options.uiDialogTitleHeadingLevel > 0 &&
+			this.options.uiDialogTitleHeadingLevel <= 6 ?
+			"h" + this.options.uiDialogTitleHeadingLevel : "span";
+
+		uiDialogTitle = $( "<" + uiDialogHeadingLevel + ">" )
+			.uniqueId().prependTo( this.uiDialogTitlebar );
 		this._addClass( uiDialogTitle, "ui-dialog-title" );
 		this._title( uiDialogTitle );
 
@@ -786,6 +782,10 @@ $.widget( "ui.dialog", {
 		if ( key === "title" ) {
 			this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
 		}
+
+		if ( key === "modal" ) {
+			uiDialog.attr( "aria-modal", value ? "true" : null );
+		}
 	},
 
 	_size: function() {
@@ -871,8 +871,6 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
-		var jqMinor = $.fn.jquery.substring( 0, 4 );
-
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
@@ -894,18 +892,6 @@ $.widget( "ui.dialog", {
 				if ( !instance._allowInteraction( event ) ) {
 					event.preventDefault();
 					instance._focusTabbable();
-
-					// Support: jQuery >=3.4 <3.7 only
-					// In jQuery 3.4-3.6, there are multiple issues with focus/blur
-					// trigger chains or when triggering is done on a hidden element
-					// at least once.
-					// Trigger focus in a delay in addition if needed to avoid the issues.
-					// See https://github.com/jquery/jquery/issues/4382
-					// See https://github.com/jquery/jquery/issues/4856
-					// See https://github.com/jquery/jquery/issues/4950
-					if ( jqMinor === "3.4." || jqMinor === "3.5." || jqMinor === "3.6." ) {
-						instance._delay( instance._restoreTabbableFocus );
-					}
 				}
 			}.bind( this ) );
 		}
@@ -944,7 +930,7 @@ $.widget( "ui.dialog", {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for dialogClass option
 	$.widget( "ui.dialog", $.ui.dialog, {