From 0dc0cd6c1139660b1b07f2a7ffdf7ad6e2e08136 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 22 Jun 2014 12:49:28 +1000
Subject: [PATCH] Fixed HTML driver

---
 drivers/html/js/driver.js    |  24 ++++++++++++++----------
 share/apps.json              |   8 +++++++-
 share/images/icons/Nepso.png | Bin 0 -> 1855 bytes
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 share/images/icons/Nepso.png

diff --git a/drivers/html/js/driver.js b/drivers/html/js/driver.js
index 98a622b17..1ad4a4986 100644
--- a/drivers/html/js/driver.js
+++ b/drivers/html/js/driver.js
@@ -27,28 +27,32 @@
 
 				w.categories = json.categories;
 				w.apps       = json.apps;
+
+				window.document.addEventListener('DOMContentLoaded', function() {
+					w.analyze('google.com', 'http://google.com', {
+						html:    '<script src="jquery.js"><meta name="generator" content="WordPress"/>',
+						headers: { 'Server': 'Apache' },
+						env:     [ 'Mootools' ]
+					});
+				});
 			};
 
 			xhr.send(null);
-
-			window.document.addEventListener('DOMContentLoaded', function() {
-				w.analyze('google.com', 'http://google.com', {
-					html:    '<script src="jquery.js"><meta name="generator" content="WordPress"/>',
-					headers: { 'Server': 'Apache' },
-					env:     [ 'Mootools' ]
-				});
-			});
 		},
 
 		/**
 		 * Display apps
 		 */
 		displayApps: function() {
+			var
+				app,
+				url = Object.keys(w.detected)[0];
+
 			document.getElementById('apps').innerHTML = '';
 
-			w.detected['http://google.com'].forEach(function(app) {
+			for ( app in w.detected[url] ) {
 				document.getElementById('apps').innerHTML += '<img src="images/icons/' + app + '.png" width="16" height="16"/> ' + app + '<br/>';
-			});
+			};
 		},
 
 		/**
diff --git a/share/apps.json b/share/apps.json
index 57554f001..4153635cb 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1111,7 +1111,7 @@
 			"env": "^prettyPrint$"
 		},
 		"Google Font API": {
-			"website": "code.google.com/apis/webfonts",
+			"website": "google.com/fonts",
 			"cats": [ 17 ],
 			"script": "googleapis\\.com/.+webfont",
 			"html": "<link[^>]* href=[^>]+fonts\\.(?:googleapis|google)\\.com",
@@ -2018,6 +2018,12 @@
 			"cats": [ 10 ],
 			"html": "sitestat\\(\".+nl\\.sitestat\\.com"
 		},
+		"Nepso": {
+			"website": "nepso.com",
+			"cats": [ 1 ],
+			"headers": [ "X-Powered-CMS": "Nepso" ],
+			"implies": [ "Python", "Perl", "Java", "PHP" ]
+		},
 		"Netmonitor": {
 			"website": "netmonitor.fi/en",
 			"cats": [ 10 ],
diff --git a/share/images/icons/Nepso.png b/share/images/icons/Nepso.png
new file mode 100644
index 0000000000000000000000000000000000000000..e14ba066786a3f20b8c502648e4c080022992481
GIT binary patch
literal 1855
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

literal 0
HcmV?d00001