From 5a2836bf39e76568731117df3d05c9345dee9406 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 23 Oct 2018 15:12:44 -0700 Subject: Revert "Easier closing of dialogs" (introduces regression on date time picker) This reverts commit 71630aaa77b518d3d0165f772251f09cc249f015. --- assets/js/components/board-task-click.js | 2 +- assets/js/components/keyboard-shortcuts.js | 12 ++++++------ assets/js/components/modal.js | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'assets/js/components') diff --git a/assets/js/components/board-task-click.js b/assets/js/components/board-task-click.js index c5b1a146..a8c193ed 100644 --- a/assets/js/components/board-task-click.js +++ b/assets/js/components/board-task-click.js @@ -20,7 +20,7 @@ var url = KB.dom(baseElement).data('url'); if (url) { - KB.modal.open(url, 'medium', true); + KB.modal.open(url, 'medium', false); } } diff --git a/assets/js/components/keyboard-shortcuts.js b/assets/js/components/keyboard-shortcuts.js index 194beb7f..02d62119 100644 --- a/assets/js/components/keyboard-shortcuts.js +++ b/assets/js/components/keyboard-shortcuts.js @@ -27,7 +27,7 @@ KB.keyboardShortcuts = function () { KB.onKey('?', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('body').data('keyboardShortcutUrl'), '', true); + KB.modal.open(KB.find('body').data('keyboardShortcutUrl')); } }); @@ -62,7 +62,7 @@ KB.keyboardShortcuts = function () { KB.onKey('n', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('#board').data('taskCreationUrl'), 'large', true); + KB.modal.open(KB.find('#board').data('taskCreationUrl'), 'large', false); } }); } @@ -70,25 +70,25 @@ KB.keyboardShortcuts = function () { if (KB.exists('#task-view')) { KB.onKey('e', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('#task-view').data('editUrl'), 'large', true); + KB.modal.open(KB.find('#task-view').data('editUrl'), 'large', false); } }); KB.onKey('c', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('#task-view').data('commentUrl'), 'medium', true); + KB.modal.open(KB.find('#task-view').data('commentUrl'), 'medium', false); } }); KB.onKey('s', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('#task-view').data('subtaskUrl'), 'medium', true); + KB.modal.open(KB.find('#task-view').data('subtaskUrl'), 'medium', false); } }); KB.onKey('l', function () { if (! KB.modal.isOpen()) { - KB.modal.open(KB.find('#task-view').data('internalLinkUrl'), 'medium', true); + KB.modal.open(KB.find('#task-view').data('internalLinkUrl'), 'medium', false); } }); } diff --git a/assets/js/components/modal.js b/assets/js/components/modal.js index e0a344b5..c415988e 100644 --- a/assets/js/components/modal.js +++ b/assets/js/components/modal.js @@ -8,23 +8,23 @@ } KB.onClick('.js-modal-large', function (e) { - KB.modal.open(getLink(e), 'large', true); + KB.modal.open(getLink(e), 'large', false); }); KB.onClick('.js-modal-medium', function (e) { if (KB.modal.isOpen()) { KB.modal.replace(getLink(e)); } else { - KB.modal.open(getLink(e), 'medium', true); + KB.modal.open(getLink(e), 'medium', false); } }); KB.onClick('.js-modal-small', function (e) { - KB.modal.open(getLink(e), 'small', true); + KB.modal.open(getLink(e), 'small', false); }); KB.onClick('.js-modal-confirm', function (e) { - KB.modal.open(getLink(e), 'small', true); + KB.modal.open(getLink(e), 'small'); }); KB.onClick('.js-modal-close', function () { -- cgit v1.2.3