diff --git a/content_script.js b/content_script.js index 06be922..45c0a31 100644 --- a/content_script.js +++ b/content_script.js @@ -1,16 +1,28 @@ var valChange = /\by\/n\b|\(y\/n\)|\[y\/n\]/ig; var person; -chrome.storage.local.get("person", function(value){ - person = value.person; - if(person){ - loadReplace(valChange, person); +chrome.storage.local.get(null, function(items){ + for(var key in items){ + if(items[key]){ + if(key=="person") + loadReplace(valChange, items[key]); + else{ + var s = escapeRegExp(key); + var temp = new RegExp(s, "ig"); + loadReplace(temp, items[key]); + } + } } }); -// loadReplace(valChange); + + +function escapeRegExp(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); +} chrome.extension.onMessage.addListener(function(message,sender,sendResponse){ //This is where the stuff you want from the background page will be - var val = new RegExp(message.stuff, "ig"); + var s = escapeRegExp(message.stuff); + var val = new RegExp(s, "ig"); if(message.isYN) loadReplace(val, person); else diff --git a/manifest.json b/manifest.json index 5bf7d52..1ac58a1 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "manifest_version": 2, "name": "InteractiveFics", - "version": "4.1", + "version": "4.2", "description": "Replaces Y/N & other variables in Reader Insert/second person fics with words of your choice.", "browser_action": { "default_icon": "icon.png", diff --git a/popup.html b/popup.html index b258226..aec4df9 100644 --- a/popup.html +++ b/popup.html @@ -20,11 +20,11 @@ a:hover{ color: #16a085; } -label *{ +label *:not([type="checkbox"]){ display:block; } -.otherWords input{ +.otherWords input:not([type="checkbox"]){ margin-top:0.2em; width:100%; } @@ -36,9 +36,23 @@ label *{ } #clear-name{ margin-top:0.5em; - width:87%; + width:96%; +} +input[type="text"]{ + width:70%; +} +.strikethrough{ + text-decoration: line-through; +} +.one-saved-item:hover{ + background-color: #e74c3c; + color: white; + cursor: pointer; +} +.savedItemsList{ + height:100px; + overflow: auto; } -