From 3a4df069d75ceb1ee4c2525b7724d8cfb8d874c8 Mon Sep 17 00:00:00 2001 From: zmagod Date: Tue, 24 Apr 2018 15:11:48 +0200 Subject: [PATCH] remove task description info from canvas task card [fixes SCI-2187] --- app/assets/javascripts/projects/canvas.js.erb | 58 ------------------- app/views/canvas/_full_zoom.html.erb | 3 - .../canvas/full_zoom/_my_module.html.erb | 5 -- 3 files changed, 66 deletions(-) diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb index 83340ab51..b78dbbf22 100644 --- a/app/assets/javascripts/projects/canvas.js.erb +++ b/app/assets/javascripts/projects/canvas.js.erb @@ -327,7 +327,6 @@ function destroyFullZoom() { $(".module-large .buttons-container [role=tab]").off("ajax:before ajax:success ajax:error"); $("div.module-large").off("mouseenter mouseleave"); $("div.module-large a.due-date-link").off("ajax:success ajax:error"); - $("#manage-module-description-modal [data-action='submit']").off("click"); $("#manage-module-due-date-modal [data-action='submit']").off("click"); $("div.module-large a.edit-tags-link").off("ajax:before ajax:success"); $("li[data-module-group]").off("mouseenter mouseleave"); @@ -593,46 +592,6 @@ function bindWindowResizeEvent() { function bindFullZoomAjaxTabs() { var manageUsersModal = null; var manageUsersModalBody = null; - var editDescriptionModal = null; - var editDescriptionModalBody = null; - - // Initialize edit description modal window - function initEditDescription($el) { - $el.find(".description-link") - .on("ajax:success", function(ev, data, status) { - var descriptionLink = $(this); - var descriptionTab = descriptionLink.closest(".tab-pane"); - - // Set modal body & title - editDescriptionModalBody.html(data.html); - editDescriptionModal - .find("#manage-module-description-modal-label") - .text(data.title); - - editDescriptionModalBody.find("form") - .on("ajax:success", function(ev2, data2, status2) { - // Update module's description in the tab - descriptionTab.find(".description-label") - .html(data2.description_label); - - // Close modal - editDescriptionModal.modal("hide"); - }) - .on("ajax:error", function(ev2, data2, status2) { - // Display errors if needed - $(this).renderFormErrors("my_module", data2.responseJSON); - }); - - // Disable canvas dragging events - toggleCanvasEvents(false); - - // Show modal - editDescriptionModal.modal("show"); - }) - .on("ajax:error", function(ev, data, status) { - // TODO - }); - } // Initialize users editing modal remote loading. function initUsersEditLink($el) { @@ -676,8 +635,6 @@ function bindFullZoomAjaxTabs() { manageUsersModal = $("#manage-module-users-modal"); manageUsersModalBody = manageUsersModal.find(".modal-body"); - editDescriptionModal = $("#manage-module-description-modal"); - editDescriptionModalBody = editDescriptionModal.find(".modal-body"); // Reload users tab HTML element when modal is closed manageUsersModal.on("hide.bs.modal", function () { @@ -705,21 +662,6 @@ function bindFullZoomAjaxTabs() { manageUsersModalBody.html(""); }); - // When clicking on description modal "Update" button, - // submit its inner-lying form - editDescriptionModal.find("[data-action='submit']").click(function() { - editDescriptionModalBody.find("form").submit(); - }); - - // Remove description modal content when window is closed - editDescriptionModal.on("hidden.bs.modal", function() { - $(this).find("form").off("ajax:success ajax:error"); - editDescriptionModalBody.html(""); - - // Re-activate canvas dragging events - toggleCanvasEvents(true); - }); - // initialize my_module tab remote loading var elements = $(".module-large .buttons-container [role=tab]"); elements.on("ajax:before", function (e) { diff --git a/app/views/canvas/_full_zoom.html.erb b/app/views/canvas/_full_zoom.html.erb index ea4c88262..af3fb25f9 100644 --- a/app/views/canvas/_full_zoom.html.erb +++ b/app/views/canvas/_full_zoom.html.erb @@ -6,9 +6,6 @@ - -<%= render partial: "my_modules/modals/manage_description_modal" %> - <%= render partial: "my_modules/modals/manage_due_date_modal" %> diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index 8d04617cf..e78b4f3dc 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -41,11 +41,6 @@