Merge branch 'Tsenzuk-master'

lib/hma-proxy-parse.coffee

@@ -19,12 +19,12 @@ module.exports = (html) ->
 	rows.each ->
 		element = $(this)
 		timestamp = element.children(".timestamp").attr("rel")
-		port = element.children("td:nth-of-type(3)").text().replace("\n", "")
+		port = element.children("td:nth-of-type(3)").text().replace(/\n/g, "").trim()
-		country = element.find("td .country").parent().attr("rel")
+		country = element.find("td.country").attr("rel")
 		speed = element.find("td .progress-indicator").eq(0).attr("value")
 		connectionTime = element.find("td .progress-indicator").eq(1).attr("value")
-		protocol = element.children("td:nth-of-type(7)").text()
+		protocol = element.children("td:nth-of-type(7)").text().replace(/\n/g, "").trim()
-		anonymity = element.children("td:nth-of-type(8)").text()
+		anonymity = element.children("td:nth-of-type(8)").text().replace(/\n/g, "").trim()
 
 		ipSegments = []
 

lib/hma-proxy-parse.js

@@ -21,12 +21,12 @@ module.exports = function(html) {
     var anonymity, connectionTime, country, element, ipBlock, ipSegments, port, protocol, speed, timestamp;
     element = $(this);
     timestamp = element.children(".timestamp").attr("rel");
-    port = element.children("td:nth-of-type(3)").text().replace("\n", "");
+    port = element.children("td:nth-of-type(3)").text().replace(/\n/g, "").trim();
-    country = element.find("td .country").parent().attr("rel");
+    country = element.find("td.country").attr("rel");
     speed = element.find("td .progress-indicator").eq(0).attr("value");
     connectionTime = element.find("td .progress-indicator").eq(1).attr("value");
-    protocol = element.children("td:nth-of-type(7)").text();
+    protocol = element.children("td:nth-of-type(7)").text().replace(/\n/g, "").trim();
-    anonymity = element.children("td:nth-of-type(8)").text();
+    anonymity = element.children("td:nth-of-type(8)").text().replace(/\n/g, "").trim();
     ipSegments = [];
     ipBlock = element.find("td:nth-of-type(2) > span");
     ipBlock.contents().each(function() {