From 3c2697684efaeefc967337d1ad0225a7e93a44e2 Mon Sep 17 00:00:00 2001 From: Krzysztof Jan Modras Date: Tue, 2 Feb 2021 16:03:33 +0100 Subject: [PATCH 1/2] Favicon update --- src/favicon.ico | Bin 0 -> 5430 bytes src/manifest.json | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 src/favicon.ico diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0d56a60eb7bad79c21642033b7d3d3e2999baa6c GIT binary patch literal 5430 zcmb_g2Urx>79K!FMWZnqqe*Pod+!1&c2N-pM8OWmm?-AyGl_|)vE-4c(bx;I?M|Ov z7A$CNh$fP@YxmZ?@=_Q34gIN!`Q zwyMs{3N#lD^sKb~g4AOE0dtet2bG2%KPzuZOSb3>NN6(j>z)d|0n95y44 z%`Thl`!_0`dqpYjiX^24%yMJ=D8G-BavhTK7JgCQz#X+B9u~_e&^Q#BoQfVw<$Bup zuM&GyS|@e6yi;utgJhF&NUn!?xh|5FH<6;ta7B(<4v)S={5V=bB{cMgDd#UTS z?$|E1!(OSSj^m(QA19S}a89X-t8!(e$(YS zGsr?c#0qtAT&#hl*!IXg8Gw5hH)N|7wwK)hi8v@KLhFxZVjrv)I>NATB+e&A;zIHY z{B$G`)(1(*`eg@hn5*ErQguhk{bBsbsCnv8EZ{w{{ZJV43Nn$Jb_h4qA%xKs;L@14VPa{yLF`{8zWA}(GNu}x?Nv!yvSxykI3`}^^s?gNEMxg*3N zglf}}m~k3e)(qUYrXwZuG`=?v!+NDNc1Ue=HLbOK$^Go!!#M53fznhA7sg{eABaT< z{(+STW@CXk1dC)(tkQb_u}11Pv$VaoH8^?l(`R}MQ?q@fi5ScKA($V5kCow=FAmI( zkovN{POsi?d*ZQcTEhX-lqDni35kJxK;jf>^paV-d>WRv&svS+B1od+IOf7}|81nX zavU2)^=&-UfCPKdV0^@W5sY~L=I^#rEg-{GIqIHL$rqNol}n0&g{xekxcL4W?Gj}* zRR}2g{C~N>tX2=XVS3|Pnz<@6)JnLkxh6f(DlB}cl<&?)zUI8ps&YyB#6eG@IpPB6 zXOC2ukiVi+mRtH;%uQ!SD~-AwjcQQQzV~ObcEfXOt-C3vH*rO&h8s#1+%;E1Zj37) zsO6s%2R<)~VS1gAui1Ez@hb7zU28P=(zmyxxQh7-*QLnfJj<%N_}k^%XM@x#e*gZK z(3B=cv9kMx{c`=?hvoX;pOEWbJ!7hkvq~*oAnv`QRA)SaTMF4hB@9}5;!vAj#=*A1 z**W>@Bh~r)N1F3)tKxKl>{G-znrstq*K41nq_&GBb8Colb3~h(BF^lNBhd|s_v?W$ z;FSChVW>&GYr}A@7(*s;c$UgAxR7qHSicPis|(CFtj0Vh`!J4wO84ZiMRvXRd7Ij~ z^-j56zCmsUp17X4fa*>o?3Wu--Kd9S^1C{QMCEP5@Rn|eRE9yVtk)5SA@Ak)7u!Lx z+ru^&kbkJg42=;>F%d_;I7)Vir(S~D;T+}0MT*N5 zvcq-C&vf#Io*NE!(DPGuI>mI9)a!Wvjns4NT2oI@-+_%{N4@4VU+fiIK_WYt2t!OU zh9lI^FbqFYJh0qgc3>P~!%&I!S-KrqTo#e-3smQ=j=D;_UM_ho{MOV5--_L_R_uZe zQYUPa+GD5KhWZ!6Kz3kp$uO`!hV@ho!|7rSHjZEz+;E%Xfnm5$G4UjZdK}`((sVkm zEtWmQSDL-BLhOZAI)<(0J4c`1+paTBiO_v??h&Y&e%*bxlL$+y>eTq<{pSKcOjl?hFGyK;slDr_^EhSWCi=>+}MN5auv$Y zs>q7bbE8cC;qu_{`5N_mf;SclHVn)ckz!BkA3I@_(hEn=EXLjYi6|_*OCu8xvd`fB znFTnP@FAWS>(0$QgtO7jktA0GQBKTGxr57&G!R~V#Y_+03x+hM6dIYGVF zt$U~SZ)1O6{P98`_J!v!e%CLvG7ci%)DrPhP0G*OI!9cKse!9XjWYFz3cleVX`?Vp z7^Y*GFATtEgkg!)AD7dA)a5^UnveM8b&%tNp&c5J#N;(7D$3WN{aSbjhhlo-pjb!e zN_JLY9C0N^ub*Y=pD6o9rLMSIc#Y*ab*YNGIUTA|& z#%72+7KW#U>&1&_IDPU1M2qk0e9dx$`HWHPZW$F(S{KF?{{+P;-LMZi^vxK4e z*f;!t!lY*@@wHjYTN)Fqy( zQ>K1@A@JiMH3%Wp<4zHL34;$l%1=8e0Ci^HT1w&be>tsI6@+xA`I({?x(;_H?WB!;1hZil0mM)*;w7wo93v}+%6 zvgZgf`1xod2!XsmCh%i0VefE=Nm07&w478dkVjyi(GyyYy8%ANv>2>;9wzW8>e>YFH9>OBuvIIV=#Ql4r3@D0t~)b z8y|_xN9npg$3OS2X^>7W!BU|I{zZ8~=Q$n2R+;)KxqabYv3+~H{MVU14AWM4t6>;m zoQ&aQhf(}^9Rst&Om#BW$A1m;#l48Rv==`lEW=`xKNc8!W0B~kpY<6A7MGjN-LOgO zu>5s&I=(Y-SFoE0KYd?6hJm-)VI*M~Oa2Hjj={LSKA312hN*_Zm|+-z+57;^Bd%n8 z%`mY1Ty5^dYItnq!M1LWvS0Vw%Me<#4<8oWPo055!W0ZOhJaxhL-7zmxe;8<5n%%H z6h9PmgdsKzk~dflUnY9QL>RnkzOKH~-t!V?R_S95Ti#ckUNA_Vj-lctj35kt%nrpE z7)LM+A4xv=L>rEO%7Y3%m-;V@+%@oTeRpX%JmeW2`U%swc#BigC`U0;ru>w~W1JX> z5P2-7NPhT08kt7*bMstzNQcs7{6E(ED4})w8>SBSktQt}DFp8sBLwXUlKhuU5XTM< zRYuqOt2z)L4@5YD4utW?IL^g!q;Z_9eONiJ+TR&P99N%>=N#wB#vdHFh|WL2F&DsE G4gUs_l@FN! literal 0 HcmV?d00001 diff --git a/src/manifest.json b/src/manifest.json index ab18d63..aa59d5c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -67,18 +67,17 @@ "http://localhost/*" ], "icons": { - "48": "icon.svg", - "96": "icon.svg" + "16": "favicon.ico" }, "web_accessible_resources": [ - "icon.svg" + "favicon.ico" ], "chrome_settings_overrides" : { "search_provider": { "name": "Ghostery Glow", "search_url": "https://glowstery.com/search?q={searchTerms}", "keyword": "@ghostery", - "favicon_url": "https://glowstery.com/img/favicon-32x32.png", + "favicon_url": "https://glowstery.com/favicon.ico", "is_default": true, "suggest_url": "https://glowstery.com/suggest", "suggest_url_get_params": "q={searchTerms}" From 5d0ce55ab2f8a1e5a3e714cfa9ab77c89179816e Mon Sep 17 00:00:00 2001 From: Krzysztof Jan Modras Date: Tue, 2 Feb 2021 16:09:25 +0100 Subject: [PATCH 2/2] Remove Search Bar logic --- src/content/search-bar.js | 25 ------------------------ src/experiment_apis/ghostery_parent.js | 5 ----- src/experiment_apis/ghostery_schema.json | 14 ------------- src/manifest.json | 3 +-- 4 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/content/search-bar.js diff --git a/src/content/search-bar.js b/src/content/search-bar.js deleted file mode 100644 index e132582..0000000 --- a/src/content/search-bar.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; - -(async function () { - function observerSearchInput() { - const form$ = document.querySelector('form'); - form$.addEventListener('submit', () => { - const input$ = document.querySelector('#search-input'); - browser.runtime.sendMessage({ - action: 'search', - args: [{ - query: input$.value, - }], - }); - }); - } - - if (document.readyState === 'complete' || document.readyState === 'interactive') { - observerSearchInput(); - } else { - document.addEventListener('DOMContentLoaded', function onLoad() { - document.removeEventListener('DOMContentLoaded', onLoad); - observerSearchInput(); - }); - } -})() diff --git a/src/experiment_apis/ghostery_parent.js b/src/experiment_apis/ghostery_parent.js index 38ff6b6..9a74c42 100644 --- a/src/experiment_apis/ghostery_parent.js +++ b/src/experiment_apis/ghostery_parent.js @@ -30,11 +30,6 @@ global.ghostery = class extends ExtensionCommon.ExtensionAPI { Services.search.defaultEngine = searchEngine; }, - query(windowId, query) { - const window = getWindow(windowId); - window.gURLBar.value = query || ''; - window.gURLBar.focus(); - }, isDefaultBrowser() { const shell = Components.classes["@mozilla.org/browser/shell-service;1"] .getService(Components.interfaces.nsIShellService) diff --git a/src/experiment_apis/ghostery_schema.json b/src/experiment_apis/ghostery_schema.json index 3c289b5..1326423 100644 --- a/src/experiment_apis/ghostery_schema.json +++ b/src/experiment_apis/ghostery_schema.json @@ -29,20 +29,6 @@ "description": "Constant value" } }, - { - "name": "query", - "type": "function", - "description": "Focus the UrlBar", - "parameters": [{ - "type": "number", - "name": "windowId", - "optional": true - }, { - "type": "string", - "name": "query", - "optional": true - }] - }, { "name": "isDefaultBrowser", "type": "function", diff --git a/src/manifest.json b/src/manifest.json index aa59d5c..d36f725 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -26,8 +26,7 @@ "http://localhost/?*" ], "js": [ - "content/top-sites.js", - "content/search-bar.js" + "content/top-sites.js" ] }, { "matches": [