From dfa9595cd9546ca9002dba641f0db9b1df503ed8 Mon Sep 17 00:00:00 2001 From: Camille Barneaud Date: Sun, 25 Aug 2013 01:14:28 +0200 Subject: [PATCH] Fixed merge --- share/js/wappalyzer.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js index adfda0c0c..37dd76571 100644 --- a/share/js/wappalyzer.js +++ b/share/js/wappalyzer.js @@ -66,7 +66,7 @@ var wappalyzer = (function() { this.detected = true; // Set confidence level - this.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence ? pattern.confidence : 100; + this.confidence.push(pattern.confidence ? pattern.confidence : 100); // Detect version number if ( pattern.version ) { @@ -201,7 +201,7 @@ var wappalyzer = (function() { environment: 'dev', // dev | live websiteURL: 'http://wappalyzer.com/', twitterURL: 'https://twitter.com/Wappalyzer', - githubURL: 'https://github.com/ElbertF/Wappalyzer' + githubURL: 'https://github.com/ElbertF/Wappalyzer', }, /** @@ -325,6 +325,8 @@ var wappalyzer = (function() { for ( i in meta_elems ) { for ( meta in w.apps[app][type] ) { + profiler.checkPoint(app, type, pattern.regex); + if (meta_elems[i].name && meta == meta_elems[i].name.toLowerCase() ) { parse(w.apps[app].meta[meta]).map(function(pattern) { @@ -413,7 +415,7 @@ var wappalyzer = (function() { // Apply app confidence to implied app for ( id in confidence ) { - apps[implied.string].confidence[id + ' implied by ' + app] = confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 ); + apps[implied.string].confidence.push(confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 )); } }); }