From 15ec98a9bc50ceba79925036455b4432e3b23280 Mon Sep 17 00:00:00 2001 From: DaAwesomeP Date: Thu, 17 Apr 2014 19:10:00 -0500 Subject: [PATCH 1/5] HeadJS and JSON The JSON is marked "external" for good reason. There is no good way to scan JavaScript for JSON, so this only marks external files/URLs. PLEASE CHECK MY REGEX! This is my first big attempt. --- share/apps.json | 16 +++++++++++++++- share/images/icons/HeadJS.png | Bin 0 -> 1293 bytes share/images/icons/JSON (External File).png | Bin 0 -> 1201 bytes 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 share/images/icons/HeadJS.png create mode 100644 share/images/icons/JSON (External File).png diff --git a/share/apps.json b/share/apps.json index d931b416c..eea74d23f 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1175,6 +1175,12 @@ "cats": [ 12 ], "env": "^Handlebars$" }, + "HeadJS": { + "website": "headjs.com", + "cats": [ 12 ], + "script": "head.*\\.js", + "env": "^head$" + }, "Hello Bar": { "website": "hellobar.com", "cats": [ 5 ], @@ -1452,6 +1458,14 @@ "script": "jscharts.*\\.js", "env": "^JSChart$" }, + "JSON (External File)": { + "website": "json.org", + "cats": [ 27, 34 ], + "headers": { "Content-Type": ".*(application\\/JSON|text\\/JSON).*" }, + "script": ".*\\.json", + "html": "<.*src=(\"|').*\\.json(\"|').*>", + "url": ".*\\.json" + }, "JTL Shop": { "website": "www.jtl-software.de/produkte/jtl-shop3", "cats": [ 6 ], @@ -3327,4 +3341,4 @@ "html": "]+foundation[^>\"]+css" } } -} +} \ No newline at end of file diff --git a/share/images/icons/HeadJS.png b/share/images/icons/HeadJS.png new file mode 100644 index 0000000000000000000000000000000000000000..fe2e4b6ed5d57313ea6863d782a247ba92a52e34 GIT binary patch literal 1293 zcmV+o1@iidP)L?4*QlZ>$nA&9R3s9~Gc@{5cX#)@jEsyAfq{V%dwYAv z&d!b%Z*OmDQc}`C4Gj&yFDxwlfFOf$pU#tj&}J0fy}iA!o0^(d!otEN1_lP8q@+Yz zZ-}CzB4}%CgQuq_Q&d#+_sYu3kLVE_)S>t&<5H>A0+rNdXJ?;~VKQ)+(T_oCXlOuG zRFrsZZ0xOAEcSXZ2;88)y}kWyLPCN_U0wZF!}PDGrw6&YxnOK;d}9rP!q702las%o zC#-mfgV3Iyo`zOcRsE%-qw^o5^z85NPm0-RS65dkE-ogw1Lg$_=(?u}L~LxV81ttT z^{Vj&pgS`&^Tx%+g^?LHGBSej@NlT9se#7EMhFN9VBZS_0#-acJfOC=mX+w}XfQD` zxeAMxmKN02)%}5?_>>obv$L~jm_&c7sHm_?A|fK7tE&qtD=Q&1G!$g{K%prqDPg@p z&$_z0tQSg4O986|;^X6ibP$M`n3!`+<~UwqI5;@?GA=Ielr}0WD??^xCX9@XKw4TF z*x1-yDYde)g6isO*6p&jmX?-~oSY29!^2QmSO{urYV0>>XJ=-1cJ>tlP~wa~l1iG7 zkB?XuM>?sSn;Yck=R-$F2ju1D0dfFfSprrF>m@Rrm6ZkU?d^cxV{<}NQ}Zep%+1YV zaB%QDA~R058yy|3vbD9nk=1l^BppaeNrA}7NH+UJLPFSYfd#Ty$NUvcsQ#b|zhzR2C(U3!jZQgIo$@hprGIoliQyc11>Es39!sWT#ES$c?Y@T2mwU$V#MR)Z0m{qES1{3>v{}%wG zwY9a^EiEnYQ&UrqXsmK@aA2&ht=S6-Wj&2!;n}qTuj$T00000NkvXXu0mjf D`fYvz literal 0 HcmV?d00001 diff --git a/share/images/icons/JSON (External File).png b/share/images/icons/JSON (External File).png new file mode 100644 index 0000000000000000000000000000000000000000..aafc2d17718c9a620bcc94d77369f55d8fbc4fca GIT binary patch literal 1201 zcmV;i1Wx;jP)?3C(=d+yUyg8FI%_*Z0N`Bryu%DKn{Sj() zeXr~J+B|#qJR3gy+_hS3_w%~$`?{|8`+6AW7b`e8SP~W%CX0%SQmWNz8|^|hj^ zs>(HRZ*OmvudlBmARqwn6N9zTUk5pMboyu7>| z@cN;)wiae*XJLJP9hR4uP1DoU(r?2(Jw4z523}KB1C5Q1(AL(*1~E4`2UAm1@595x z((hcm$rbR{)>bM^7#tiVIE;;r(RWjOd%Ji#ew%YKcz=ICjEs!H=;$a64GlqWZ!cf~ zI?-x(2G7sW2h1g$ot=SRuLq4rqc1Hj)jNWZkB`H|!~_fP=;&a(1na}LJ0ubbBVZOr>93R z1mD=$fWE#yD;(1XMMXs#>&8!cwS!Y}y}Z0w;goljTe(;Oc*}+#NN{WOD4-c0KwOU@<|4&f}H*&Qd``HeTxn*4qHC?m~H#axsT=@O{J)lSm!670d!f4%y za1Ga3C;%ZiDIyAus1RY>>Md{_%~%5xfkS9$=$8;-fhf4HMkx@2lcmx_(NyfD`0(&h z&4ttd#o$t@lw|))icyG|va&LR#nn*PVQpSjAK6ES8GnlS4SqSOoiA z2=4FiuM=${48Q~7CZS2jMQ{_&9gZhtGz}@9{+(QHa&pp@@OOlNZ!)Io6-O@H(Q5zc%FN7UP?{C^ z(y2j#GGd>b3knMCw4LOY6ploOUTFW>!l6|1`1mNpx=@m(lB-#b<%jD(7)*42?MGB_ P00000NkvXXu0mjfOcF6S literal 0 HcmV?d00001 From 378726d317d9df1bc4d47b6dcf57e2c77c1e324d Mon Sep 17 00:00:00 2001 From: P THE AWESOME Date: Sat, 19 Apr 2014 12:01:38 -0500 Subject: [PATCH 2/5] Update apps.json --- share/apps.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/share/apps.json b/share/apps.json index eea74d23f..dc2c21b64 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1178,8 +1178,7 @@ "HeadJS": { "website": "headjs.com", "cats": [ 12 ], - "script": "head.*\\.js", - "env": "^head$" + "script": "head\\.(core|load)(\\.min|)\\.js", }, "Hello Bar": { "website": "hellobar.com", @@ -1461,10 +1460,8 @@ "JSON (External File)": { "website": "json.org", "cats": [ 27, 34 ], - "headers": { "Content-Type": ".*(application\\/JSON|text\\/JSON).*" }, - "script": ".*\\.json", - "html": "<.*src=(\"|').*\\.json(\"|').*>", - "url": ".*\\.json" + "headers": { "Content-Type": "(?:application|text)\\/JSON" }, + "url": "\\.json(?:$|\\?)" }, "JTL Shop": { "website": "www.jtl-software.de/produkte/jtl-shop3", @@ -3341,4 +3338,4 @@ "html": "]+foundation[^>\"]+css" } } -} \ No newline at end of file +} From 2e0c874e98d929cf0a2b4f2bf58f0c90c3c1c2eb Mon Sep 17 00:00:00 2001 From: P THE AWESOME Date: Sat, 19 Apr 2014 16:07:08 -0500 Subject: [PATCH 3/5] Update apps.josn (again) Removed JSON --- share/apps.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/share/apps.json b/share/apps.json index dc2c21b64..831df6d7b 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1457,12 +1457,6 @@ "script": "jscharts.*\\.js", "env": "^JSChart$" }, - "JSON (External File)": { - "website": "json.org", - "cats": [ 27, 34 ], - "headers": { "Content-Type": "(?:application|text)\\/JSON" }, - "url": "\\.json(?:$|\\?)" - }, "JTL Shop": { "website": "www.jtl-software.de/produkte/jtl-shop3", "cats": [ 6 ], From 5c18b0c016bb622830db2bf0305b47f6d81f5ac6 Mon Sep 17 00:00:00 2001 From: P THE AWESOME Date: Sat, 19 Apr 2014 16:26:46 -0500 Subject: [PATCH 4/5] Delete JSON (External File).png --- share/images/icons/JSON (External File).png | Bin 1201 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 share/images/icons/JSON (External File).png diff --git a/share/images/icons/JSON (External File).png b/share/images/icons/JSON (External File).png deleted file mode 100644 index aafc2d17718c9a620bcc94d77369f55d8fbc4fca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1201 zcmV;i1Wx;jP)?3C(=d+yUyg8FI%_*Z0N`Bryu%DKn{Sj() zeXr~J+B|#qJR3gy+_hS3_w%~$`?{|8`+6AW7b`e8SP~W%CX0%SQmWNz8|^|hj^ zs>(HRZ*OmvudlBmARqwn6N9zTUk5pMboyu7>| z@cN;)wiae*XJLJP9hR4uP1DoU(r?2(Jw4z523}KB1C5Q1(AL(*1~E4`2UAm1@595x z((hcm$rbR{)>bM^7#tiVIE;;r(RWjOd%Ji#ew%YKcz=ICjEs!H=;$a64GlqWZ!cf~ zI?-x(2G7sW2h1g$ot=SRuLq4rqc1Hj)jNWZkB`H|!~_fP=;&a(1na}LJ0ubbBVZOr>93R z1mD=$fWE#yD;(1XMMXs#>&8!cwS!Y}y}Z0w;goljTe(;Oc*}+#NN{WOD4-c0KwOU@<|4&f}H*&Qd``HeTxn*4qHC?m~H#axsT=@O{J)lSm!670d!f4%y za1Ga3C;%ZiDIyAus1RY>>Md{_%~%5xfkS9$=$8;-fhf4HMkx@2lcmx_(NyfD`0(&h z&4ttd#o$t@lw|))icyG|va&LR#nn*PVQpSjAK6ES8GnlS4SqSOoiA z2=4FiuM=${48Q~7CZS2jMQ{_&9gZhtGz}@9{+(QHa&pp@@OOlNZ!)Io6-O@H(Q5zc%FN7UP?{C^ z(y2j#GGd>b3knMCw4LOY6ploOUTFW>!l6|1`1mNpx=@m(lB-#b<%jD(7)*42?MGB_ P00000NkvXXu0mjfOcF6S From 25a8c54237caf5eebcf14c4b8fcca0bf6b27acfa Mon Sep 17 00:00:00 2001 From: P THE AWESOME Date: Sat, 19 Apr 2014 19:06:22 -0500 Subject: [PATCH 5/5] Ready to Merge --- share/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/apps.json b/share/apps.json index 831df6d7b..d3fcceffa 100644 --- a/share/apps.json +++ b/share/apps.json @@ -1178,7 +1178,7 @@ "HeadJS": { "website": "headjs.com", "cats": [ 12 ], - "script": "head\\.(core|load)(\\.min|)\\.js", + "script": "head\\.(?:core|load)(?:\\.min)?\\.js", }, "Hello Bar": { "website": "hellobar.com",