Merge pull request #6 from AliasIO/master

Sync no.6

src/apps.json

@@ -3100,7 +3100,7 @@
 				"19"
 			],
 			"env": "^prettyPrint$",
-			"icon": "Google Code Prettify.png",
+			"icon": "Google.svg",
 			"website": "http://code.google.com/p/google-code-prettify"
 		},
 		"Google Font API": {
@@ -3193,7 +3193,7 @@
 			"headers": {
 				"Server": "gws"
 			},
-			"icon": "Google Web Server.png",
+			"icon": "Google.svg",
 			"website": "http://en.wikipedia.org/wiki/Google_Web_Server"
 		},
 		"Google Web Toolkit": {
@@ -5826,7 +5826,7 @@
 			"headers": {
 				"Server": "GSE"
 			},
-			"icon": "OpenGSE.png",
+			"icon": "Google.svg",
 			"implies": "Java",
 			"website": "http://code.google.com/p/opengse"
 		},
@@ -10653,7 +10653,7 @@
 		},
 		"13": {
 			"name": "Issue Trackers",
-			"priority": "9"
+			"priority": "2"
 		},
 		"14": {
 			"name": "Video Players",

src/drivers/npm/package.json

@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {

src/drivers/webextension/css/popup.css

@@ -30,7 +30,7 @@ body {
 
 .container {
   height: 15.8rem;
-  overflow: scroll;
+  overflow-y: auto;
   padding: 1rem 1.5rem 0rem 1.5rem;
 }
 

src/drivers/webextension/js/iframe.js

@@ -181,7 +181,7 @@ var exports = {};
 				video_assets: opt_video_assets,
 				assets: opt_assets,
 				version: '3',
-				mrev: '4d79384-d',
+				mrev: '6f3a97b-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -890,7 +890,7 @@ var exports = {};
 	var _pageTags;
 	var INIT_MS_BW_SEARCHES = 2000;
 	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
-	var POST_MSG_ID = '1503096304-372-12333-31563-11152';
+	var POST_MSG_ID = '1503946945-8336-24876-10613-9147';
 	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {

src/drivers/webextension/js/network.js

@@ -66,7 +66,7 @@
 		'washingtonpost.com'
 	];
 
-	var robotsTxtAllows = wappalyzer.robotsTxtAllows;
+	var robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer);
 	if ( !String.prototype.endsWith ) {
 		String.prototype.endsWith = function(searchString, position) {
 			var subjectString = this.toString();

src/drivers/webextension/manifest.edge.json

@@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://wappalyzer.com/",
 	"description": "Identify web technologies",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/drivers/webextension/manifest.json

@@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://wappalyzer.com/",
 	"description": "Identify web technologies",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {

src/icons/Google.svg

@@ -0,0 +1 @@
+<svg width="2443" height="2500" viewBox="0 0 256 262" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M255.878 133.451c0-10.734-.871-18.567-2.756-26.69H130.55v48.448h71.947c-1.45 12.04-9.283 30.172-26.69 42.356l-.244 1.622 38.755 30.023 2.685.268c24.659-22.774 38.875-56.282 38.875-96.027" fill="#4285F4"/><path d="M130.55 261.1c35.248 0 64.839-11.605 86.453-31.622l-41.196-31.913c-11.024 7.688-25.82 13.055-45.257 13.055-34.523 0-63.824-22.773-74.269-54.25l-1.531.13-40.298 31.187-.527 1.465C35.393 231.798 79.49 261.1 130.55 261.1" fill="#34A853"/><path d="M56.281 156.37c-2.756-8.123-4.351-16.827-4.351-25.82 0-8.994 1.595-17.697 4.206-25.82l-.073-1.73L15.26 71.312l-1.335.635C5.077 89.644 0 109.517 0 130.55s5.077 40.905 13.925 58.602l42.356-32.782" fill="#FBBC05"/><path d="M130.55 50.479c24.514 0 41.05 10.589 50.479 19.438l36.844-35.974C195.245 12.91 165.798 0 130.55 0 79.49 0 35.393 29.301 13.925 71.947l42.211 32.783c10.59-31.477 39.891-54.251 74.414-54.251" fill="#EB4335"/></svg>

src/wappalyzer.js

@@ -270,7 +270,7 @@ class Wappalyzer {
       Object.keys(apps).forEach(appName => {
         var app = apps[appName];
 
-        if ( app && app.implies ) {
+        if ( app && app.props.implies ) {
           this.asArray(app.props.implies).forEach(implied => {
             implied = this.parsePatterns(implied)[0];
 
@@ -281,7 +281,7 @@ class Wappalyzer {
             }
 
             if ( !( implied.string in apps ) ) {
-              apps[implied.string] = this.detected[url] && this.detected[url][implied.string] ? this.detected[url][implied.string] : new Application(implied.string, true);
+              apps[implied.string] = this.detected[url] && this.detected[url][implied.string] ? this.detected[url][implied.string] : new Application(implied.string, this.apps[implied.string], true);
 
               checkImplies = true;
             }