Merge pull request #80 from corbindavenport/dev

NoPlugin 6.2

README.md

@@ -2,17 +2,19 @@ NoPlugin
 ================
 NoPlugin is an extension for Chrome, Opera, and Firefox that allows you to play some plugin content in your browser without plugins. All browsers have phrased out the use of web plugins, due to performance and security problems, so NoPlugin was created to maintain some compatibility with outdated sites.
 
-NoPlugin searches webpages for embedded plugin objects, and converts them to HTML5 media objects. If the browser is unable to play the file natively, NoPlugin can still download it to your computer.
+NoPlugin searches webpages for embedded plugin objects and converts them to HTML5 players. If the browser is unable to play the media natively, NoPlugin can still download the file to your computer.
 
 [![Download for Chrome](https://corbin.io/img/chrome-button.png)](https://chrome.google.com/webstore/detail/noplugin-previously-quick/llpahfhchhlfdigfpeimeagojnkgeice) [![Download for Firefox](https://corbin.io/img/firefox-button.png)](https://addons.mozilla.org/en-US/firefox/addon/noplugin/) [![Download for Opera](https://corbin.io/img/opera-button.png)](https://addons.opera.com/en/extensions/details/noplugin/)
 
 ---------------------------------------------------------
 
-**New in NoPlugin 6.1:**
+**New in NoPlugin 6.2:**
 
-- Add support for Vimeo Flash embeds
-- Fixed bug that broke Flash-based YouTube embeds
-- Fixed bug that caused Flash `<embed>` tags to not be detected
+- Add support for Flash-based Viddler embedded videos (#71)
+- Add support for Flash-based Twitch.tv embedded videos
+- Flash variables are now passed to the Flash Projector application (#68, #76)
+- Added a blocklist to prevent NoPlugin from loading Flash-based trackers (#66)
+- Fixed bugs
 
 ---------------------------------------------------------
 

js/blocklist.js

@@ -0,0 +1,18 @@
+// This is where NoPlugin stores its blacklists.
+
+// URL patterns of sites that NoPlugin shouldn't run on
+// Examples: Sites that heavily rely on Flash, sites that host tracking scripts
+var siteBlocks = [
+    //'^https:\/\/corbin.io', (for testing)
+    '^https:\/\/www\.xfinity\.com\/stream', // Xfinity Stream (#70)
+]
+
+// URL patterns of files NoPlugin shouldn't load
+// Examples: Tracking scripts, fallbacks for HTML5 players, etc.
+var embedBlocks = [
+    'fp.swf', // Tracking (#66)
+]
+
+// Generate regexes
+const globalSiteBlockList = new RegExp(siteBlocks.join('|'), 'i')
+const globalEmbedBlockList = new RegExp(embedBlocks.join('|'), 'i')