From 581758f4c3797fb5a6f16d9bd1d4e6d18b699cb0 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Fri, 22 Dec 2017 11:53:36 +1100 Subject: [PATCH] Merge js field --- src/apps.json | 5 ++- src/drivers/webextension/js/content.js | 10 +++--- src/drivers/webextension/js/driver.js | 4 ++- src/icons/Ant Design.svg | 43 ------------------------- src/icons/Sqreen.png | Bin 3961 -> 0 bytes src/icons/docsify.svg | 30 ----------------- src/wappalyzer.js | 3 -- 7 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 src/icons/Ant Design.svg delete mode 100644 src/icons/Sqreen.png delete mode 100644 src/icons/docsify.svg diff --git a/src/apps.json b/src/apps.json index 2e582c11b..22f3d223e 100644 --- a/src/apps.json +++ b/src/apps.json @@ -838,7 +838,6 @@ "cats": [ "47" ], -<<<<<<< HEAD "headers": { "Set-cookie": "FESESSIONID" }, @@ -3137,7 +3136,7 @@ "html": [ "
", "Powered by ([^<]+)\\;version:\\1" - ], + ], "icon": "Gallery.png", "website": "http://galleryproject.org/" }, @@ -9454,7 +9453,7 @@ "]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css", "]+class=\"[^\"]*glyphicon glyphicon-" ], - "icon": "Bootstrap.png", + "icon": "Bootstrap.svg", "script": [ "twitter\\.github\\.com/bootstrap", "bootstrap(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js index b24ff133f..49ecba12d 100644 --- a/src/drivers/webextension/js/content.js +++ b/src/drivers/webextension/js/content.js @@ -41,10 +41,12 @@ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) { subject: {}, source: 'content.js' }, response => { - postMessage({ - id: 'patterns', - patterns: response.patterns - }, '*'); + if ( response ) { + postMessage({ + id: 'patterns', + patterns: response.patterns + }, '*'); + } }); }; diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js index e0cf3addb..6efdec467 100644 --- a/src/drivers/webextension/js/driver.js +++ b/src/drivers/webextension/js/driver.js @@ -75,9 +75,11 @@ fetch('../apps.json') wappalyzer.apps = json.apps; wappalyzer.categories = json.categories; + categoryOrder = Object.keys(wappalyzer.categories).sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority); + wappalyzer.parseJsPatterns(); - categoryOrder = Object.keys(wappalyzer.categories).sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority); + console.log('xxx'); }) .catch(error => { wappalyzer.log('GET apps.json: ' + error, 'driver', 'error'); diff --git a/src/icons/Ant Design.svg b/src/icons/Ant Design.svg deleted file mode 100644 index e9f8c2a9d..000000000 --- a/src/icons/Ant Design.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - Group 28 Copy 5 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/icons/Sqreen.png b/src/icons/Sqreen.png deleted file mode 100644 index c4e1000e61ef21cd111753433c82be6f764606ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3961 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 TZjW6f00000NkvXXu0mjf^8TJ0 diff --git a/src/icons/docsify.svg b/src/icons/docsify.svg deleted file mode 100644 index 7f125e6da..000000000 --- a/src/icons/docsify.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - icon - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/wappalyzer.js b/src/wappalyzer.js index 47aeeee4f..b535bdf84 100644 --- a/src/wappalyzer.js +++ b/src/wappalyzer.js @@ -509,9 +509,6 @@ class Wappalyzer { * Analyze JavaScript variables */ analyzeJs(app, results) { - - console.log(app, results); - Object.keys(results).forEach(string => { Object.keys(results[string]).forEach(index => { const pattern = this.jsPatterns[app.name][string][index];