From 313655e38720440e32c4fa9ee8a8220f21c31746 Mon Sep 17 00:00:00 2001 From: Michael Hulse Date: Wed, 14 Feb 2024 15:11:37 -0800 Subject: [PATCH] add jquery ui dialog options to each instance Each instance of the jQuery UI dialog will now incorporate specific options that were previously implemented through custom modifications to the source code. This update aims to streamline our codebase by directly applying critical customizations, such as z-index and modal type, to the instantiation calls themselves. By doing so, we eliminate the need to maintain separate versions of the library source code with one-off modifications. This commit adds z-index and modal type that were missed in a previous commit 240e7d731490575580830d667edfea44697f63ba refs FOO-4258 flag=none test plan: tests pass [skip-crystalball] Change-Id: I6bfc4db349ee21874db86c69064c5fc4862338fa Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/340547 Tested-by: Service Cloud Jenkins QA-Review: Michael Hulse Product-Review: Michael Hulse Reviewed-by: Angela Gomba --- spec/coffeescripts/CollaborationsSpec.js | 2 + .../jquery/fixDialogButtonsSpec.js | 5 +- .../jquery/jqueryUiUnpatchedDialogSpec.js | 7 ++- spec/selenium/miscellaneous/jquery_ui_spec.rb | 52 +++++++++++++++---- .../initializers/activateElementToggler.js | 2 + .../warnOnIncompleteRegistration.js | 2 + .../backbone/views/TurnitinSettingsDialog.js | 1 + .../jquery/EditAppointmentGroupDetails.js | 2 + .../jquery/EditApptCalendarEventDialog.js | 2 + .../jquery/ShowEventDetailsDialog.jsx | 2 + ui/features/calendar/jquery/sidebar.jsx | 1 + .../backbone/views/CollaborationView.js | 2 +- .../backbone/views/ConferenceView.jsx | 2 + .../backbone/views/MessageFormDialog.js | 2 + .../views/SubmissionCommentFormDialog.js | 2 + .../files/react/components/Toolbar.jsx | 3 +- .../backbone/views/OutcomeDetailView.js | 2 + .../backbone/views/OutcomeDialogView.js | 2 + .../react/SISGradePassback/PostGradesApp.tsx | 2 + .../ReuploadSubmissionsDialogManager.ts | 1 + ui/features/quizzes/jquery/quizzes.js | 3 ++ ui/features/registration/jquery/index.js | 1 + .../roster/backbone/views/EditRolesView.js | 2 + .../roster/backbone/views/EditSectionsView.js | 2 + .../roster/backbone/views/InvitationsView.js | 2 + .../backbone/views/LinkToStudentsView.js | 2 + ...ic_submission_download_dialog_component.js | 5 +- .../jquery/AssignmentMuter.js | 2 + .../views/AssignmentGroupCreateDialog.js | 1 + .../backbone/views/GradingTypeSelector.jsx | 4 ++ .../jquery/MessageParticipantsDialog.js | 2 + ui/shared/context-modules/jquery/index.jsx | 3 ++ .../views/ExternalContentReturnView.js | 2 + ui/shared/media-comments/jquery/index.js | 1 + .../media-comments/jquery/mediaComment.js | 1 + .../mediaelement/UploadMediaTrackForm.jsx | 2 + .../outcomes/backbone/views/FindDialog.js | 2 + .../content-view/backbone/views/index.js | 2 + .../RelockModulesDialog.js | 2 + ui/shared/signup-dialog/jquery/index.js | 2 + 40 files changed, 124 insertions(+), 15 deletions(-) diff --git a/spec/coffeescripts/CollaborationsSpec.js b/spec/coffeescripts/CollaborationsSpec.js index aefdf0f29bc..78f77da7b0b 100644 --- a/spec/coffeescripts/CollaborationsSpec.js +++ b/spec/coffeescripts/CollaborationsSpec.js @@ -33,6 +33,8 @@ QUnit.module('Collaborations', { width: 550, height: 500, resizable: false, + modal: true, + zIndex: 1000, }) const dom = $('
') dom.append(dialog) diff --git a/spec/coffeescripts/jquery/fixDialogButtonsSpec.js b/spec/coffeescripts/jquery/fixDialogButtonsSpec.js index a133fe1704e..eb2e66930c8 100644 --- a/spec/coffeescripts/jquery/fixDialogButtonsSpec.js +++ b/spec/coffeescripts/jquery/fixDialogButtonsSpec.js @@ -48,7 +48,10 @@ test('handles buttons', function () { `) .appendTo('#fixtures') - .dialog() + .dialog({ + modal: true, + zIndex: 1000, + }) .fixDialogButtons() ok($dialog.is(':ui-dialog:visible'), 'pops up dialog') equal($dialog.dialog('option', 'buttons').length, 2, 'converts both buttons in .button-pane only') diff --git a/spec/coffeescripts/jquery/jqueryUiUnpatchedDialogSpec.js b/spec/coffeescripts/jquery/jqueryUiUnpatchedDialogSpec.js index 2130193830e..d579cc43bb3 100644 --- a/spec/coffeescripts/jquery/jqueryUiUnpatchedDialogSpec.js +++ b/spec/coffeescripts/jquery/jqueryUiUnpatchedDialogSpec.js @@ -43,7 +43,10 @@ QUnit.module('Dialog Widget', { QUnit.test('Dialog widget is initialized', function (assert) { // Arrange const $dialog = $('#test-dialog') - $dialog.dialog() + $dialog.dialog({ + modal: true, + zIndex: 1000, + }) // Act $dialog.dialog('open') // Open the dialog @@ -67,6 +70,8 @@ QUnit.test('Open and Close events are triggered', async function (assert) { ok(openTriggered, 'dialog on open was not called') done() }, + modal: true, + zIndex: 1000, }) $dialog.dialog('open') // Open the dialog diff --git a/spec/selenium/miscellaneous/jquery_ui_spec.rb b/spec/selenium/miscellaneous/jquery_ui_spec.rb index bd031fea9f9..22f17ebdf84 100644 --- a/spec/selenium/miscellaneous/jquery_ui_spec.rb +++ b/spec/selenium/miscellaneous/jquery_ui_spec.rb @@ -35,7 +35,10 @@ describe "jquery ui" do def create_simple_modal driver.execute_script(<<~JS) $('
') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .find('select') .focus() JS @@ -48,14 +51,20 @@ describe "jquery ui" do it "makes dialogs modal by default" do expect(driver.execute_script(<<~JS)).to be true - return $('
').dialog().dialog('option', 'modal'); + return $('
').dialog({ + modal: true, + zIndex: 1000 + }).dialog('option', 'modal'); JS expect(f(".ui-widget-overlay")).to be_displayed # make sure that hiding then showing the same dialog again, it still looks modal expect(driver.execute_script(<<~JS)).to be true return $('
') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .dialog('close') .dialog('open') .dialog('option', 'modal'); @@ -122,7 +131,10 @@ describe "jquery ui" do title = "this is the title" expect(driver.execute_script(<<~JS)).to eq title return $('
hello
') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .parent('.ui-dialog') .find('.ui-dialog-title') .text(); @@ -132,7 +144,10 @@ describe "jquery ui" do it "uses a non-breaking space for empty titles" do expect(driver.execute_script(<<~JS)).to eq "\302\240" return $('
hello
') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .parent('.ui-dialog') .find('.ui-dialog-title') .text(); @@ -140,7 +155,10 @@ describe "jquery ui" do expect(driver.execute_script(<<~JS)).to eq "\302\240" return $('#jqueryui_test') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .dialog('option', 'title', 'foo') .dialog('option', 'title', '') .parent('.ui-dialog') @@ -153,7 +171,11 @@ describe "jquery ui" do title = "this is the title" expect(driver.execute_script(<<~JS)).to eq title return $('
hello again
') - .dialog({title: #{title.inspect}}) + .dialog({ + title: #{title.inspect}, + modal: true, + zIndex: 1000 + }) .parent('.ui-dialog') .find('.ui-dialog-title') .text(); @@ -162,7 +184,10 @@ describe "jquery ui" do new_title = "and now this is the title" expect(driver.execute_script(<<~JS)).to eq new_title return $('#jqueryui_test') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .dialog('option', 'title', #{new_title.inspect}) .parent('.ui-dialog') .find('.ui-dialog-title') @@ -174,7 +199,11 @@ describe "jquery ui" do title = "i want formatting for realz" expect(driver.execute_script(<<~JS)).to eq title return $('
here we go
') - .dialog({title: $(#{title.inspect})}) + .dialog({ + title: $(#{title.inspect}), + modal: true, + zIndex: 1000 + }) .parent('.ui-dialog') .find('.ui-dialog-title') .html(); @@ -183,7 +212,10 @@ describe "jquery ui" do new_title = "i still want formatting" expect(driver.execute_script(<<~JS)).to eq new_title return $('#jqueryui_test') - .dialog() + .dialog({ + modal: true, + zIndex: 1000 + }) .dialog('option', 'title', $(#{new_title.inspect})) .parent('.ui-dialog') .find('.ui-dialog-title') diff --git a/ui/boot/initializers/activateElementToggler.js b/ui/boot/initializers/activateElementToggler.js index bf8c9848839..fd32ce431cb 100644 --- a/ui/boot/initializers/activateElementToggler.js +++ b/ui/boot/initializers/activateElementToggler.js @@ -97,6 +97,8 @@ function toggleRegion($region, showRegion, $trigger) { close() { toggleRegion($region, false) }, + modal: true, + zIndex: 1000, }, dialogOpts ) diff --git a/ui/boot/initializers/warnOnIncompleteRegistration.js b/ui/boot/initializers/warnOnIncompleteRegistration.js index 1264ab7f07c..adf569729e4 100644 --- a/ui/boot/initializers/warnOnIncompleteRegistration.js +++ b/ui/boot/initializers/warnOnIncompleteRegistration.js @@ -37,5 +37,7 @@ if (ENV.INCOMPLETE_REGISTRATION) { class: 'btn-primary', }, ], + modal: true, + zIndex: 1000, }) } diff --git a/ui/features/assignment_edit/backbone/views/TurnitinSettingsDialog.js b/ui/features/assignment_edit/backbone/views/TurnitinSettingsDialog.js index 54c7e0ae791..4cf37939601 100644 --- a/ui/features/assignment_edit/backbone/views/TurnitinSettingsDialog.js +++ b/ui/features/assignment_edit/backbone/views/TurnitinSettingsDialog.js @@ -95,6 +95,7 @@ TurnitinSettingsDialog.prototype.renderEl = function () { .dialog({ width: 'auto', modal: true, + zIndex: 1000, }) .fixDialogButtons() } diff --git a/ui/features/calendar/jquery/EditAppointmentGroupDetails.js b/ui/features/calendar/jquery/EditAppointmentGroupDetails.js index d1ea245ea26..fca0282c2e6 100644 --- a/ui/features/calendar/jquery/EditAppointmentGroupDetails.js +++ b/ui/features/calendar/jquery/EditAppointmentGroupDetails.js @@ -257,6 +257,8 @@ export default class EditAppointmentGroupDetails { return $('#options_help_dialog').dialog({ title: I18n.t('affect_reservations', 'How will this affect reservations?'), width: 400, + modal: true, + zIndex: 1000, }) } diff --git a/ui/features/calendar/jquery/EditApptCalendarEventDialog.js b/ui/features/calendar/jquery/EditApptCalendarEventDialog.js index 68efe9d23e7..9ba32fb5036 100644 --- a/ui/features/calendar/jquery/EditApptCalendarEventDialog.js +++ b/ui/features/calendar/jquery/EditApptCalendarEventDialog.js @@ -50,6 +50,8 @@ export default class EditApptCalendarEventDialog { click: this.save, }, ], + modal: true, + zIndex: 1000, }) this.dialog.submit(event => { event.preventDefault() diff --git a/ui/features/calendar/jquery/ShowEventDetailsDialog.jsx b/ui/features/calendar/jquery/ShowEventDetailsDialog.jsx index 916b1a3a059..cc222c85439 100644 --- a/ui/features/calendar/jquery/ShowEventDetailsDialog.jsx +++ b/ui/features/calendar/jquery/ShowEventDetailsDialog.jsx @@ -122,6 +122,8 @@ export default class ShowEventDetailsDialog { const $dialog = $(reservationOverLimitDialog(error)).dialog({ resizable: false, width: 450, + modal: true, + zIndex: 1000, buttons: error.reschedulable ? [ { diff --git a/ui/features/calendar/jquery/sidebar.jsx b/ui/features/calendar/jquery/sidebar.jsx index 9b41803c663..ef9f7f2ffea 100644 --- a/ui/features/calendar/jquery/sidebar.jsx +++ b/ui/features/calendar/jquery/sidebar.jsx @@ -182,6 +182,7 @@ function setupCalendarFeedsWithSpecialAccessibilityConsiderationsForNVDA() { { autoOpen: false, modal: true, + zIndex: 1000, create: (e, _ui) => { e.target.parentElement.setAttribute( 'aria-labelledby', diff --git a/ui/features/collaborations/backbone/views/CollaborationView.js b/ui/features/collaborations/backbone/views/CollaborationView.js index deae35897a9..61b9fe847d3 100644 --- a/ui/features/collaborations/backbone/views/CollaborationView.js +++ b/ui/features/collaborations/backbone/views/CollaborationView.js @@ -124,8 +124,8 @@ CollaborationView.prototype.confirmGoogleDocsDelete = function () { return $dialog.dialog({ title: I18n.t('titles.delete', 'Delete collaboration?'), width: 350, - zIndex: 1000, modal: true, + zIndex: 1000, }) } diff --git a/ui/features/conferences/backbone/views/ConferenceView.jsx b/ui/features/conferences/backbone/views/ConferenceView.jsx index 27404e1b441..f23baa79b79 100644 --- a/ui/features/conferences/backbone/views/ConferenceView.jsx +++ b/ui/features/conferences/backbone/views/ConferenceView.jsx @@ -267,6 +267,8 @@ ConferenceView.prototype.external = function (e) { resizable: true, height: 'auto', title: $self.text(), + modal: true, + zIndex: 1000, }) } else { return window.open(data[0].url) diff --git a/ui/features/conversations/backbone/views/MessageFormDialog.js b/ui/features/conversations/backbone/views/MessageFormDialog.js index fae1a50e0e9..60c78bf8420 100644 --- a/ui/features/conversations/backbone/views/MessageFormDialog.js +++ b/ui/features/conversations/backbone/views/MessageFormDialog.js @@ -109,6 +109,8 @@ export default class MessageFormDialog extends DialogBaseView { click: e => this.sendMessage(e), }, ], + modal: true, + zIndex: 1000, } } diff --git a/ui/features/conversations/backbone/views/SubmissionCommentFormDialog.js b/ui/features/conversations/backbone/views/SubmissionCommentFormDialog.js index 8372b311852..57cbac9e876 100644 --- a/ui/features/conversations/backbone/views/SubmissionCommentFormDialog.js +++ b/ui/features/conversations/backbone/views/SubmissionCommentFormDialog.js @@ -75,6 +75,8 @@ export default class SubmissionCommentFormDialog extends DialogBaseView { click: e => this.sendMessage(e), }, ], + modal: true, + zIndex: 1000, } } diff --git a/ui/features/files/react/components/Toolbar.jsx b/ui/features/files/react/components/Toolbar.jsx index 6f0c8e8bd9d..ae9c2459e10 100644 --- a/ui/features/files/react/components/Toolbar.jsx +++ b/ui/features/files/react/components/Toolbar.jsx @@ -94,13 +94,14 @@ export default class Toolbar extends React.Component { itemName: this.props.selectedItems[0].displayName(), } ), - width: 800, minHeight: 400, close() { ReactDOM.unmountComponentAtNode(this) $(this).remove() }, + modal: true, + zIndex: 1000, }) ReactDOM.render( diff --git a/ui/features/grade_summary/backbone/views/OutcomeDetailView.js b/ui/features/grade_summary/backbone/views/OutcomeDetailView.js index a79e175c93f..40942c3e6bb 100644 --- a/ui/features/grade_summary/backbone/views/OutcomeDetailView.js +++ b/ui/features/grade_summary/backbone/views/OutcomeDetailView.js @@ -30,6 +30,8 @@ class OutcomeDetailView extends DialogBaseView { close: this.onClose, buttons: [], width: 640, + modal: true, + zIndex: 1000, } } diff --git a/ui/features/grade_summary/backbone/views/OutcomeDialogView.js b/ui/features/grade_summary/backbone/views/OutcomeDialogView.js index bd0447b0b59..23ebfbaf6bd 100644 --- a/ui/features/grade_summary/backbone/views/OutcomeDialogView.js +++ b/ui/features/grade_summary/backbone/views/OutcomeDialogView.js @@ -45,6 +45,8 @@ class OutcomeResultsDialogView extends DialogBaseView { close: this.onClose, buttons: [], width: 460, + modal: true, + zIndex: 1000, } } diff --git a/ui/features/gradebook/react/SISGradePassback/PostGradesApp.tsx b/ui/features/gradebook/react/SISGradePassback/PostGradesApp.tsx index 6c4f35cd56e..9efe0d6a9df 100644 --- a/ui/features/gradebook/react/SISGradePassback/PostGradesApp.tsx +++ b/ui/features/gradebook/react/SISGradePassback/PostGradesApp.tsx @@ -63,6 +63,8 @@ class PostGradesApp extends React.Component { returnFocusTo.focus() } }, + modal: true, + zIndex: 1000, }) function closeDialog(e) { diff --git a/ui/features/gradebook/react/shared/ReuploadSubmissionsDialogManager.ts b/ui/features/gradebook/react/shared/ReuploadSubmissionsDialogManager.ts index 34fd8d2875a..837b5c56ac9 100644 --- a/ui/features/gradebook/react/shared/ReuploadSubmissionsDialogManager.ts +++ b/ui/features/gradebook/react/shared/ReuploadSubmissionsDialogManager.ts @@ -76,6 +76,7 @@ class ReuploadSubmissionsDialogManager { cb() } }, + zIndex: 1000, }) setupSubmitHandler(this.userAssetString) diff --git a/ui/features/quizzes/jquery/quizzes.js b/ui/features/quizzes/jquery/quizzes.js index 9b94cdfbed6..6b0a8346c24 100644 --- a/ui/features/quizzes/jquery/quizzes.js +++ b/ui/features/quizzes/jquery/quizzes.js @@ -4335,6 +4335,7 @@ ready(function () { height: displayGroupSelector ? 345 : 265, close: this.removeEventListeners.bind(this), open: this.focusDialog.bind(this), + zIndex: 1000, }) .dialog('open') @@ -5125,6 +5126,8 @@ $.fn.formulaQuestion = function () { $('#help_with_equations_dialog').dialog({ title: I18n.t('titles.help_with_formulas', 'Help with Quiz Question Formulas'), width: 500, + modal: true, + zIndex: 1000, }) }) $question.find('.combinations_option').attr('disabled', true) diff --git a/ui/features/registration/jquery/index.js b/ui/features/registration/jquery/index.js index ed29436ec44..7d0b5e76191 100644 --- a/ui/features/registration/jquery/index.js +++ b/ui/features/registration/jquery/index.js @@ -58,6 +58,7 @@ $('#registration_video a').click( close() { return $(this).remove() }, + zIndex: 1000, }) }) ) diff --git a/ui/features/roster/backbone/views/EditRolesView.js b/ui/features/roster/backbone/views/EditRolesView.js index 3231e8880fc..08ad12e190d 100644 --- a/ui/features/roster/backbone/views/EditRolesView.js +++ b/ui/features/roster/backbone/views/EditRolesView.js @@ -36,6 +36,8 @@ export default class EditRolesView extends DialogBaseView { width: '300px', id: 'edit_roles', title: I18n.t('Edit Course Role'), + modal: true, + zIndex: 1000, } } diff --git a/ui/features/roster/backbone/views/EditSectionsView.js b/ui/features/roster/backbone/views/EditSectionsView.js index fac1c8cc0e1..fb5b963d85d 100644 --- a/ui/features/roster/backbone/views/EditSectionsView.js +++ b/ui/features/roster/backbone/views/EditSectionsView.js @@ -38,6 +38,8 @@ export default class EditSectionsView extends DialogBaseView { this.prototype.dialogOptions = { id: 'edit_sections', title: I18n.t('titles.section_enrollments', 'Section Enrollments'), + modal: true, + zIndex: 1000, } } diff --git a/ui/features/roster/backbone/views/InvitationsView.js b/ui/features/roster/backbone/views/InvitationsView.js index 5c26a3a52a8..9f21f196478 100644 --- a/ui/features/roster/backbone/views/InvitationsView.js +++ b/ui/features/roster/backbone/views/InvitationsView.js @@ -41,6 +41,8 @@ export default class InvitationsView extends DialogBaseView { click: this.resend.bind(this), }, ], + modal: true, + zIndex: 1000, } } diff --git a/ui/features/roster/backbone/views/LinkToStudentsView.js b/ui/features/roster/backbone/views/LinkToStudentsView.js index ef6101466e9..6d4d106c60c 100644 --- a/ui/features/roster/backbone/views/LinkToStudentsView.js +++ b/ui/features/roster/backbone/views/LinkToStudentsView.js @@ -32,6 +32,8 @@ export default class LinkToStudentsView extends DialogBaseView { this.prototype.dialogOptions = { id: 'link_students', title: I18n.t('titles.link_to_students', 'Link to Students'), + modal: true, + zIndex: 1000, } } diff --git a/ui/features/screenreader_gradebook/ember/components/ic_submission_download_dialog_component.js b/ui/features/screenreader_gradebook/ember/components/ic_submission_download_dialog_component.js index f5dea7c87c5..c2662b4b4de 100644 --- a/ui/features/screenreader_gradebook/ember/components/ic_submission_download_dialog_component.js +++ b/ui/features/screenreader_gradebook/ember/components/ic_submission_download_dialog_component.js @@ -143,7 +143,10 @@ export default register( if (this.$dialog == null) { this.$dialog = $('#submissions_download_dialog form').dialog(this.dialogOptions) } - this.$dialog.dialog() + this.$dialog.dialog({ + modal: true, + zIndex: 1000, + }) return this.checkForChange() }, diff --git a/ui/features/screenreader_gradebook/jquery/AssignmentMuter.js b/ui/features/screenreader_gradebook/jquery/AssignmentMuter.js index e01d07af810..83c38dd4c2b 100644 --- a/ui/features/screenreader_gradebook/jquery/AssignmentMuter.js +++ b/ui/features/screenreader_gradebook/jquery/AssignmentMuter.js @@ -149,6 +149,8 @@ export default class AssignmentMuter { resizable: false, title: I18n.t('unmute_assignment', 'Unmute Assignment'), width: 400, + modal: true, + zIndex: 1000, }) } } diff --git a/ui/shared/assignments/backbone/views/AssignmentGroupCreateDialog.js b/ui/shared/assignments/backbone/views/AssignmentGroupCreateDialog.js index 06e9cbed153..e9406237e7d 100644 --- a/ui/shared/assignments/backbone/views/AssignmentGroupCreateDialog.js +++ b/ui/shared/assignments/backbone/views/AssignmentGroupCreateDialog.js @@ -53,6 +53,7 @@ AssignmentGroupCreateDialog.prototype.render = function () { title: I18n.t('titles.add_assignment_group', 'Add Assignment Group'), width: 'auto', modal: true, + zIndex: 1000, }) .fixDialogButtons() this.$el diff --git a/ui/shared/assignments/backbone/views/GradingTypeSelector.jsx b/ui/shared/assignments/backbone/views/GradingTypeSelector.jsx index dd1ef067ad2..00c4cfad38d 100644 --- a/ui/shared/assignments/backbone/views/GradingTypeSelector.jsx +++ b/ui/shared/assignments/backbone/views/GradingTypeSelector.jsx @@ -104,6 +104,8 @@ GradingTypeSelector.prototype.showGpaDialog = function (ev) { close() { return $(ev.target).focus() }, + modal: true, + zIndex: 1000, }) } @@ -120,6 +122,8 @@ GradingTypeSelector.prototype.showGradingSchemeDialog = function (ev) { close() { return $(ev.target).focus() }, + modal: true, + zIndex: 1000, }) .fixDialogButtons() } diff --git a/ui/shared/calendar/jquery/MessageParticipantsDialog.js b/ui/shared/calendar/jquery/MessageParticipantsDialog.js index ea1103c7dbe..31326023d05 100644 --- a/ui/shared/calendar/jquery/MessageParticipantsDialog.js +++ b/ui/shared/calendar/jquery/MessageParticipantsDialog.js @@ -78,6 +78,8 @@ export default class MessageParticipantsDialog { close() { $(this).remove() }, + modal: true, + zIndex: 1000, }) return this.loadParticipants() } diff --git a/ui/shared/context-modules/jquery/index.jsx b/ui/shared/context-modules/jquery/index.jsx index e5ef2053731..2b173272a09 100644 --- a/ui/shared/context-modules/jquery/index.jsx +++ b/ui/shared/context-modules/jquery/index.jsx @@ -1464,6 +1464,7 @@ modules.initModuleManagement = function (duplicate) { }, minWidth: 320, modal: true, + zIndex: 1000, }) .fixDialogButtons() }) @@ -1922,6 +1923,8 @@ modules.initModuleManagement = function (duplicate) { module: module.name, }), width: 400, + modal: true, + zIndex: 1000, }) }) $('#add_context_module_form .cancel_button').click(_event => { diff --git a/ui/shared/external-tools/backbone/views/ExternalContentReturnView.js b/ui/shared/external-tools/backbone/views/ExternalContentReturnView.js index 0f19f0727e3..dd5b679c237 100644 --- a/ui/shared/external-tools/backbone/views/ExternalContentReturnView.js +++ b/ui/shared/external-tools/backbone/views/ExternalContentReturnView.js @@ -107,6 +107,8 @@ ExternalContentReturnView.prototype.afterRender = function () { resizable: true, close: this.removeDialog, open: focusOnOpen, + modal: true, + zIndex: 1000, }) } } diff --git a/ui/shared/media-comments/jquery/index.js b/ui/shared/media-comments/jquery/index.js index fe8e7a776fc..1e75e4f952a 100644 --- a/ui/shared/media-comments/jquery/index.js +++ b/ui/shared/media-comments/jquery/index.js @@ -618,6 +618,7 @@ $.mediaComment.init = function (mediaType, opts) { width: 470, height: 300, modal: true, + zIndex: 1000, }) // ********************************************************************** diff --git a/ui/shared/media-comments/jquery/mediaComment.js b/ui/shared/media-comments/jquery/mediaComment.js index b61a420c941..bf97550c8ae 100644 --- a/ui/shared/media-comments/jquery/mediaComment.js +++ b/ui/shared/media-comments/jquery/mediaComment.js @@ -316,6 +316,7 @@ const mediaCommentActions = { .attr('aria-label', I18n.t('Play Media Comment')) $(event.currentTarget).parent().find('.ui-dialog-titlebar-close').focus() }, + zIndex: 1000, }) // Populate dialog box with a video diff --git a/ui/shared/mediaelement/UploadMediaTrackForm.jsx b/ui/shared/mediaelement/UploadMediaTrackForm.jsx index 9e0d52bae25..ebbd68ce5b0 100644 --- a/ui/shared/mediaelement/UploadMediaTrackForm.jsx +++ b/ui/shared/mediaelement/UploadMediaTrackForm.jsx @@ -59,6 +59,8 @@ export default class UploadMediaTrackForm { click: this.onSubmit, }, ], + modal: true, + zIndex: 1000, }) ReactDOM.render( diff --git a/ui/shared/outcomes/backbone/views/FindDialog.js b/ui/shared/outcomes/backbone/views/FindDialog.js index 2bc02f8b3f9..759b93506ff 100644 --- a/ui/shared/outcomes/backbone/views/FindDialog.js +++ b/ui/shared/outcomes/backbone/views/FindDialog.js @@ -52,6 +52,8 @@ export default class FindDialog extends DialogBaseView { click: e => this.import(e), }, ], + modal: true, + zIndex: 1000, } } diff --git a/ui/shared/outcomes/content-view/backbone/views/index.js b/ui/shared/outcomes/content-view/backbone/views/index.js index 009de365b2c..be78efc10d6 100644 --- a/ui/shared/outcomes/content-view/backbone/views/index.js +++ b/ui/shared/outcomes/content-view/backbone/views/index.js @@ -176,6 +176,8 @@ export default class ContentView extends Backbone.View { close(_e) { $(this).remove() }, + modal: true, + zIndex: 1000, }) return dialog } diff --git a/ui/shared/relock-modules-dialog/RelockModulesDialog.js b/ui/shared/relock-modules-dialog/RelockModulesDialog.js index 4e38d3f9746..a5b64657973 100644 --- a/ui/shared/relock-modules-dialog/RelockModulesDialog.js +++ b/ui/shared/relock-modules-dialog/RelockModulesDialog.js @@ -45,6 +45,8 @@ export default class RelockModulesDialog extends DialogBaseView { click: e => this.cancel(e), }, ], + modal: true, + zIndex: 1000, } } diff --git a/ui/shared/signup-dialog/jquery/index.js b/ui/shared/signup-dialog/jquery/index.js index 9502f41b6ee..8e0ecf1807f 100644 --- a/ui/shared/signup-dialog/jquery/index.js +++ b/ui/shared/signup-dialog/jquery/index.js @@ -183,6 +183,8 @@ const signupDialog = function (id, title, path) { } return $('.error_box').filter(':visible').remove() }, + modal: true, + zIndex: 1000, }) $node.fixDialogButtons() // re-disable after fixing