diff --git a/app/assets/javascripts/assets/wopi/create_wopi_file.js b/app/assets/javascripts/assets/wopi/create_wopi_file.js index c796897e3..f99eac947 100644 --- a/app/assets/javascripts/assets/wopi/create_wopi_file.js +++ b/app/assets/javascripts/assets/wopi/create_wopi_file.js @@ -9,6 +9,7 @@ function applyCreateWopiFileCallback() { $modal.find('#element_id').val($(this).data('id')); $modal.find('#element_type').val($(this).data('type')); $modal.modal('show'); + $($modal).find('#new-wopi-file-name').focus(); return false; }); diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js index 2a2569a8c..6adc47639 100644 --- a/app/assets/javascripts/experiments/table.js +++ b/app/assets/javascripts/experiments/table.js @@ -343,6 +343,13 @@ var ExperimnetTable = { } }); }, + initModalInputFocus: function() { + $(document).on('shown.bs.modal', function() { + var inputField = $('#edit-module-name-input'); + var value = inputField.val(); + inputField.focus().val('').val(value); + }); + }, initMoveModulesModal: function() { $(this.tableContainer).on('click', '#moveTask', (e) => { e.stopPropagation(); @@ -633,6 +640,7 @@ var ExperimnetTable = { this.initMyModuleActions(); this.initRestoreMyModules(); this.initManageUsersDropdown(); + this.initModalInputFocus(); } }; diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb index 93f28c598..982ce04e5 100644 --- a/app/assets/javascripts/projects/canvas.js.erb +++ b/app/assets/javascripts/projects/canvas.js.erb @@ -1521,7 +1521,9 @@ function initEditModules() { }) .on("shown.bs.modal", function(event) { // Focus the text element - $(this).find("#edit-module-name-input").focus(); + var inputField = $('#edit-module-name-input'); + var value = inputField.val(); + inputField.focus().val('').val(value); }) .on("hide.bs.modal", function (event) { // Remove potential error classes diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index 580c76d64..74ba03ba0 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -259,6 +259,13 @@ var ProjectsIndex = (function() { $.get(url, function(result) { $(editProjectModal).find('.modal-content').html(result.html); $(editProjectModal).modal('show'); + + ['project_name', 'project_folder_name'].forEach(function(inputId) { + var inputField = $('#' + inputId); + var value = inputField.val(); + inputField.focus().val('').val(value); + }) + $(editProjectModal).find('.selectpicker').selectpicker(); $(editProjectModal).find('form') .on('ajax:success', function(ev, data) { @@ -354,7 +361,7 @@ var ProjectsIndex = (function() { $(moveToModal).find('.modal-content').html(result.html); $(moveToModal).modal('show'); initializeJSTree($(moveToModal).find('#moveToFolders')); - + $('#searchFolderTree').focus(); $(moveToModal).find('form') .on('ajax:before', function() { $('').attr({ diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js index 1482c601f..a224d57a8 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -270,6 +270,12 @@ } } + $(document).on('shown.bs.modal', function() { + var inputField = $('#experiment-name'); + var value = inputField.val(); + inputField.focus().val('').val(value); + }); + function initNewExperimentToolbarButton() { let forms = '.new-experiment-form'; $(experimentsPage) diff --git a/app/assets/javascripts/sitewide/drag_n_drop.js b/app/assets/javascripts/sitewide/drag_n_drop.js index 35c14adca..1806f540b 100644 --- a/app/assets/javascripts/sitewide/drag_n_drop.js +++ b/app/assets/javascripts/sitewide/drag_n_drop.js @@ -328,7 +328,7 @@
-
diff --git a/app/javascript/vue/protocol/step_attachments/mixins/wopi_file_modal.js b/app/javascript/vue/protocol/step_attachments/mixins/wopi_file_modal.js index 54e6ad7ae..ecfe3377c 100644 --- a/app/javascript/vue/protocol/step_attachments/mixins/wopi_file_modal.js +++ b/app/javascript/vue/protocol/step_attachments/mixins/wopi_file_modal.js @@ -8,6 +8,7 @@ export default { $wopiModal.find('#element_id').val(step.id); $wopiModal.find('#element_type').val('Step'); $wopiModal.modal('show'); + $($wopiModal).find('#new-wopi-file-name').focus(); $wopiModal.find('form').on( 'ajax:success',