Blacklist languages instead of extensions

tsenart · Oct 12, 2016 · 9c0d2f9 · 9c0d2f9
1 parent 544989b
commit 9c0d2f9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/js/background.js b/js/background.js
@@ -78,7 +78,7 @@
     font: 'Inconsolata',
     fontSize: 'medium',
     lineNumbers: true,
-    extBlacklist: ''
+    languageBlacklist: ''
   };
 
   const OPTIONS = Object.keys(OPTIONS_DEFAULTS);
@@ -122,11 +122,11 @@
     return filename.split('.').pop();
   }
 
-  function isExtensionBlacklisted(extension) {
-    var blacklist = localStorage.getItem('extBlacklist').split(/[\s,]+/);
+  function isLanguageBlacklisted(language) {
+    var blacklist = localStorage.getItem('languageBlacklist').split(/[\s,]+/);
     var index, length = blacklist.length;
     for (index = 0; index < length; index++) {
-      if (blacklist[index].toLowerCase() === extension) {
+      if (blacklist[index].toLowerCase() === language) {
         return true;
       }
     }
@@ -142,9 +142,6 @@
     if (BROWSER_CONTENT.indexOf(contentType) != -1) {
       return null;
     }
-    if (isExtensionBlacklisted(extension)) {
-      return null;
-    }
     return !!LANG_EXT_MAP[fragment] ?  fragment : EXT_LANG_MAP[contentType] ||
                                                   EXT_LANG_MAP[extension]   ||
                                                   EXT_LANG_MAP[filename];
@@ -171,7 +168,7 @@
     var filename = getFilenameFromUrl(details.url);
     var extension = getExtensionFromFilename(filename);
     var language = detectLanguage(contentType, fragment, filename, extension);
-    if (!language) {
+    if (!language || isLanguageBlacklisted(language)) {
       return;
     }
 

diff --git a/js/options.js b/js/options.js
@@ -44,8 +44,8 @@
         hljs.highlightBlock(codeEl);
       }
     },
-    extBlacklist: {
-      selector: '#ext-blacklist',
+    languageBlacklist: {
+      selector: '#language-blacklist',
       value: 'value',
       decode: id,
       render: function(value) {}

diff --git a/options.html b/options.html
@@ -91,8 +91,8 @@ <h3>Select your font size</h3>
         <option value="x-large">x-large</option>
         <option value="xx-large">xx-large</option>
       </select>
-      <h3>Blacklist Extensions</h3>
-      <textarea id="ext-blacklist"></textarea>
+      <h3>Blacklist Languages</h3>
+      <textarea id="language-blacklist"></textarea>
       <h3>Line numbers:<input id="line-numbers" type="checkbox"></h3>
       <pre id="code" class="go">
 package main