Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/jappix/jappix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValérian Saliou <valerian@valeriansaliou.name>2015-03-17 14:42:27 +0300
committerValérian Saliou <valerian@valeriansaliou.name>2015-03-17 14:42:27 +0300
commitbc5b1d47140bd0d070fb72968b26244d77fe68de (patch)
tree46a6f58b77d2dd43711d178a4570c17ab0b0eb1c
parent620c00433a79c8b60cb8c62625c34f53531a8244 (diff)
parent07dc1bea83482b48b8a2ec2dadc233fe60f22db5 (diff)
Merge pull request #534 from V1RTUOZ/V1RTUOZ-patch-533
patch for #533
-rw-r--r--app/javascripts/common.js11
-rw-r--r--app/javascripts/dataform.js6
2 files changed, 14 insertions, 3 deletions
diff --git a/app/javascripts/common.js b/app/javascripts/common.js
index 58746044..8f58bfd4 100644
--- a/app/javascripts/common.js
+++ b/app/javascripts/common.js
@@ -894,6 +894,17 @@ var Common = (function () {
}
};
+
+ /**
+ * Convert all applicable characters to HTML entities
+ * @public
+ * @param {string} cb
+ * @return {string}
+ */
+ self.htmlentities = function(s) {
+ return $('<div/>').text(s + '').html();
+ };
+
/**
diff --git a/app/javascripts/dataform.js b/app/javascripts/dataform.js
index 74ac29d7..e8af85d2 100644
--- a/app/javascripts/dataform.js
+++ b/app/javascripts/dataform.js
@@ -591,8 +591,8 @@ var DataForm = (function () {
'<div class="avatar-container">' +
'<img class="avatar" src="' + './images/others/default-avatar.png' + '" alt="" />' +
'</div>' +
- '<div class="one-fn">' + bName + '</div>' +
- '<div class="one-ctry">' + bCountry + '</div>' +
+ '<div class="one-fn">' + Common.htmlentities(bName) + '</div>' +
+ '<div class="one-ctry">' + Common.htmlentities(bCountry) + '</div>' +
'<div class="one-jid">' + bXID + '</div>' +
'<div class="buttons-container">';
@@ -1197,4 +1197,4 @@ var DataForm = (function () {
*/
return self;
-})(); \ No newline at end of file
+})();