joshpatra/videospeed
1
0
Fork 0
mirror of https://github.com/SoPat712/videospeed.git synced 2025-08-22 02:18:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace issue in blacklist (#472)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
inject.js
View File

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

6
options.js
View File

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