Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 11:22:38 +01:00
Code Issues Releases Wiki Activity

Fix hint helper in element picker's text editor

Browse Source 
Regression from:
- 262a1a044f
This commit is contained in:
Raymond Hill 2020-12-03 07:34:50 -05:00
parent 210ec6b1aa
commit 1de8349045
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/1p-filters.js
View File

@ -61,12 +61,11 @@ let cachedUserFilters = '';
const responseHandler = function(response) { const responseHandler = function(response) {
if ( response instanceof Object === false ) { return; } if ( response instanceof Object === false ) { return; }
if ( response.hintUpdateToken !== undefined ) { if ( response.hintUpdateToken !== undefined ) {
const firstVisit = hintUpdateToken === 0;
const mode = cmEditor.getMode(); const mode = cmEditor.getMode();
if ( mode.setHints instanceof Function ) { if ( mode.setHints instanceof Function ) {
mode.setHints(response, firstVisit); mode.setHints(response);
} }
if ( firstVisit ) { if ( hintUpdateToken === 0 ) {
mode.parser.expertMode = response.expertMode !== false; mode.parser.expertMode = response.expertMode !== false;
} }
hintUpdateToken = response.hintUpdateToken; hintUpdateToken = response.hintUpdateToken;

2
src/js/asset-viewer.js
View File

@ -66,7 +66,7 @@
if ( hints instanceof Object ) { if ( hints instanceof Object ) {
const mode = cmEditor.getMode(); const mode = cmEditor.getMode();
if ( mode.setHints instanceof Function ) { if ( mode.setHints instanceof Function ) {
mode.setHints(hints, true); mode.setHints(hints);
} }
} }

6
src/js/codemirror/ubo-static-filtering.js
View File

@ -35,6 +35,7 @@ const scriptletNames = new Map();
const preparseDirectiveTokens = new Map(); const preparseDirectiveTokens = new Map();
const preparseDirectiveHints = []; const preparseDirectiveHints = [];
const originHints = []; const originHints = [];
let hintHelperRegistered = false;
/******************************************************************************/ /******************************************************************************/
@ -361,7 +362,7 @@ CodeMirror.defineMode('ubo-static-filtering', function() {
style = style.trim(); style = style.trim();
return style !== '' ? style : null; return style !== '' ? style : null;
}, },
setHints: function(details, firstVisit = false) { setHints: function(details) {
if ( Array.isArray(details.redirectResources) ) { if ( Array.isArray(details.redirectResources) ) {
for ( const [ name, desc ] of details.redirectResources ) { for ( const [ name, desc ] of details.redirectResources ) {
const displayText = desc.aliasOf !== '' const displayText = desc.aliasOf !== ''
@ -389,7 +390,8 @@ CodeMirror.defineMode('ubo-static-filtering', function() {
originHints.push(hint); originHints.push(hint);
} }
} }
if ( firstVisit ) { if ( hintHelperRegistered === false ) {
hintHelperRegistered = true;
initHints(); initHints();
} }
}, },