From 30039ff9c7101bcf66520572d036f207e4b8744a Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 23 Nov 2015 09:49:50 -0500 Subject: [PATCH] code review --- src/js/assets.js | 3 +++ src/js/dynamic-net-filtering.js | 9 +++------ src/js/hnswitches.js | 9 +++------ src/js/redirect-engine.js | 17 +++++++---------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/js/assets.js b/src/js/assets.js index 08616c54f..6697c085a 100644 --- a/src/js/assets.js +++ b/src/js/assets.js @@ -429,7 +429,10 @@ var getRepoMetadata = function(callback) { ) { entry.repoChecksum = entry.localChecksum; } + // New entry in remote repo. if ( entry.repoChecksum !== '' || entry.localChecksum === '' ) { + entry.localChecksum = 'd41d8cd98f00b204e9800998ecf8427e'; + checksumsChanged = true; continue; } checksumsChanged = true; diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js index ba4039bc7..5bd9f322e 100644 --- a/src/js/dynamic-net-filtering.js +++ b/src/js/dynamic-net-filtering.js @@ -95,17 +95,14 @@ var isIPAddress = function(hostname) { /******************************************************************************/ var toBroaderHostname = function(hostname) { - if ( hostname === '*' ) { - return ''; - } if ( isIPAddress(hostname) ) { return '*'; } var pos = hostname.indexOf('.'); - if ( pos === -1 ) { - return '*'; + if ( pos !== -1 ) { + return hostname.slice(pos + 1); } - return hostname.slice(pos + 1); + return hostname !== '*' && hostname !== '' ? '*' : ''; }; Matrix.toBroaderHostname = toBroaderHostname; diff --git a/src/js/hnswitches.js b/src/js/hnswitches.js index b6d5e7a14..08d59e9b6 100644 --- a/src/js/hnswitches.js +++ b/src/js/hnswitches.js @@ -86,17 +86,14 @@ var isIPAddress = function(hostname) { /******************************************************************************/ var toBroaderHostname = function(hostname) { - if ( hostname === '*' ) { - return ''; - } if ( isIPAddress(hostname) ) { return '*'; } var pos = hostname.indexOf('.'); - if ( pos === -1 ) { - return '*'; + if ( pos !== -1 ) { + return hostname.slice(pos + 1); } - return hostname.slice(pos + 1); + return hostname !== '*' && hostname !== '' ? '*' : ''; }; HnSwitches.toBroaderHostname = toBroaderHostname; diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js index d6d4a6127..9917e7659 100644 --- a/src/js/redirect-engine.js +++ b/src/js/redirect-engine.js @@ -30,14 +30,11 @@ /******************************************************************************/ var toBroaderHostname = function(hostname) { - if ( hostname === '*' ) { - return ''; - } var pos = hostname.indexOf('.'); - if ( pos === -1 ) { - return '*'; + if ( pos !== -1 ) { + return hostname.slice(pos + 1); } - return hostname.slice(pos + 1); + return hostname !== '*' && hostname !== '' ? '*' : ''; }; /******************************************************************************/ @@ -79,10 +76,10 @@ RedirectEngine.prototype.lookup = function(context) { } } } - } - src = toBroaderHostname(src); - if ( src === '' ) { - break; + src = toBroaderHostname(src); + if ( src === '' ) { + break; + } } } des = toBroaderHostname(des);