AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Easier closing of dialogs" (introduces regression on date time picker)

Browse Source 
This reverts commit 71630aaa77.
This commit is contained in:
Frédéric Guillot
2018-10-23 15:12:44 -07:00
parent 2deb6cc917
commit 5a2836bf39
7 changed files with 18 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/components/board-task-click.js
View File

@@ -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);
}
}

12
assets/js/components/keyboard-shortcuts.js
View File

@@ -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);
}
});
}

8
assets/js/components/modal.js
View File

@@ -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 () {