From fce6668ae25f56b9924649f8506103586823cda9 Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Thu, 17 Sep 2020 14:01:54 +0200
Subject: [PATCH] Context menu in Easy

---
 app/views/dmsf/trash.html.erb               |  6 ------
 app/views/dmsf_context_menus/dmsf.html.erb  | 18 +++++++++---------
 app/views/dmsf_context_menus/trash.html.erb |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index 99e09aea..779ae56a 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -20,12 +20,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% if defined?(EasyExtensions) %>
-  <% content_for :header_tags do %>
-    <%= javascript_include_tag 'context_menu', 'application', defer: true %>
-  <% end %>
-<% end %>
-
 <% html_title l(:dmsf) %>
 
 <h2><%= l(:link_trash_bin) %></h2>
diff --git a/app/views/dmsf_context_menus/dmsf.html.erb b/app/views/dmsf_context_menus/dmsf.html.erb
index ea13eda1..1ddf5993 100644
--- a/app/views/dmsf_context_menus/dmsf.html.erb
+++ b/app/views/dmsf_context_menus/dmsf.html.erb
@@ -22,26 +22,26 @@
 
 <ul>
   <% if @dmsf_file %>
-    <%= render(partial: 'file', locals: { project: @project, folder: @folder, dmsf_file: @dmsf_file,
+    <%= render partial: 'file', locals: { project: @project, folder: @folder, dmsf_file: @dmsf_file,
                                           dmsf_link: @dmsf_link, locked: @locked, unlockable: @unlockable,
-                                          allowed: @allowed, email_allowed: @email_allowed }) %>
+                                          allowed: @allowed, email_allowed: @email_allowed } %>
   <% elsif @dmsf_folder %>
-    <%= render(partial: 'folder', locals: { project: @project, folder: @folder, dmsf_folder: @dmsf_folder,
+    <%= render partial: 'folder', locals: { project: @project, folder: @folder, dmsf_folder: @dmsf_folder,
                                             dmsf_link: @dmsf_link, locked: @locked, unlockable: @unlockable,
-                                            allowed: @allowed, email_allowed: @email_allowed }) %>
+                                            allowed: @allowed, email_allowed: @email_allowed } %>
   <% elsif @dmsf_link %>
-    <%= render(partial: 'url', locals: { dmsf_link: @dmsf_link, allowed: @allowed }) %>
+    <%= render partial: 'url', locals: { dmsf_link: @dmsf_link, allowed: @allowed } %>
   <% else %>
-    <%= render(partial: 'multiple', locals: { project: @project, folder: @folder, allowed: @allowed,
-                                              email_allowed: @email_allowed }) %>
+    <%= render partial: 'multiple', locals: { project: @project, folder: @folder, allowed: @allowed,
+                                              email_allowed: @email_allowed } %>
   <% end %>
 </ul>
 
 <%= late_javascript_tag do %>
   $('#dmsf-cm-delete').click(function (event) {
-    contextMenuHide();
+    $('#context-menu').hide();
   });
   $('#dmsf-cm-workflow').click(function (event) {
-    contextMenuHide();
+    $('#context-menu').hide();
   });
 <% end %>
diff --git a/app/views/dmsf_context_menus/trash.html.erb b/app/views/dmsf_context_menus/trash.html.erb
index 81fa2b28..9eb502d8 100644
--- a/app/views/dmsf_context_menus/trash.html.erb
+++ b/app/views/dmsf_context_menus/trash.html.erb
@@ -36,6 +36,6 @@
 </ul>
 <%= late_javascript_tag do %>
   $('#dmsf-cm-delete').click(function (event) {
-    contextMenuHide();
+    $('#context-menu').hide();
   });
 <% end %>