Don't show editor.contextDelete option in FF; #128

This commit is contained in:
tophf 2017-07-31 19:39:10 +03:00
parent 78d7697845
commit af41d646dd
3 changed files with 14 additions and 6 deletions

View File

@ -127,7 +127,7 @@ contextMenus = Object.assign({
title: 'openStylesManager', title: 'openStylesManager',
click: browserCommands.openManage, click: browserCommands.openManage,
}, },
}, prefs.get('editor.contextDelete') && { }, !FIREFOX && prefs.get('editor.contextDelete') && {
'editor.contextDelete': { 'editor.contextDelete': {
title: 'editDeleteText', title: 'editDeleteText',
type: 'normal', type: 'normal',

View File

@ -373,7 +373,9 @@ function setupCodeMirror(textarea, index) {
hotkeyRerouter.setState(false); hotkeyRerouter.setState(false);
wrapper.classList.add('CodeMirror-active'); wrapper.classList.add('CodeMirror-active');
}); });
if (!FIREFOX) {
cm.on('mousedown', (cm, event) => toggleContextMenuDelete.call(cm, event)); cm.on('mousedown', (cm, event) => toggleContextMenuDelete.call(cm, event));
}
let lastClickTime = 0; let lastClickTime = 0;
const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true)); const resizeGrip = wrapper.appendChild(template.resizeGrip.cloneNode(true));
@ -1340,9 +1342,15 @@ function initHooks() {
document.querySelector('#lint h2').addEventListener('click', toggleLintReport); document.querySelector('#lint h2').addEventListener('click', toggleLintReport);
} }
document.querySelectorAll( if (!FIREFOX) {
'input:not([type]), input[type="text"], input[type="search"], input[type="number"]') $$([
.forEach(e => e.addEventListener('mousedown', toggleContextMenuDelete)); 'input:not([type])',
'input[type="text"]',
'input[type="search"]',
'input[type="number"]',
].join(',')
).forEach(e => e.addEventListener('mousedown', toggleContextMenuDelete));
}
setupGlobalSearch(); setupGlobalSearch();
setCleanGlobal(); setCleanGlobal();

View File

@ -95,7 +95,7 @@
<span></span> <span></span>
</span> </span>
</label> </label>
<label> <label class="chromium-only">
<span i18n-text="optionsAdvancedContextDelete"></span> <span i18n-text="optionsAdvancedContextDelete"></span>
<span class="onoffswitch"> <span class="onoffswitch">
<input type="checkbox" id="editor.contextDelete"> <input type="checkbox" id="editor.contextDelete">