updated core to 8.6.1 via composer

This commit is contained in:
2018-09-12 13:58:26 +02:00
parent a9a219f2ed
commit ea56b9fba3
4443 changed files with 112098 additions and 40708 deletions
+33 -15
View File
@@ -3,7 +3,7 @@
* Preview behaviors.
*/
(function ($, Drupal) {
(function($, Drupal) {
/**
* Disables all non-relevant links in node previews.
*
@@ -23,9 +23,17 @@
// Only confirm leaving previews when left-clicking and user is not
// pressing the ALT, CTRL, META (Command key on the Macintosh keyboard)
// or SHIFT key.
if (event.button === 0 && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
if (
event.button === 0 &&
!event.altKey &&
!event.ctrlKey &&
!event.metaKey &&
!event.shiftKey
) {
event.preventDefault();
const $previewDialog = $(`<div>${Drupal.theme('nodePreviewModal')}</div>`).appendTo('body');
const $previewDialog = $(
`<div>${Drupal.theme('nodePreviewModal')}</div>`,
).appendTo('body');
Drupal.dialog($previewDialog, {
title: Drupal.t('Leave preview?'),
buttons: [
@@ -34,7 +42,8 @@
click() {
$(this).dialog('close');
},
}, {
},
{
text: Drupal.t('Leave preview'),
click() {
window.top.location.href = event.target.href;
@@ -45,14 +54,20 @@
}
}
const $preview = $(context).find('.content').once('node-preview');
const $preview = $(context).once('node-preview');
if ($(context).find('.node-preview-container').length) {
$preview.on('click.preview', 'a:not([href^=#], #edit-backlink, #toolbar-administration a)', clickPreviewModal);
$preview.on(
'click.preview',
'a:not([href^="#"], .node-preview-container a)',
clickPreviewModal,
);
}
},
detach(context, settings, trigger) {
if (trigger === 'unload') {
const $preview = $(context).find('.content').removeOnce('node-preview');
const $preview = $(context)
.find('.content')
.removeOnce('node-preview');
if ($preview.length) {
$preview.off('click.preview');
}
@@ -70,9 +85,11 @@
*/
Drupal.behaviors.nodePreviewSwitchViewMode = {
attach(context) {
const $autosubmit = $(context).find('[data-drupal-autosubmit]').once('autosubmit');
const $autosubmit = $(context)
.find('[data-drupal-autosubmit]')
.once('autosubmit');
if ($autosubmit.length) {
$autosubmit.on('formUpdated.preview', function () {
$autosubmit.on('formUpdated.preview', function() {
$(this.form).trigger('submit');
});
}
@@ -85,10 +102,11 @@
* @return {string}
* Markup for the node preview modal.
*/
Drupal.theme.nodePreviewModal = function () {
return `<p>${
Drupal.t('Leaving the preview will cause unsaved changes to be lost. Are you sure you want to leave the preview?')
}</p><small class="description">${
Drupal.t('CTRL+Left click will prevent this dialog from showing and proceed to the clicked link.')}</small>`;
Drupal.theme.nodePreviewModal = function() {
return `<p>${Drupal.t(
'Leaving the preview will cause unsaved changes to be lost. Are you sure you want to leave the preview?',
)}</p><small class="description">${Drupal.t(
'CTRL+Left click will prevent this dialog from showing and proceed to the clicked link.',
)}</small>`;
};
}(jQuery, Drupal));
})(jQuery, Drupal);