Merge pull request #53 from Snuupy/cosmeticFilter

Remove Flickering and Fix Context Menu Display
brave · Aug 23, 2018 · 27c815c · 27c815c
2 parents 8f599e0 + 068b02e
commit 27c815c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -13,6 +13,7 @@ action("brave-extension") {
   outputs = [
     "$target_gen_dir/brave_extension/build/background.html",
     "$target_gen_dir/brave_extension/build/js/background.bundle.js",
+    "$target_gen_dir/brave_extension/build/js/content.bundle.js",
     "$target_gen_dir/brave_extension/build/js/braveShieldsPanel.bundle.js",
     "$target_gen_dir/brave_extension/build/braveShieldsPanel.html",
     "$target_gen_dir/brave_extension/build/bravelizer.css",

diff --git a/app/background/api/cosmeticFilterAPI.ts b/app/background/api/cosmeticFilterAPI.ts
@@ -24,7 +24,8 @@ export const applySiteFilters = (hostname: string) => {
       storeData.cosmeticFilterList[hostname].map((rule: string) => {
         console.log('applying rule', rule)
         chrome.tabs.insertCSS({
-          code: `${rule} {display: none;}`
+          code: `${rule} {display: none;}`,
+          runAt: 'document_start'
         })
       })
     }

diff --git a/app/background/events/cosmeticFilterEvents.ts b/app/background/events/cosmeticFilterEvents.ts
@@ -5,33 +5,30 @@ let rule = {
   selector: ''
 }
 
-// add context menu
-chrome.runtime.onInstalled.addListener(function () {
-  // parent menu
-  chrome.contextMenus.create({
-    title: 'Brave',
-    id: 'brave',
-    contexts: ['all']
-  })
-  // block ad child menu
-  chrome.contextMenus.create({
-    title: 'Block element via selector',
-    id: 'addBlockElement',
-    parentId: 'brave',
-    contexts: ['all']
-  })
-  chrome.contextMenus.create({
-    title: 'Clear CSS rules for this site',
-    id: 'resetSiteFilterSettings',
-    parentId: 'brave',
-    contexts: ['all']
-  })
-  chrome.contextMenus.create({
-    title: 'Clear CSS rules for all sites',
-    id: 'resetAllFilterSettings',
-    parentId: 'brave',
-    contexts: ['all']
-  })
+// parent menu
+chrome.contextMenus.create({
+  title: 'Brave',
+  id: 'brave',
+  contexts: ['all']
+})
+// block ad child menu
+chrome.contextMenus.create({
+  title: 'Block element via selector',
+  id: 'addBlockElement',
+  parentId: 'brave',
+  contexts: ['all']
+})
+chrome.contextMenus.create({
+  title: 'Clear CSS rules for this site',
+  id: 'resetSiteFilterSettings',
+  parentId: 'brave',
+  contexts: ['all']
+})
+chrome.contextMenus.create({
+  title: 'Clear CSS rules for all sites',
+  id: 'resetAllFilterSettings',
+  parentId: 'brave',
+  contexts: ['all']
 })
 
 // contextMenu listener - when triggered, grab latest selector

diff --git a/test/app/background/api/cosmeticFilterAPITest.ts b/test/app/background/api/cosmeticFilterAPITest.ts
@@ -184,7 +184,8 @@ describe('cosmeticFilterTestSuite', () => {
       })
       cosmeticFilterAPI.applySiteFilters('brave.com')
       assert.deepEqual(this.insertCSSStub.getCall(0).args[0], {
-        code: `${filter} {display: none;}`
+        code: `${filter} {display: none;}`,
+        runAt: 'document_start'
       })
     })
     it('applies multiple filters correctly', function () {
@@ -195,10 +196,12 @@ describe('cosmeticFilterTestSuite', () => {
       })
       cosmeticFilterAPI.applySiteFilters('brave.com')
       assert.deepEqual(this.insertCSSStub.getCall(0).args[0], {
-        code: `${filter} {display: none;}`
+        code: `${filter} {display: none;}`,
+        runAt: 'document_start'
       })
       assert.deepEqual(this.insertCSSStub.getCall(1).args[0], {
-        code: `${filter2} {display: none;}`
+        code: `${filter2} {display: none;}`,
+        runAt: 'document_start'
       })
 
     })