From 842e1f5e113d2bb22ff4d4a0ff0ef3eddb6addf1 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sun, 29 Mar 2015 21:01:57 +0200 Subject: [PATCH] Update context menu. --- src/_h5ai/client/css/inc/contextmenu.less | 5 +++-- src/_h5ai/client/css/inc/general.less | 4 ++++ src/_h5ai/client/js/inc/ext/contextmenu.js | 10 ++++++++-- src/_h5ai/conf/options.json | 7 +++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/_h5ai/client/css/inc/contextmenu.less b/src/_h5ai/client/css/inc/contextmenu.less index eca856be..c2bf0a7d 100644 --- a/src/_h5ai/client/css/inc/contextmenu.less +++ b/src/_h5ai/client/css/inc/contextmenu.less @@ -14,6 +14,8 @@ .cm-panel { + .popup(); + .rounded(); display: block; position: absolute; left: 100px; @@ -21,7 +23,6 @@ background: #fff; color: @col; z-index: 10; - box-shadow: 0 0 20px 0 rgba(0,0,0,0.2); overflow: auto; min-width: 200px; @@ -44,7 +45,7 @@ &:hover { color: @col-hover; - background: rgba(0,0,0,0.05); + background: @col-darkgray; } .cm-icon { diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 1eaa098e..ab47b490 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -94,6 +94,10 @@ box-shadow: 0 1px 10px 0 rgba(0,0,0,0.5); } +.popup() { + box-shadow: 0 1px 20px 0 rgba(0,0,0,0.5); +} + .rounded() { // overflow: hidden; border-radius: 2px; diff --git a/src/_h5ai/client/js/inc/ext/contextmenu.js b/src/_h5ai/client/js/inc/ext/contextmenu.js index b71c2fa8..099cd98f 100644 --- a/src/_h5ai/client/js/inc/ext/contextmenu.js +++ b/src/_h5ai/client/js/inc/ext/contextmenu.js @@ -1,6 +1,8 @@ -modulejs.define('ext/contextmenu', ['$', '_', 'core/resource'], function ($, _, resource) { - +modulejs.define('ext/contextmenu', ['_', '$', 'core/settings', 'core/resource'], function (_, $, allsettings, resource) { + var settings = _.extend({ + enabled: false + }, allsettings.contextmenu); var templateOverlay = '
'; var templatePanel = '
    '; var templateSep = '
  • '; @@ -135,6 +137,10 @@ modulejs.define('ext/contextmenu', ['$', '_', 'core/resource'], function ($, _, function init() { + if (!settings.enabled) { + return; + } + $(document).on('contextmenu', function (ev) { ev.stopPropagation(); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index fd4d7582..4063b48d 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -59,6 +59,13 @@ Options "interval": 5000 }, + /* + Use a context menu (right-click) on selected elements. + */ + "contextmenu": { + "enabled": true + }, + /* Show a clickable breadcrumb. */