aboutsummaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2023-03-22 09:37:37 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2023-03-22 09:37:37 +0000
commit0bd0f8200b231802c9ae262b4472d119a8286bf9 (patch)
tree913915cd6ce4f7942f33ea44336fcb918da30af4 /resources
parent51538dfe487dbd304ffac11d2351dd7364f29476 (diff)
remove STUDIP.Dialogs and refactor current usage with STUDIP.Dialog, fixes #1001
Closes #1001 Merge request studip/studip!1580
Diffstat (limited to 'resources')
-rw-r--r--resources/assets/javascripts/init.js2
-rw-r--r--resources/assets/javascripts/lib/admission.js2
-rw-r--r--resources/assets/javascripts/lib/dialogs.js31
-rw-r--r--resources/assets/javascripts/lib/user_filter.js2
4 files changed, 0 insertions, 37 deletions
diff --git a/resources/assets/javascripts/init.js b/resources/assets/javascripts/init.js
index f7c3dda..68ed726 100644
--- a/resources/assets/javascripts/init.js
+++ b/resources/assets/javascripts/init.js
@@ -20,7 +20,6 @@ import createURLHelper from './lib/url_helper.js';
import CSS from './lib/css.js';
import Dates from './lib/dates.js';
import Dialog from './lib/dialog.js';
-import Dialogs from './lib/dialogs.js';
import DragAndDropUpload from './lib/drag_and_drop_upload.js';
import enrollment from './lib/enrollment.js';
import eventBus from './lib/event-bus.js';
@@ -107,7 +106,6 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
CSS,
Dates,
Dialog,
- Dialogs,
DragAndDropUpload,
enrollment,
eventBus,
diff --git a/resources/assets/javascripts/lib/admission.js b/resources/assets/javascripts/lib/admission.js
index 288fa97..7cf8c88 100644
--- a/resources/assets/javascripts/lib/admission.js
+++ b/resources/assets/javascripts/lib/admission.js
@@ -3,7 +3,6 @@
* ------------------------------------------------------------------------ */
import { $gettext } from './gettext.js';
import Dialog from './dialog.js';
-import Dialogs from './dialogs.js';
const Admission = {
getCourses: function(targetUrl) {
@@ -100,7 +99,6 @@ const Admission = {
var norules = $gettext('Sie haben noch keine Anmelderegeln festgelegt.');
$('#' + containerId).prepend('<span id="norules">' + '<i>' + norules + '</i></span>');
}
- Dialogs.closeConfirmDialog();
Admission.toggleNotSavedAlert();
},
diff --git a/resources/assets/javascripts/lib/dialogs.js b/resources/assets/javascripts/lib/dialogs.js
deleted file mode 100644
index 88d1f60..0000000
--- a/resources/assets/javascripts/lib/dialogs.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ------------------------------------------------------------------------
- * Standard dialogs for confirmation or messages
- * ------------------------------------------------------------------------ */
-
-const Dialogs = {
- showConfirmDialog: function(question, confirm) {
- // compile template
- var getTemplate = _.memoize(function(name) {
- return _.template(jQuery('#' + name).html());
- });
-
- var confirmDialog = getTemplate('confirm_dialog');
- $('body').append(
- confirmDialog({
- question: question,
- confirm: confirm
- })
- );
-
- //Set the focus inside the confirm dialog:
- $(confirmDialog).find(':focusable').first().focus();
-
- return false;
- },
-
- closeConfirmDialog: function() {
- $('div.modaloverlay').remove();
- }
-};
-
-export default Dialogs;
diff --git a/resources/assets/javascripts/lib/user_filter.js b/resources/assets/javascripts/lib/user_filter.js
index b104152..450af34 100644
--- a/resources/assets/javascripts/lib/user_filter.js
+++ b/resources/assets/javascripts/lib/user_filter.js
@@ -3,7 +3,6 @@
* ------------------------------------------------------------------------ */
import { $gettext } from './gettext.js';
import Dialog from './dialog.js';
-import Dialogs from './dialogs.js';
const UserFilter = {
new_group_nr: 1,
@@ -157,7 +156,6 @@ const UserFilter = {
removeConditionField: function(element) {
element.remove();
- Dialogs.closeConfirmDialog();
return false;
},