From 44098ece5d5ff24f30583abf86b6f93e228eeb8c Mon Sep 17 00:00:00 2001 From: artoscinote <85488244+artoscinote@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:26:06 +0100 Subject: [PATCH] Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" --- app/assets/javascripts/assets/wopi/create_wopi_file.js | 1 - app/assets/javascripts/experiments/table.js | 8 -------- app/assets/javascripts/projects/canvas.js.erb | 6 ++---- app/assets/javascripts/projects/index.js | 10 ++-------- app/assets/javascripts/projects/show.js | 6 ------ app/assets/javascripts/sitewide/drag_n_drop.js | 2 +- .../step_attachments/mixins/wopi_file_modal.js | 1 - 7 files changed, 5 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/assets/wopi/create_wopi_file.js b/app/assets/javascripts/assets/wopi/create_wopi_file.js index f99eac947..c796897e3 100644 --- a/app/assets/javascripts/assets/wopi/create_wopi_file.js +++ b/app/assets/javascripts/assets/wopi/create_wopi_file.js @@ -9,7 +9,6 @@ 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 ebe872033..3b61b8a01 100644 --- a/app/assets/javascripts/experiments/table.js +++ b/app/assets/javascripts/experiments/table.js @@ -333,13 +333,6 @@ 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() { $('#moveTask').on('click', () => { this.openMoveModulesModal(this.selectedMyModules); @@ -646,7 +639,6 @@ 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 3e1b26eba..e60c27000 100644 --- a/app/assets/javascripts/projects/canvas.js.erb +++ b/app/assets/javascripts/projects/canvas.js.erb @@ -1522,9 +1522,7 @@ function initEditModules() { }) .on("shown.bs.modal", function(event) { // Focus the text element - var inputField = $('#edit-module-name-input'); - var value = inputField.val(); - inputField.focus().val('').val(value); + $(this).find("#edit-module-name-input").focus(); }) .on("hide.bs.modal", function (event) { // Remove potential error classes @@ -2962,7 +2960,7 @@ function drawRoundRectangle(ctx, xPos, yPos, width, height, radius) { height = Math.max(height, 0) if (width < 2 * radius) radius = width / 2; if (height < 2 * radius) radius = height / 2; - + ctx.beginPath(); ctx.lineWidth = 4; ctx.strokeStyle = '#104DA9'; diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index 861cd95d3..98733a8fb 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -42,6 +42,7 @@ var ProjectsIndex = (function() { // Init new project folder modal function function initNewProjectFolderModal() { var newProjectFolderModal = '#new-project-folder-modal'; + // Modal's submit handler function $(projectsWrapper) .on('ajax:success', newProjectFolderModal, function(ev, data) { @@ -327,13 +328,6 @@ var ProjectsIndex = (function() { $.get(url, function(result) { $(editProjectModal).find('.modal-content').html(result.html); $(editProjectModal).modal('show'); - // focusing at the end of the field - ['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) { @@ -418,7 +412,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 e9d387b44..ea8292bf6 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -323,12 +323,6 @@ }); } - $(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 cf786b602..5db7df525 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 d6686fc1b..4d8505ff5 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,7 +8,6 @@ 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',