From e5b5e8cf8f54bb7fdc47f40396c56dae1f125ba3 Mon Sep 17 00:00:00 2001 From: Jeffrey Jose Date: Tue, 13 Mar 2018 10:32:06 -0700 Subject: [PATCH 1/6] Adding Bing Ads --- readiness-tool/icons/Bing Ads.png | Bin 0 -> 1429 bytes readiness-tool/vendors.json | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 readiness-tool/icons/Bing Ads.png diff --git a/readiness-tool/icons/Bing Ads.png b/readiness-tool/icons/Bing Ads.png new file mode 100644 index 0000000000000000000000000000000000000000..d0eb5855acd1043363646dc85e948e970b55eb79 GIT binary patch literal 1429 zcmYjQ4NOy46uwA128NyN2)AZL|eGk#T|o0K!ADieWaI>ECp)NkX$96;Vboq zON0A|b4V83SRm6wCt39&WArpZANX|3v`ZKv9fP9;Wflx6Koz(` z_(lVG$@n?a?ih7^*z=3~Dg&nF2^#N?d^%ScYsc3{(7p*9`wd zm};x22(7>SMY**o>n^m>6^y!dKt%HH<&_Ih5iQ^p_d*g0g7$UT2&jFs4o#v-nIv1@dA zOT@N*>kS!SwBmN^4>>PxT5@V~@cZhO9^05-x_P`SZNSyv|4vyahf_Br*}q*U${zJ8 zQ{rwqTn9=6Zz*1W;JB~q4z^@jbhrHj)6WcsnO{{^(xsb{_vnLH0{<^O;F+sclGXk<<}s`?HJMu{6&^F zr#347Qrq&D(tvQwk_V0p#(*&0(sn+2c4nAo3}l~Yl0Vh;wKJadH`dydQkd1wnYkE~ z&gWc6ZWVZ$Xw?y`;bz8ox#ef)Iqlo=e_5p;=|p#Cw|RY<+^Xr!E{AzT_ds&t7(CexZ@pxK3C0q8+zR} z7f#e(JL}jb>l?QJuAM0#G^duWF%_CBOSAT@>JE-n33fGB*c1K9bJnS~uU)xv|HG5@ z{*LL7d6$=`C$8N1?ZqhX=#B51Pt{L4{~PT6N}7" ] + }, + "Bing Ads": { + "category": "Ads", + "regex": [ + "" + ] } } -} \ No newline at end of file +} From 417e4925be0e18709c646391ecd3809fb4bb2506 Mon Sep 17 00:00:00 2001 From: Jeffrey Jose Date: Tue, 20 Mar 2018 12:52:33 -0700 Subject: [PATCH 2/6] adding Branch.png and version bump --- readiness-tool/icons/Branch.png | Bin 0 -> 1491 bytes readiness-tool/manifest.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 readiness-tool/icons/Branch.png diff --git a/readiness-tool/icons/Branch.png b/readiness-tool/icons/Branch.png new file mode 100644 index 0000000000000000000000000000000000000000..13101764ecf735892b203397c2165882cbc9b61b GIT binary patch literal 1491 zcmV;^1uXiBP)#5Jeyy0ir7615FX3k@`^bfiDFWBxr!9AE2#-R8>`wTZ!_FQV`1{M0h>BjwvqC z5CIK&iZo&!yq?{?rysmyjqQz^UGX^5Nay_L+;jeO&b{Z3(1v)P*8^-7kwM^W;DD+= zSFhI}+`D)0C#}SiR+Ia_zZQ4_$4$Ha>q(q_9_H8~!na;V!^%-r%@vEqf1PeTyHx_f z6Nr^gZ~8Tf^DmeM-8EM-x$PHAv>N^fxaM?&S*>LDeZLb}nOJh}oa6wBrQIaXJs%Ot zv=Xx=0znW=0Uw%A4`YtbZM8Xmg!!`kpc7&!tjnFSM}<0Wz7)cU1LP!1@Rik)0y4 zwNNOG0pxNyyId~+0r*jqJPJG#1i{bSA^?!hW|tXbK8|c-%+gY+bTG0#&)Y5{cjLHp zTz(@??*NEU{pSeNyN1zP6%pCg&MBDr1l7*C?KsZjNFN#+O6=di{|=oZyu-3kyH&VN1E0E1*&r#J| zR5i=Y=KKhFAqavzGd-Ixb1I;!DS&~2f%9s$+AnGJJq%u@y(M+*wovXVqGql^G;q5xzY_ zwe$w4mclT+Ts+U)ARaf?!;NO7O@@7(NCCq`bnzq6aa#BI=wod&)1^3p66XB zBF{9bOeAFyd0bT&0k;C*Xy6}+$dh3hJ~}==e$p0^tpLfPjkuZb&91hVET!{~EtDVJ zggJK5FPF=M!1J*Lb6OCS<07)%ah%`o*|X<(1N&)TUth|yEN5(N>_ptz2D*U-qZL4G zo5Zpem}3VKkxTy%fy1i0EtyO{zI*rX^88riYlNe;{Nyqt(!A|fa2^?DFZ!HB@Uz{`~v|Kgg@{)_8h z2FVoWzz0n2d{CDLg6LgLSPWs0^FynKTaePJ)@(eSG%s;4crfW z)`;IRFF7KzIBri)POb))FIsm!j`v-#9VC?|dF^f3-&_f>uD`#(dv*{7K~M#DHJ&-r z*vX_W)702)@9e)URiefy??cbWzHA_>$i%UTf| zRHr3v{|_`FV5d^4Lrp!u3<4supaoM?Q>VJ1zIXyO8NFc`E^g-dWf55Lweex}wGeO| t=PM;J|2F(eD Date: Tue, 27 Mar 2018 14:43:48 -0700 Subject: [PATCH 3/6] Version bump + ignore all google.com domains --- readiness-tool/manifest.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/readiness-tool/manifest.json b/readiness-tool/manifest.json index c0f1485..63b2e54 100644 --- a/readiness-tool/manifest.json +++ b/readiness-tool/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "AMP Readiness Tool", "description": "See at a glance the various third party vendors on the page and whether they have AMP support.", - "version": "2.10", + "version": "2.11", "options_page": "options.html", "icons": { "16": "amp-readiness.png", @@ -29,7 +29,8 @@ "all_frames": false, "run_at": "document_end", "exclude_globs": [ - "*.corp.google.com/*" + "*.corp.google.com/*", + "*.google.com/*" ] } ], From cbf878b3fbc9bbc2d030fea40ff2c8a4ad2e0623 Mon Sep 17 00:00:00 2001 From: Jeffrey Jose Date: Mon, 25 Jun 2018 13:30:19 -0700 Subject: [PATCH 4/6] Fixing LICENSE --- readiness-tool/options.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/readiness-tool/options.html b/readiness-tool/options.html index 3ed6d62..b152703 100644 --- a/readiness-tool/options.html +++ b/readiness-tool/options.html @@ -827,12 +827,12 @@ submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communiampion sent +means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to -communiampion on electronic mailing lists, source code control systems, +communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but -excluding communiampion that is conspicuously marked or otherwise +excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity @@ -981,4 +981,4 @@ - \ No newline at end of file + From 091ec663310efbb0186df4e2f0dfa55fe2bcbb82 Mon Sep 17 00:00:00 2001 From: Phillip Kriegel Date: Wed, 8 Aug 2018 16:39:01 -0700 Subject: [PATCH 5/6] Added support for 'CMS' tag in vendors.json. Added support for BlueKai (needs more testing), Wordpress (Wappalyzer regex), and Adobe Experience Manager (Wappalyzer regex). Still uses legacy Wappalyzer JSON formatting. --- readiness-tool/content_script.js | 27 +++++++++++++++++++++++---- readiness-tool/icons/BlueKai.png | Bin 0 -> 1323 bytes readiness-tool/popup.html | 21 ++++++++++++++++++--- readiness-tool/popup.js | 31 ++++++++++++++++++++++++++----- readiness-tool/vendors.json | 22 +++++++++++++++++++++- 5 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 readiness-tool/icons/BlueKai.png diff --git a/readiness-tool/content_script.js b/readiness-tool/content_script.js index 90295c6..2bb9219 100644 --- a/readiness-tool/content_script.js +++ b/readiness-tool/content_script.js @@ -29,15 +29,19 @@ function findDetectedVendors(html, tabId) { totalTags = detectedVendors.supported.ads.length + detectedVendors.supported.analytics.length + + detectedVendors.supported.cms.length + detectedVendors.notSupported.ads.length + - detectedVendors.notSupported.analytics.length; + detectedVendors.notSupported.analytics.length + + detectedVendors.notSupported.cms.length; notSupported = detectedVendors.notSupported.ads.length + - detectedVendors.notSupported.analytics.length; + detectedVendors.notSupported.analytics.length + + detectedVendors.notSupported.cms.length; supported = detectedVendors.supported.ads.length + - detectedVendors.supported.analytics.length; + detectedVendors.supported.analytics.length + + detectedVendors.supported.cms.length; if (notSupported == 0 && supported > 0) { color = [122, 186, 122, 255]; @@ -86,10 +90,12 @@ function filteredVendors(htmlString, listAllVendors) { supported: { ads: [], analytics: [], + cms: [], }, notSupported: { ads: [], analytics: [], + cms: [], }, }; // for all the vendor objects in the vendors.json file @@ -107,7 +113,8 @@ function filteredVendors(htmlString, listAllVendors) { return; } else if ( vendorConfig.category != 'Ads' && - vendorConfig.category != 'Analytics' + vendorConfig.category != 'Analytics' && + vendorConfig.category != 'CMS' ) { console.error( 'The vendor', @@ -165,6 +172,12 @@ function addToDict( filteredVendors.notSupported.ads.push(vendorName); } break; + case 'CMS': + if (isSupported(vendorName)) { + filteredVendors.supported.cms.push(vendorName); + } else { + filteredVendors.notSupported.cms.push(vendorName); + } } } } @@ -184,12 +197,18 @@ function isVendorNameUnique(obj, vendorName) { if (obj.supported.analytics.includes(vendorName)) { count++; } + if (obj.supported.cms.includes(vendorName)) { + count++; + } if (obj.notSupported.ads.includes(vendorName)) { count++; } if (obj.notSupported.analytics.includes(vendorName)) { count++; } + if (obj.notSupported.cms.includes(vendorName)) { + count++; + } return count < 1; } diff --git a/readiness-tool/icons/BlueKai.png b/readiness-tool/icons/BlueKai.png new file mode 100644 index 0000000000000000000000000000000000000000..25dacd85cf398f06d414ed3c81068b2a3aad72ce GIT binary patch literal 1323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0XB zj({-ZRBb+Kpn}NEkcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5O0c3d|4@L;p!@;Rg)$-uyz?djqeVj<`o z9G@fND)B!ptvv0U|N7&h8&tR2?z%cbC}>_zw~+Ur%a>d_)!JDCnP*%%vf_x_Tj#~E zo7+Ax1Woy|$V^Ijhn<9T(=z^T{B~QIIy*0RxHbxiZe2d*ao+c`^0YZSSxU{UC+8dO zzyJPs?R}o6|NRC>thHFHCI2LdX3S4{H*Nn4(;XKV&fZm9x7GHz-x(Q+S%wpeA}7Y~ zp5XBRQM)s@*r78=jyB7SWjlOs*?oPzY}J>d{0g<}vy1P)efjRzZKZsjwWohB?VNaT zb=whv7x6P)pUT@`iC3-(GP2`26U%*O;*F)#na~C{t~nMx&nFPvjQWo_*K5syAxz#SCvxtt(mzwKRmq7vh?<^ zch=#Xzic?UE%Ts!b?F|z=zEhRJ{#V<@Jb|#t3#;9b;p-2m_itl)_Jw^Z zfqUKrceJ!P-Z3=0D69H1aOSaD{!6QpIs}fm+HAEv|LaI}KhKMT=#ZaVkLB9@yOif|81A@y5k&7+m(=iB+Od+!Rc_v@{D8OGBI&Y)KY2%kC_-yc(XyJa2wleck>GTRb^q1ia49%2iG56=B*E!zbKw zYs;p_*Z$cv8Uxac_i}9b@T*|5ta456yXRArABx`>T{7u!KrUy(8HyEaH zrf^Jc>zg9`<4-Hwo{bJ(PmO-2)V$uV-CiCxdG^gEu9dS-Y)KBVkKFa?Im5$TsT>ZS z6G4hH`#--adYoc7r~X&bj=#H3Rv-T&dF`QSoM1!zwO3AsN{)*xuY9}E&0Mct9e68* z@%xm0HWAwcUziCweaOF){<++M%e9}kY+d&2NaxKu5&N$#nozg%|2^LCk5Ap%sM_@~ zdBHr*uuEH-8XSbUJ3Zac7JcV<_LlMVyUZ*3ZY;vueOb4*&bjh@Yr3sj;QvUiMXtVw zX79bAYntPcCV6CQThHo=9@4z0WZMO}U9`&H?^d_SzQ@!S)H%mq_L}*#X!!?`e^oZ+ z
+
@@ -300,8 +305,13 @@

-
+
+ +
+
+ + @@ -314,14 +324,19 @@

- +
- +
+ +
+ +
+
diff --git a/readiness-tool/popup.js b/readiness-tool/popup.js index 126c11a..96d340b 100644 --- a/readiness-tool/popup.js +++ b/readiness-tool/popup.js @@ -8,12 +8,18 @@ let supportedAds; /* @const {!Element} */ let supportedAnalytics; +/* @const {!Element} */ +let supportedCMS; + /* @const {!Element} */ let notSupportedAds; /* @const {!Element} */ let notSupportedAnalytics; +/* @const {!Element} */ +let notSupportedCMS; + /* @const {string} */ const loadingMessage = "Loading..."; @@ -30,19 +36,25 @@ chrome.storage.onChanged.addListener(function(changes, namespace) { function showLoading() { supportedAds = document.getElementById('ads-supported'); supportedAnalytics = document.getElementById('analytics-supported'); + supportedCMS = document.getElementById('cms-supported'); notSupportedAds = document.getElementById('ads-notSupported'); notSupportedAnalytics = document.getElementById('analytics-notSupported'); + notSupportedCMS = document.getElementById('cms-notSupported'); - supportedAds.textContent = supportedAnalytics.textContent = - notSupportedAds.textContent = notSupportedAnalytics.textContent = + + supportedAds.textContent = supportedAnalytics.textContent = + supportedCMS.textContent = notSupportedAds.textContent = + notSupportedAnalytics.textContent = notSupportedCMS.textContent = loadingMessage; } window.onload = function onWindowLoad() { supportedAds = document.getElementById('ads-supported'); supportedAnalytics = document.getElementById('analytics-supported'); + supportedCMS = document.getElementById('cms-supported'); notSupportedAds = document.getElementById('ads-notSupported'); notSupportedAnalytics = document.getElementById('analytics-notSupported'); + notSupportedCMS = document.getElementById('cms-notSupported'); }; /** @@ -103,8 +115,9 @@ function showSupportedVendorsInView(detectedVendors, listAllVendors) { return; } - supportedAds.textContent = supportedAnalytics.textContent = - notSupportedAds.textContent = notSupportedAnalytics.textContent = + supportedAds.textContent = supportedAnalytics.textContent = + supportedCMS.textContent = notSupportedAds.textContent = + notSupportedAnalytics.textContent = notSupportedCMS.textContent = blankMessage; supportedAds.appendChild( makeList(detectedVendors.supported.ads, false, listAllVendors) @@ -112,18 +125,26 @@ function showSupportedVendorsInView(detectedVendors, listAllVendors) { supportedAnalytics.appendChild( makeList(detectedVendors.supported.analytics, false, listAllVendors) ); + supportedCMS.appendChild( + makeList(detectedVendors.supported.cms, false, listAllVendors) + ); notSupportedAds.appendChild( makeList(detectedVendors.notSupported.ads, true, listAllVendors) ); notSupportedAnalytics.appendChild( makeList(detectedVendors.notSupported.analytics, true, listAllVendors) ); + notSupportedCMS.appendChild( + makeList(detectedVendors.notSupported.cms, true, listAllVendors) + ); totalTags = detectedVendors.supported.ads.length + detectedVendors.supported.analytics.length + + detectedVendors.supported.cms.length + detectedVendors.notSupported.ads.length + - detectedVendors.notSupported.analytics.length; + detectedVendors.notSupported.analytics.length + + detectedVendors.notSupported.cms.length; } /** diff --git a/readiness-tool/vendors.json b/readiness-tool/vendors.json index 1dc7e80..2b557bc 100644 --- a/readiness-tool/vendors.json +++ b/readiness-tool/vendors.json @@ -220,7 +220,7 @@ "regex": [ "googletagmanager\\.com/ns\\.html[^>]+>" ] + }, + "BlueKai": { + "category": "Ads", + "regex":[ + "__bkframe" + ] + }, + "Adobe Experience Manager": { + "category": "CMS", + "regex":[ + "
]+data-component-path=\"[^\"+]jcr:" + ] + }, + "Wordpress": { + "category": "CMS", + "regex":[ + "]+wp-(?:content|includes)", + "]+s\\d+\\.wp\\.com" + ] } } } From 2d011b0ea15ce27f98d1e3555722797b2dce3c39 Mon Sep 17 00:00:00 2001 From: Jeffrey Jose Date: Fri, 10 Aug 2018 11:58:54 -0700 Subject: [PATCH 6/6] version bump --- readiness-tool/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readiness-tool/manifest.json b/readiness-tool/manifest.json index 63b2e54..e935b05 100644 --- a/readiness-tool/manifest.json +++ b/readiness-tool/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "AMP Readiness Tool", "description": "See at a glance the various third party vendors on the page and whether they have AMP support.", - "version": "2.11", + "version": "2.12", "options_page": "options.html", "icons": { "16": "amp-readiness.png",