Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-13 01:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a disableDirtyFormCheck function so we're not relying on sharing variables between scripts

Browse source
This commit is contained in:
Matt Westcott 2016-04-28 13:08:27 +01:00
parent cc7e6196c5
commit 4c96595d90
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js
View file

@ -53,7 +53,7 @@ function initTagField(id, autocompleteUrl) {
* prompting the user even when nothing has been changed.
*/
var canDirtyFormCheck = true;
var dirtyFormCheckIsActive = true;
function enableDirtyFormCheck(formSelector, options) {
var $form = $(formSelector);
@ -75,17 +75,17 @@ function enableDirtyFormCheck(formSelector, options) {
}
});
if (!canDirtyFormCheck) {
triggeredByIgnoredButton = true;
}
if (canDirtyFormCheck && !triggeredByIgnoredButton && (alwaysDirty || $form.serialize() != initialData)) {
if (dirtyFormCheckIsActive && !triggeredByIgnoredButton && (alwaysDirty || $form.serialize() != initialData)) {
event.returnValue = confirmationMessage;
return confirmationMessage;
}
});
}
function disableDirtyFormCheck() {
dirtyFormCheckIsActive = false;
}
$(function() {
// Add class to the body from which transitions may be hung so they don't appear to transition as the page loads
$('body').addClass('ready');

4
wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js
View file

@ -366,13 +366,13 @@ function initCollapsibleBlocks() {
function initKeyboardShortcuts() {
Mousetrap.bind(['mod+p'], function(e) {
canDirtyFormCheck = false;
disableDirtyFormCheck();
$('.action-preview').trigger('click');
return false;
});
Mousetrap.bind(['mod+s'], function(e) {
canDirtyFormCheck = false;
disableDirtyFormCheck();
$('.action-save').trigger('click');
return false;
});