Merge pull request #852 from support-project/issue845_escape_link

#845 escape link url for bookmark type
support-project · Sep 13, 2017 · f3f1a54 · f3f1a54
2 parents cf290ed + c93f3cd
commit f3f1a54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
@@ -113,6 +113,17 @@ function unescapeHTML(str) {
     return div.textContent || div.innerText;
 };
 
+function escapeLink(url) {
+    if (url.toLowerCase().indexOf('javascript:') != -1) {
+        var conv = '';
+        conv += url.substring(0, url.toLowerCase().indexOf('javascript:'));
+        conv += encodeURIComponent(url.substring(url.toLowerCase().indexOf('javascript:')));
+        return conv;
+    } else {
+        return url;
+    }
+}
+
 var handleErrorResponse = function(xhr, textStatus, error) {
     console.log(error);
     console.log(xhr);

diff --git a/src/main/webapp/js/template-item-view.js b/src/main/webapp/js/template-item-view.js
@@ -21,7 +21,7 @@ $(document).ready(function() {
             url = item.itemValue;
         }
         tag += '<h4>' + item.itemName + ': ';
-        tag += '<a href="' + url + '" target="_blank" >' + url + '</a></h4>';
+        tag += '<a href="' + escapeLink(url) + '" target="_blank" >' + url + '</a></h4>';
         return tag;
     };
     var createRadioItem = function(item) {