diff options
Diffstat (limited to 'core/misc/dialog/dialog.position.js')
-rw-r--r-- | core/misc/dialog/dialog.position.js | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/core/misc/dialog/dialog.position.js b/core/misc/dialog/dialog.position.js index 843bf3b249ef..552e1c596f9f 100644 --- a/core/misc/dialog/dialog.position.js +++ b/core/misc/dialog/dialog.position.js @@ -6,17 +6,19 @@ **/ (function ($, Drupal, drupalSettings, debounce, displace) { - drupalSettings.dialog = $.extend({ autoResize: true, maxHeight: '95%' }, drupalSettings.dialog); + drupalSettings.dialog = $.extend({ + autoResize: true, + maxHeight: '95%' + }, drupalSettings.dialog); function resetPosition(options) { var offsets = displace.offsets; var left = offsets.left - offsets.right; var top = offsets.top - offsets.bottom; - - var leftString = (left > 0 ? '+' : '-') + Math.abs(Math.round(left / 2)) + 'px'; - var topString = (top > 0 ? '+' : '-') + Math.abs(Math.round(top / 2)) + 'px'; + var leftString = "".concat((left > 0 ? '+' : '-') + Math.abs(Math.round(left / 2)), "px"); + var topString = "".concat((top > 0 ? '+' : '-') + Math.abs(Math.round(top / 2)), "px"); options.position = { - my: 'center' + (left !== 0 ? leftString : '') + ' center' + (top !== 0 ? topString : ''), + my: "center".concat(left !== 0 ? leftString : '', " center").concat(top !== 0 ? topString : ''), of: window }; return options; @@ -26,12 +28,14 @@ var positionOptions = ['width', 'height', 'minWidth', 'minHeight', 'maxHeight', 'maxWidth', 'position']; var adjustedOptions = {}; var windowHeight = $(window).height(); - var option = void 0; - var optionValue = void 0; - var adjustedValue = void 0; + var option; + var optionValue; + var adjustedValue; + for (var n = 0; n < positionOptions.length; n++) { option = positionOptions[n]; optionValue = event.data.settings[option]; + if (optionValue) { if (typeof optionValue === 'string' && /%$/.test(optionValue) && /height/i.test(option)) { windowHeight -= displace.offsets.top + displace.offsets.bottom; @@ -40,6 +44,7 @@ if (option === 'height' && event.data.$element.parent().outerHeight() < adjustedValue) { adjustedValue = 'auto'; } + adjustedOptions[option] = adjustedValue; } } @@ -48,15 +53,23 @@ if (!event.data.settings.modal) { adjustedOptions = resetPosition(adjustedOptions); } + event.data.$element.dialog('option', adjustedOptions).trigger('dialogContentResize'); } $(window).on({ 'dialog:aftercreate': function dialogAftercreate(event, dialog, $element, settings) { var autoResize = debounce(resetSize, 20); - var eventData = { settings: settings, $element: $element }; + var eventData = { + settings: settings, + $element: $element + }; + if (settings.autoResize === true || settings.autoResize === 'true') { - $element.dialog('option', { resizable: false, draggable: false }).dialog('widget').css('position', 'fixed'); + $element.dialog('option', { + resizable: false, + draggable: false + }).dialog('widget').css('position', 'fixed'); $(window).on('resize.dialogResize scroll.dialogResize', eventData, autoResize).trigger('resize.dialogResize'); $(document).on('drupalViewportOffsetChange.dialogResize', eventData, autoResize); } |