From feb75f62e183cf456038f7c7651b4387e0eeb8b4 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Fri, 16 Nov 2018 17:01:48 +0100
Subject: [PATCH] Add workaround for image caching in fabric js [SCI-2855]

---
 app/assets/javascripts/sitewide/file_preview.js.erb | 11 ++++++++---
 app/controllers/assets_controller.rb                |  2 +-
 app/views/shared/_file_edit_modal.html.erb          |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/sitewide/file_preview.js.erb b/app/assets/javascripts/sitewide/file_preview.js.erb
index d570fddbd..f4775dfc9 100644
--- a/app/assets/javascripts/sitewide/file_preview.js.erb
+++ b/app/assets/javascripts/sitewide/file_preview.js.erb
@@ -18,9 +18,14 @@
     });
   }
 
+<<<<<<< HEAD:app/assets/javascripts/sitewide/file_preview.js.erb
 
    function initImageEditor(data) {
     // var ImageEditor = require('tui-image-editor');
+=======
+  function initImageEditor(data) {
+    var imageEditor;
+>>>>>>> 50ccdbc6... Add workaround for image caching in fabric js [SCI-2855]:app/assets/javascripts/sitewide/file_preview.js
     var blackTheme = {
       'common.bi.image': '',
       'common.bisize.width': '0',
@@ -104,10 +109,9 @@
       'colorpicker.title.color': '#fff'
     };
 
-    var imageEditor = new tui.ImageEditor('#tui-image-editor', {
+    imageEditor = new tui.ImageEditor('#tui-image-editor', {
       includeUI: {
         loadImage: {
-          // path: data['large-preview-url'],
           path: data['download-url'],
           name: data.filename
         },
@@ -146,7 +150,8 @@
         }
       }).done(function() {
         animateSpinner(null, false);
-        imageEditor.clearObjects();
+        imageEditor.destroy();
+        imageEditor = {};
         $('#tui-image-editor').html('');
         $('#fileEditModal').modal('hide');
       });
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 5fa98388c..780be5e50 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -50,7 +50,7 @@ class AssetsController < ApplicationController
       'filename' => truncate(@asset.file_file_name,
                              length:
                                Constants::FILENAME_TRUNCATION_LENGTH),
-      'download-url' => download_asset_path(@asset)
+      'download-url' => download_asset_path(@asset, timestamp: Time.now.to_i)
     }
 
     if @asset.is_image?
diff --git a/app/views/shared/_file_edit_modal.html.erb b/app/views/shared/_file_edit_modal.html.erb
index 74af2d0c6..74eced9b4 100644
--- a/app/views/shared/_file_edit_modal.html.erb
+++ b/app/views/shared/_file_edit_modal.html.erb
@@ -1,7 +1,6 @@
 <div id="fileEditModal"
      class="modal modal-file-edit"
      role="dialog"
-     tabindex="-1"
      aria-labelledby="fileEditModal"
      aria-hidden="true"
      data-backdrop="static"