Issue #1440662 by bdone, marthinal, nod_, sun, rteijeiro, rak2008 | jenlampton: Fixed UX regression: Prevent links in node preview from being clicked.
parent
1a1d3d4759
commit
c2070f103e
|
@ -8,16 +8,41 @@
|
||||||
*/
|
*/
|
||||||
Drupal.behaviors.nodePreviewDestroyLinks = {
|
Drupal.behaviors.nodePreviewDestroyLinks = {
|
||||||
attach: function (context) {
|
attach: function (context) {
|
||||||
var $preview = $(context).find('.page-node-preview').once('node-preview');
|
|
||||||
if ($preview.length) {
|
function clickPreviewModal(event) {
|
||||||
$preview.on('click.preview', 'a:not([href^=#], #edit-backlink, #toolbar-administration a)', function (e) {
|
// Only confirm leaving previews when left-clicking and user is not
|
||||||
e.preventDefault();
|
// 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) {
|
||||||
|
event.preventDefault();
|
||||||
|
var $previewDialog = $('<div>' + Drupal.theme('nodePreviewModal') + '</div>').appendTo('body');
|
||||||
|
Drupal.dialog($previewDialog, {
|
||||||
|
title: Drupal.t('Leave preview?'),
|
||||||
|
buttons: [
|
||||||
|
{
|
||||||
|
text: Drupal.t('Cancel'),
|
||||||
|
click: function () {
|
||||||
|
$(this).dialog('close');
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
text: Drupal.t('Leave preview'),
|
||||||
|
click: function () {
|
||||||
|
window.top.location.href = event.target.href;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).showModal();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var $preview = $(context).find('.content').once('node-preview');
|
||||||
|
if ($(context).find('.node-preview-container').length) {
|
||||||
|
$preview.on('click.preview', 'a:not([href^=#], #edit-backlink, #toolbar-administration a)', clickPreviewModal);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
detach: function (context, settings, trigger) {
|
detach: function (context, settings, trigger) {
|
||||||
if (trigger === 'unload') {
|
if (trigger === 'unload') {
|
||||||
var $preview = $(context).find('.page-node-preview').removeOnce('node-preview');
|
var $preview = $(context).find('.content').removeOnce('node-preview');
|
||||||
if ($preview.length) {
|
if ($preview.length) {
|
||||||
$preview.off('click.preview');
|
$preview.off('click.preview');
|
||||||
}
|
}
|
||||||
|
@ -32,11 +57,18 @@
|
||||||
attach: function (context) {
|
attach: function (context) {
|
||||||
var $autosubmit = $(context).find('[data-drupal-autosubmit]').once('autosubmit');
|
var $autosubmit = $(context).find('[data-drupal-autosubmit]').once('autosubmit');
|
||||||
if ($autosubmit.length) {
|
if ($autosubmit.length) {
|
||||||
$autosubmit.on('formUpdated.preview', function() {
|
$autosubmit.on('formUpdated.preview', function () {
|
||||||
$(this.form).trigger('submit');
|
$(this.form).trigger('submit');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
Loading…
Reference in New Issue