Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merged 9.2.11.

merge-requests/460/merge
xjm 2022-01-18 18:14:15 -06:00
parent 3a14d1cbc1 0733164abe
commit df8f0cebe3
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/vendor/jquery.ui/ui/position-min.js vendored
View File

File diff suppressed because one or more lines are too long

7
core/assets/vendor/jquery.ui/ui/position.js vendored
View File

@ -144,7 +144,12 @@ $.fn.position = function( options ) {
options = $.extend( {}, options ); options = $.extend( {}, options );
var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions, var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
target = $( options.of ),
// Make sure string options are treated as CSS selectors
target = typeof options.of === "string" ?
$( document ).find( options.of ) :
$( options.of ),
within = $.position.getWithinInfo( options.within ), within = $.position.getWithinInfo( options.within ),
scrollInfo = $.position.getScrollInfo( within ), scrollInfo = $.position.getScrollInfo( within ),
collision = ( options.collision || "flip" ).split( " " ), collision = ( options.collision || "flip" ).split( " " ),

6
core/misc/position.es6.js
View File

@ -434,7 +434,11 @@
const collision = (options.collision || 'flip').split(' '); const collision = (options.collision || 'flip').split(' ');
const offsets = {}; const offsets = {};
const target = $(options.of); // Make sure string options are treated as CSS selectors
const target =
typeof options.of === 'string'
? $(document).find(options.of)
: $(options.of);
const dimensions = getDimensions(target); const dimensions = getDimensions(target);
const targetWidth = dimensions.width; const targetWidth = dimensions.width;
const targetHeight = dimensions.height; const targetHeight = dimensions.height;

2
core/misc/position.js
View File

@ -266,7 +266,7 @@
var scrollInfo = $.position.getScrollInfo(within); var scrollInfo = $.position.getScrollInfo(within);
var collision = (options.collision || 'flip').split(' '); var collision = (options.collision || 'flip').split(' ');
var offsets = {}; var offsets = {};
var target = $(options.of); var target = typeof options.of === 'string' ? $(document).find(options.of) : $(options.of);
var dimensions = getDimensions(target); var dimensions = getDimensions(target);
var targetWidth = dimensions.width; var targetWidth = dimensions.width;
var targetHeight = dimensions.height; var targetHeight = dimensions.height;