From 97f91f8be95f2c8f8f6ad14f9a26b054c029b4d8 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sat, 20 Apr 2019 19:10:34 -0400 Subject: [PATCH] Small code review of https://github.com/gorhill/uBlock/commit/a52b07ff6ef6e6b16785e237178e1cd6f38a1833 --- src/js/advanced-settings.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/js/advanced-settings.js b/src/js/advanced-settings.js index 1f34f8d3f..53c209c58 100644 --- a/src/js/advanced-settings.js +++ b/src/js/advanced-settings.js @@ -25,16 +25,17 @@ /******************************************************************************/ -(function() { // >>>> Start of private namespace +(function() { +// >>>> Start of private namespace /******************************************************************************/ -let messaging = vAPI.messaging; -let noopFunc = function(){}; +const messaging = vAPI.messaging; +const noopFunc = function(){}; let beforeHash = ''; -let cmEditor = new CodeMirror( +const cmEditor = new CodeMirror( document.getElementById('advancedSettings'), { autofocus: true, @@ -48,18 +49,18 @@ uBlockDashboard.patchCodeMirrorEditor(cmEditor); /******************************************************************************/ -let hashFromAdvancedSettings = function(raw) { - return raw.trim().replace(/[ \t]+/g, ' ').replace(/\s*[\n\r]+\s*/g, '\n'); +const hashFromAdvancedSettings = function(raw) { + return raw.trim().replace(/\s*[\n\r]+\s*/g, '\n').replace(/[ \t]+/g, ' '); }; /******************************************************************************/ // This is to give a visual hint that the content of user blacklist has changed. -let advancedSettingsChanged = (function () { +const advancedSettingsChanged = (function () { let timer = null; - let handler = ( ) => { + const handler = ( ) => { timer = null; let changed = hashFromAdvancedSettings(cmEditor.getValue()) !== beforeHash; uDom.nodeFromId('advancedSettingsApply').disabled = !changed; @@ -76,8 +77,8 @@ cmEditor.on('changes', advancedSettingsChanged); /******************************************************************************/ -let renderAdvancedSettings = function(first) { - let onRead = function(raw) { +const renderAdvancedSettings = function(first) { + const onRead = function(raw) { beforeHash = hashFromAdvancedSettings(raw); let pretty = [], whitespaces = ' ', @@ -103,7 +104,7 @@ let renderAdvancedSettings = function(first) { /******************************************************************************/ -let applyChanges = function() { +const applyChanges = function() { messaging.send( 'dashboard', { @@ -129,4 +130,5 @@ renderAdvancedSettings(true); /******************************************************************************/ -})(); // <<<< End of private namespace +// <<<< End of private namespace +})();