Use normalised target name in Rating Window and Warning screen.

mywot · May 28, 2013 · ba796f2 · samitolvanen · May 28, 2013 · ba796f2
1 parent 6b2446b
commit ba796f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/content/warning.js b/content/warning.js
@@ -174,6 +174,9 @@ wot.warning = {
 
 			this.target = data.target;
 
+            var normalized_target = (data.cached && data.cached.value &&
+                data.cached.value.normalized) ? data.cached.value.normalized : data.decodedtarget;
+
 			// preprocess link "Rate the site"
 			var rate_site = wot.i18n("warnings", "ratesite").replace("<a>", "<a id='wotrate-link' class='wot-link'>");
 			var wt_text_2 = wot.i18n("wt", "warning_text_2") || "";
@@ -185,7 +188,7 @@ wot.warning = {
 				to: wot.i18n("warnings", "warning")
 			},			{
 					from: "TITLE",
-					to: (data.decodedtarget || "").replace(/[<>&="']/g, "")
+					to: (normalized_target || "").replace(/[<>&="']/g, "")
 				}, {
 					from: "LANG",
 					to: wot.i18n("lang")

diff --git a/ratingwindow.js b/ratingwindow.js
@@ -248,11 +248,12 @@ $.extend(wot, { ratingwindow: {
 
 		/* update current rating state */
 		this.updatestate(this.current.target, cached);
+        var normalized_target = cached.value.normalized ? cached.value.normalized : this.current.target;
 
 		/* target */
 		if (this.current.target && cached.status == wot.cachestatus.ok) {
 			$("#wot-title-text").text(
-				bg.wot.url.decodehostname(this.current.target));
+				bg.wot.url.decodehostname(normalized_target));
 		} else if (cached.status == wot.cachestatus.busy) {
 			$("#wot-title-text").text(wot.i18n("messages", "loading"));
 		} else if (cached.status == wot.cachestatus.error) {