From 0348bbe4f1b5b3dbd7fab44759581c2c1772cdf2 Mon Sep 17 00:00:00 2001 From: azivner Date: Tue, 6 Nov 2018 12:50:48 +0100 Subject: [PATCH] context menu cleanup --- src/public/javascripts/services/tree_context_menu.js | 3 ++- src/public/libraries/jquery.ui-contextmenu.min.js | 4 ---- src/public/libraries/jquery.ui-contextmenu.min.js.map | 1 - src/views/index.ejs | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/public/libraries/jquery.ui-contextmenu.min.js delete mode 100644 src/public/libraries/jquery.ui-contextmenu.min.js.map diff --git a/src/public/javascripts/services/tree_context_menu.js b/src/public/javascripts/services/tree_context_menu.js index 653f81119..36d2141a4 100644 --- a/src/public/javascripts/services/tree_context_menu.js +++ b/src/public/javascripts/services/tree_context_menu.js @@ -141,7 +141,8 @@ async function getContextMenuItems(event) { } function selectContextMenuItem(event, cmd) { - const node = $.ui.fancytree.getNode(event); + // context menu is always triggered on current node + const node = treeService.getCurrentNode(); if (cmd === "insertNoteHere") { const parentNoteId = node.data.parentNoteId; diff --git a/src/public/libraries/jquery.ui-contextmenu.min.js b/src/public/libraries/jquery.ui-contextmenu.min.js deleted file mode 100644 index 6b5746495..000000000 --- a/src/public/libraries/jquery.ui-contextmenu.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery UI context menu plugin - v1.18.1 - 2017-08-28 | https://github.com/mar10/jquery-ui-contextmenu | Copyright (c) 2013 -2017 Martin Wendt; Licensed MIT */ - -!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery","jquery-ui/ui/widgets/menu"],a):a(jQuery)}(function(a){"use strict";var b="onselectstart"in document.createElement("div"),c=a.ui.menu.version.match(/^(\d)\.(\d+)/),d={major:parseInt(c[1],10),minor:parseInt(c[2],10)},e=d.major<2&&d.minor<=10,f=d.major<2&&d.minor<=11;a.widget("moogle.contextmenu",{version:"1.18.1",options:{addClass:"ui-contextmenu",closeOnWindowBlur:!0,autoFocus:!1,autoTrigger:!0,delegate:null,hide:{effect:"fadeOut",duration:"fast"},ignoreParentSelect:!0,menu:null,position:null,preventContextMenuForPopup:!1,preventSelect:!1,show:{effect:"slideDown",duration:"fast"},taphold:!1,uiMenuOptions:{},beforeOpen:a.noop,blur:a.noop,close:a.noop,create:a.noop,createMenu:a.noop,focus:a.noop,open:a.noop,select:a.noop},_create:function(){var c,d,e,f=this.options;if(this.$headStyle=null,this.$menu=null,this.menuIsTemp=!1,this.currentTarget=null,this.extraData={},this.previousFocus=null,null==f.delegate&&a.error("ui-contextmenu: Missing required option `delegate`."),f.preventSelect){e=(a(this.element).is(document)?a("body"):this.element).uniqueId().attr("id"),c="#"+e+" "+f.delegate+" { -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; }",this.$headStyle=a("