Merge pull request #3685 from Simpler1/shift-delete-event
feat(event): Shift delete with no confirmpull/3688/head
commit
7b3a613474
|
@ -1193,18 +1193,26 @@ function initPage() {
|
|||
}
|
||||
|
||||
evt.preventDefault();
|
||||
if (!$j('#deleteConfirm').length) {
|
||||
// Load the delete confirmation modal into the DOM
|
||||
$j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
|
||||
.done(function(data) {
|
||||
insertModalHtml('deleteConfirm', data.html);
|
||||
manageDelConfirmModalBtns();
|
||||
$j('#deleteConfirm').modal('show');
|
||||
})
|
||||
.fail(logAjaxFail);
|
||||
return;
|
||||
if (window.event.shiftKey) {
|
||||
$j.getJSON(thisUrl + '?request=event&action=delete&id='+eventData.Id)
|
||||
.done(function(data) {
|
||||
streamNext(true);
|
||||
})
|
||||
.fail(logAjaxFail);
|
||||
} else {
|
||||
if (!$j('#deleteConfirm').length) {
|
||||
// Load the delete confirmation modal into the DOM
|
||||
$j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
|
||||
.done(function(data) {
|
||||
insertModalHtml('deleteConfirm', data.html);
|
||||
manageDelConfirmModalBtns();
|
||||
$j('#deleteConfirm').modal('show');
|
||||
})
|
||||
.fail(logAjaxFail);
|
||||
return;
|
||||
}
|
||||
$j('#deleteConfirm').modal('show');
|
||||
}
|
||||
$j('#deleteConfirm').modal('show');
|
||||
});
|
||||
document.addEventListener('fullscreenchange', fullscreenChangeEvent);
|
||||
} // end initPage
|
||||
|
|
Loading…
Reference in New Issue