Merge pull request #136 from richardfrost/version_prep

Version prep for 2.1.2
FrostCo · Apr 19, 2019 · 6b2706f · 6b2706f
2 parents 1427653 + a7ce8ab
commit 6b2706f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "advancedprofanityfilter",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A browser extension to filter profanity from webpages.",
   "main": "filter.js",
   "repository": {

diff --git a/src/script/lib/config.ts b/src/script/lib/config.ts
@@ -78,7 +78,6 @@ export default class Config {
     'badass': { matchMethod: 1, repeat: true, sub: 'cool' },
     'bastard': { matchMethod: 1, repeat: true, sub: 'jerk' },
     'bitch': { matchMethod: 1, repeat: true, sub: 'jerk' },
-    'christ': { matchMethod: 0, repeat: true, sub: 'deity' },
     'cocksucker': { matchMethod: 1, repeat: true, sub: 'idiot' },
     'cunt': { matchMethod: 1, repeat: true, sub: 'explative' },
     'dammit': { matchMethod: 1, repeat: false, sub: 'dangit' },
@@ -91,8 +90,6 @@ export default class Config {
     'goddammit': { matchMethod: 1, repeat: true, sub: 'goshdangit' },
     'hell': { matchMethod: 0, repeat: true, sub: 'heck' },
     'jackass': { matchMethod: 1, repeat: true, sub: 'idiot' },
-    'jesus christ': { matchMethod: 1, repeat: true, sub: 'deity' },
-    'jesus': { matchMethod: 1, repeat: true, sub: 'deity' },
     'nigga': { matchMethod: 0, repeat: true, sub: 'ethnic slur' },
     'nigger': { matchMethod: 0, repeat: true, sub: 'ethnic slur' },
     'niggers': { matchMethod: 0, repeat: true, sub: 'ethnic slur' },

diff --git a/src/script/optionPage.ts b/src/script/optionPage.ts
@@ -531,7 +531,6 @@ export default class OptionPage {
     let muteAudioInput = document.getElementById('muteAudio') as HTMLInputElement;
     let muteMethodInput = document.querySelector('input[name="audioMuteMethod"]:checked') as HTMLInputElement;
     let showSubtitlesInput = document.querySelector('input[name="audioShowSubtitles"]:checked') as HTMLInputElement;
-    let audioYouTubeAutoSubsMin = document.getElementById('audioYouTubeAutoSubsMin') as HTMLInputElement;
     self.cfg.censorCharacter = censorCharacterSelect.value;
     self.cfg.censorFixedLength = censorFixedLengthSelect.selectedIndex;
     self.cfg.defaultWordMatchMethod = defaultWordMatchMethodSelect.selectedIndex;
@@ -549,7 +548,6 @@ export default class OptionPage {
     self.cfg.muteAudio = muteAudioInput.checked;
     self.cfg.muteMethod = parseInt(muteMethodInput.value);
     self.cfg.showSubtitles = parseInt(showSubtitlesInput.value);
-    self.cfg.youTubeAutoSubsMin = parseFloat(audioYouTubeAutoSubsMin.value);
 
     // Save settings
     let error = await self.cfg.save();

diff --git a/src/static/manifest.json b/src/static/manifest.json
@@ -3,7 +3,7 @@
   "short_name": "Profanity Filter",
   "author": "Richard Frost",
   "manifest_version": 2,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Advanced Profanity Filter helps to clean up bad language on the websites you and your family visit.",
   "icons": {
     "16": "img/icon16.png",

diff --git a/src/static/optionPage.html b/src/static/optionPage.html
@@ -424,12 +424,13 @@ <h1 id="audio-experimental-">Audio (Experimental)</h1>
     </ul>
     </li>
     <li><strong>Subtitles</strong> - Controls which subtitles will be visible.<ul>
-    <li>Show all subtitles (_default_)</li>
+    <li>Show all subtitles <em>(default)</em></li>
     <li>Show only filtered subtitles - Least distracting</li>
     <li>Show only unfiltered subtitles</li>
     <li>Hide all subtitles - This may make it difficult to know what is happening when the audio is muted</li>
     </ul>
     </li>
+    <li><strong>YouTube Minimum Muting</strong> - Set a minimum amount of time (in seconds) that the filter will mute matched words in a YouTube video using auto-generated subtitles. <em>(The default is 0)</em></li>
     </ul>
     <h1 id="bookmarklet">Bookmarklet</h1>
     <p>The bookmarklet allows you to run a minimal version of the filter on devices that can&#39;t install the full version. It is an advanced tool, and requires several steps to set it up. Learn more <a href="https://github.com/richardfrost/AdvancedProfanityFilter/wiki/Bookmarklet">here</a>.</p>