From 4c9c9037ede08a994a2f86a89580336da4f38e20 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 9 Jan 2017 17:19:46 +0100
Subject: [PATCH] Enable image preview after editing protocol and disable
 preview modal animation [SCI-868]

---
 app/assets/javascripts/protocols/steps.js.erb    |  1 +
 app/assets/javascripts/sitewide/image_preview.js | 13 +++++++------
 app/views/shared/_image_preview_modal.html.erb   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb
index 715b4071b..f57b28617 100644
--- a/app/assets/javascripts/protocols/steps.js.erb
+++ b/app/assets/javascripts/protocols/steps.js.erb
@@ -205,6 +205,7 @@ function formEditAjax($form) {
     initCallBacks();
     initHandsOnTable($new_step);
     toggleButtons(true);
+    initPreviewModal();
 
     // Show the edited step
     $new_step.find(".panel-collapse:first").addClass("collapse in");
diff --git a/app/assets/javascripts/sitewide/image_preview.js b/app/assets/javascripts/sitewide/image_preview.js
index c761bfc00..8b26aabc2 100644
--- a/app/assets/javascripts/sitewide/image_preview.js
+++ b/app/assets/javascripts/sitewide/image_preview.js
@@ -17,17 +17,18 @@ function openPreviewModal(name, url, downloadUrl, description) {
     type: 'GET',
     dataType: 'json',
     success: function(data) {
+      modal.find('.modal-body img').remove();
       modal.find('.image-name').text(name);
       var link = modal.find('.image-download-link');
       link.attr('href', downloadUrl);
       link.attr('data-no-turbolink', true);
       link.attr('data-status', 'asset-present');
-      var image = modal.find('.modal-body img');
-      image.attr('src', data['large-preview-url']);
-      image.attr('alt', name);
-      image.click(function(ev) {
-        ev.stopPropagation();
-      });
+      modal.find('.modal-body').append($('<img>')
+                               .attr('src', data['large-preview-url'])
+                               .attr('alt', name)
+                               .click(function(ev) {
+                                 ev.stopPropagation();
+                               }));
       modal.find('.modal-footer .image-description').text(description);
       modal.find('.modal-body').click(function() {
         modal.modal('hide');
diff --git a/app/views/shared/_image_preview_modal.html.erb b/app/views/shared/_image_preview_modal.html.erb
index 9baac98c1..23edd2da2 100644
--- a/app/views/shared/_image_preview_modal.html.erb
+++ b/app/views/shared/_image_preview_modal.html.erb
@@ -1,4 +1,4 @@
-<div id="imagePreviewModal" class="modal modal-image-preview fade" role="dialog" tabindex="-1" aria-labelledby="imagePreviewModal" aria-hidden="true">
+<div id="imagePreviewModal" class="modal modal-image-preview" role="dialog" tabindex="-1" aria-labelledby="imagePreviewModal" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">