Fix whitespace issue in blacklist (#472)

* Change regex to no longer merge on blank lines
This commit is contained in:
jacobcolbert
2019-05-06 00:38:12 -04:00
committed by Ilya Grigorik
parent e6835f39ff
commit e91b4c9cdb
2 changed files with 9 additions and 5 deletions

View File

@@ -1,3 +1,5 @@
var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
var tc = {
settings: {
lastSpeed: 1.0, // default 1x
@@ -13,7 +15,7 @@
twitter.com
vine.co
imgur.com
`.replace(/^\s+|\s+$/gm,'')
`.replace(regStrip,'')
}
};
@@ -73,7 +75,7 @@
rememberSpeed: tc.settings.rememberSpeed,
audioBoolean: tc.settings.audioBoolean,
startHidden: tc.settings.startHidden,
blacklist: tc.settings.blacklist.replace(/^\s+|\s+$/gm, '')
blacklist: tc.settings.blacklist.replace(regStrip, '')
});
}
tc.settings.lastSpeed = Number(storage.lastSpeed);
@@ -265,7 +267,7 @@
var blacklisted = false;
tc.settings.blacklist.split("\n").forEach(match => {
match = match.replace(/^\s+|\s+$/g,'')
match = match.replace(regStrip,'')
if (match.length == 0) {
return;
}

View File

@@ -1,3 +1,5 @@
var regStrip=/^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
var tcDefaults = {
speed: 1.0, // default:
displayKeyCode: 86, // default: V
@@ -17,7 +19,7 @@ var tcDefaults = {
twitter.com
vine.co
imgur.com
`.replace(/^\s+|\s+$/gm, '')
`.replace(regStrip, '')
};
var keyBindings = [];
@@ -155,7 +157,7 @@ function save_options() {
audioBoolean: audioBoolean,
startHidden: startHidden,
keyBindings: keyBindings,
blacklist: blacklist.replace(/^\s+|\s+$/gm,'')
blacklist: blacklist.replace(regStrip,'')
}, function() {
// Update status to let user know options were saved.
var status = document.getElementById('status');