Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00
Code Issues Releases Wiki Activity

Ensure the text cursor in visible when a CodeMirror editor is resized

Browse Source 
Related issues:
- https://github.com/gorhill/uBlock/issues/3706
- https://github.com/gorhill/uBlock/issues/3701
This commit is contained in:
Raymond Hill 2018-12-22 13:35:46 -05:00
parent cd597709bb
commit 69668d27b1
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/js/dashboard-common.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2014-2018 Raymond Hill Copyright (C) 2014-present Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -33,28 +33,25 @@ self.uBlockDashboard = self.uBlockDashboard || {};
// Remove literal duplicate lines from a set based on another set. // Remove literal duplicate lines from a set based on another set.
self.uBlockDashboard.mergeNewLines = function(text, newText) { self.uBlockDashboard.mergeNewLines = function(text, newText) {
var lineBeg, textEnd, lineEnd;
var line, hash, bucket;
// Step 1: build dictionary for existing lines. // Step 1: build dictionary for existing lines.
var fromDict = Object.create(null); const fromDict = Object.create(null);
lineBeg = 0; let lineBeg = 0;
textEnd = text.length; let textEnd = text.length;
while ( lineBeg < textEnd ) { while ( lineBeg < textEnd ) {
lineEnd = text.indexOf('\n', lineBeg); let lineEnd = text.indexOf('\n', lineBeg);
if ( lineEnd === -1 ) { if ( lineEnd === -1 ) {
lineEnd = text.indexOf('\r', lineBeg); lineEnd = text.indexOf('\r', lineBeg);
if ( lineEnd === -1 ) { if ( lineEnd === -1 ) {
lineEnd = textEnd; lineEnd = textEnd;
} }
} }
line = text.slice(lineBeg, lineEnd).trim(); let line = text.slice(lineBeg, lineEnd).trim();
lineBeg = lineEnd + 1; lineBeg = lineEnd + 1;
if ( line.length === 0 ) { if ( line.length === 0 ) {
continue; continue;
} }
hash = line.slice(0, 8); const hash = line.slice(0, 8);
bucket = fromDict[hash]; const bucket = fromDict[hash];
if ( bucket === undefined ) { if ( bucket === undefined ) {
fromDict[hash] = line; fromDict[hash] = line;
} else if ( typeof bucket === 'string' ) { } else if ( typeof bucket === 'string' ) {
@ -65,18 +62,18 @@ self.uBlockDashboard.mergeNewLines = function(text, newText) {
} }
// Step 2: use above dictionary to filter out duplicate lines. // Step 2: use above dictionary to filter out duplicate lines.
var out = [ '' ]; const out = [ '' ];
lineBeg = 0; lineBeg = 0;
textEnd = newText.length; textEnd = newText.length;
while ( lineBeg < textEnd ) { while ( lineBeg < textEnd ) {
lineEnd = newText.indexOf('\n', lineBeg); let lineEnd = newText.indexOf('\n', lineBeg);
if ( lineEnd === -1 ) { if ( lineEnd === -1 ) {
lineEnd = newText.indexOf('\r', lineBeg); lineEnd = newText.indexOf('\r', lineBeg);
if ( lineEnd === -1 ) { if ( lineEnd === -1 ) {
lineEnd = textEnd; lineEnd = textEnd;
} }
} }
line = newText.slice(lineBeg, lineEnd).trim(); let line = newText.slice(lineBeg, lineEnd).trim();
lineBeg = lineEnd + 1; lineBeg = lineEnd + 1;
if ( line.length === 0 ) { if ( line.length === 0 ) {
if ( out[out.length - 1] !== '' ) { if ( out[out.length - 1] !== '' ) {
@ -84,7 +81,7 @@ self.uBlockDashboard.mergeNewLines = function(text, newText) {
} }
continue; continue;
} }
bucket = fromDict[line.slice(0, 8)]; const bucket = fromDict[line.slice(0, 8)];
if ( bucket === undefined ) { if ( bucket === undefined ) {
out.push(line); out.push(line);
continue; continue;
@ -105,7 +102,7 @@ self.uBlockDashboard.mergeNewLines = function(text, newText) {
/******************************************************************************/ /******************************************************************************/
self.uBlockDashboard.dateNowToSensibleString = function() { self.uBlockDashboard.dateNowToSensibleString = function() {
var now = new Date(Date.now() - (new Date()).getTimezoneOffset() * 60000); const now = new Date(Date.now() - (new Date()).getTimezoneOffset() * 60000);
return now.toISOString().replace(/\.\d+Z$/, '') return now.toISOString().replace(/\.\d+Z$/, '')
.replace(/:/g, '.') .replace(/:/g, '.')
.replace('T', '_'); .replace('T', '_');
@ -114,13 +111,14 @@ self.uBlockDashboard.dateNowToSensibleString = function() {
/******************************************************************************/ /******************************************************************************/
self.uBlockDashboard.patchCodeMirrorEditor = (function() { self.uBlockDashboard.patchCodeMirrorEditor = (function() {
var grabFocusTimer; let grabFocusTimer;
var grabFocusTarget; let grabFocusTarget;
var grabFocus = function() {
const grabFocus = function() {
grabFocusTarget.focus(); grabFocusTarget.focus();
grabFocusTimer = grabFocusTarget = undefined; grabFocusTimer = grabFocusTarget = undefined;
}; };
var grabFocusAsync = function(cm) { const grabFocusAsync = function(cm) {
grabFocusTarget = cm; grabFocusTarget = cm;
if ( grabFocusTimer === undefined ) { if ( grabFocusTimer === undefined ) {
grabFocusTimer = vAPI.setTimeout(grabFocus, 1); grabFocusTimer = vAPI.setTimeout(grabFocus, 1);
@ -128,7 +126,7 @@ self.uBlockDashboard.patchCodeMirrorEditor = (function() {
}; };
// https://github.com/gorhill/uBlock/issues/3646 // https://github.com/gorhill/uBlock/issues/3646
var patchSelectAll = function(cm, details) { const patchSelectAll = function(cm, details) {
var vp = cm.getViewport(); var vp = cm.getViewport();
if ( details.ranges.length !== 1 ) { return; } if ( details.ranges.length !== 1 ) { return; }
var range = details.ranges[0], var range = details.ranges[0],
@ -146,11 +144,11 @@ self.uBlockDashboard.patchCodeMirrorEditor = (function() {
grabFocusAsync(cm); grabFocusAsync(cm);
}; };
var lastGutterClick = 0; let lastGutterClick = 0;
var lastGutterLine = 0; let lastGutterLine = 0;
var onGutterClicked = function(cm, line) { const onGutterClicked = function(cm, line) {
var delta = Date.now() - lastGutterClick; const delta = Date.now() - lastGutterClick;
if ( delta >= 500 || line !== lastGutterLine ) { if ( delta >= 500 || line !== lastGutterLine ) {
cm.setSelection( cm.setSelection(
{ line: line, ch: 0 }, { line: line, ch: 0 },
@ -169,23 +167,28 @@ self.uBlockDashboard.patchCodeMirrorEditor = (function() {
grabFocusAsync(cm); grabFocusAsync(cm);
}; };
var resizeTimer, let resizeTimer,
resizeObserver; resizeObserver;
var resize = function(cm) { const resize = function(cm) {
resizeTimer = undefined; resizeTimer = undefined;
var child = document.querySelector('.codeMirrorFillVertical'); const child = document.querySelector('.codeMirrorFillVertical');
if ( child === null ) { return; } if ( child === null ) { return; }
var prect = document.documentElement.getBoundingClientRect(); const prect = document.documentElement.getBoundingClientRect();
var crect = child.getBoundingClientRect(); const crect = child.getBoundingClientRect();
var cssHeight = Math.floor(Math.max(prect.bottom - crect.top, 80)) + 'px'; const cssHeight = Math.floor(Math.max(prect.bottom - crect.top, 80)) + 'px';
if ( child.style.height !== cssHeight ) { if ( child.style.height === cssHeight ) { return; }
child.style.height = cssHeight; child.style.height = cssHeight;
if ( cm instanceof CodeMirror ) { // https://github.com/gorhill/uBlock/issues/3694
cm.refresh(); // Need to call cm.refresh() when resizing occurs. However the
} // cursor position may end up outside the viewport, hence we also
// call cm.scrollIntoView() to address this.
// Reference: https://codemirror.net/doc/manual.html#api_sizing
if ( cm instanceof CodeMirror ) {
cm.refresh();
cm.scrollIntoView(null);
} }
}; };
var resizeAsync = function(cm, delay) { const resizeAsync = function(cm, delay) {
if ( resizeTimer !== undefined ) { return; } if ( resizeTimer !== undefined ) { return; }
resizeTimer = vAPI.setTimeout( resizeTimer = vAPI.setTimeout(
resize.bind(null, cm), resize.bind(null, cm),
@ -195,7 +198,7 @@ self.uBlockDashboard.patchCodeMirrorEditor = (function() {
return function(cm) { return function(cm) {
if ( document.querySelector('.codeMirrorFillVertical') !== null ) { if ( document.querySelector('.codeMirrorFillVertical') !== null ) {
var boundResizeAsync = resizeAsync.bind(null, cm); const boundResizeAsync = resizeAsync.bind(null, cm);
window.addEventListener('resize', boundResizeAsync); window.addEventListener('resize', boundResizeAsync);
resizeObserver = new MutationObserver(boundResizeAsync); resizeObserver = new MutationObserver(boundResizeAsync);
resizeObserver.observe(document.querySelector('.body'), { resizeObserver.observe(document.querySelector('.body'), {