diff --git a/core/modules/outside_in/js/offcanvas.js b/core/modules/outside_in/js/offcanvas.js index 8c73b2c..849e3df 100644 --- a/core/modules/outside_in/js/offcanvas.js +++ b/core/modules/outside_in/js/offcanvas.js @@ -7,11 +7,12 @@ 'use strict'; + var edge = (document.documentElement.dir === 'rtl') ? 'left' : 'right'; + function resetSize(event) { var offsets = displace.offsets; var $element = event.data.$element; var $widget = $element.dialog('widget'); - var edge = getEdge(); var adjustedOptions = { position: { @@ -49,18 +50,8 @@ $element.height(modalHeight - offset - scrollOffset); } - /** - * Determine on which screen edge the tray should appear. - * - * @returns {string} - * 'left' or 'right' - */ - function getEdge() { - return (document.documentElement.dir === 'rtl') ? 'left' : 'right'; - } function bodyPadding(event) { - var edge = getEdge(); var $element = event.data.$element; var $widget = $element.dialog('widget'); var $body = $('body'); @@ -85,7 +76,7 @@ .on('dialogContentResize.outsidein', eventData, handleDialogResize) .trigger('dialogresize.outsidein'); - $element.dialog('widget').attr('data-offset-' + getEdge(), ''); + $element.dialog('widget').attr('data-offset-' + edge, ''); $(window) .on('resize.outsidein scroll.outsidein', eventData, debounce(resetSize, 100)) @@ -96,7 +87,6 @@ }, 'dialog:beforecreate': function (event, dialog, $element, settings) { if ($element.is('#drupal-offcanvas')) { - var edge = getEdge(); settings.position = { my: 'left top', at: edge + ' top', @@ -108,7 +98,7 @@ 'dialog:beforeclose': function (event, dialog, $element) { $(document).off('.outsidein'); $(window).off('.outsidein'); - $('body').css('padding-' + getEdge(), 0); + $('body').css('padding-' + edge, 0); } }); diff --git a/core/modules/outside_in/outside_in.libraries.yml b/core/modules/outside_in/outside_in.libraries.yml index 8787d77..0b704af 100644 --- a/core/modules/outside_in/outside_in.libraries.yml +++ b/core/modules/outside_in/outside_in.libraries.yml @@ -10,6 +10,7 @@ drupal.outside_in: dependencies: - core/jquery - core/drupal + - core/drupal.ajax drupal.off_canvas: version: VERSION js: diff --git a/core/modules/outside_in/tests/modules/offcanvas_test/src/Controller/TestController.php b/core/modules/outside_in/tests/modules/offcanvas_test/src/Controller/TestController.php index 8a2f115..269158a 100644 --- a/core/modules/outside_in/tests/modules/offcanvas_test/src/Controller/TestController.php +++ b/core/modules/outside_in/tests/modules/offcanvas_test/src/Controller/TestController.php @@ -54,7 +54,7 @@ public function linksDisplay() { ], '#attached' => [ 'library' => [ - 'outside_in/drupal.off_canvas', + 'outside_in/drupal.outside_in', ], ], ], @@ -69,7 +69,7 @@ public function linksDisplay() { ], '#attached' => [ 'library' => [ - 'outside_in/drupal.off_canvas', + 'outside_in/drupal.outside_in', ], ], ],