about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-04 00:51:50 -0700
committerbors <bors@rust-lang.org>2014-05-04 00:51:50 -0700
commit1f25c8b78d1192aea69ee9779f512eb9ee78e575 (patch)
tree648b73ffccca51596fc2b3f54408724f38ba986f
parentafed55b99b3ee7eb1fd3f13acbc164e27091ae01 (diff)
parent5f0a426f65953bbf011b051528a6e6fe234ddecb (diff)
downloadrust-1f25c8b78d1192aea69ee9779f512eb9ee78e575.tar.gz
rust-1f25c8b78d1192aea69ee9779f512eb9ee78e575.zip
auto merge of #13895 : adrientetar/rust/js-escape, r=alexcrichton
See #13884 for the details. Closes #13884.

r? @alexcrichton
-rw-r--r--src/librustdoc/html/static/main.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 21d57a17c67..9243f72dab7 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -386,12 +386,16 @@
             });
         }
 
+        function escape(content) {
+            return $('<h1/>').text(content).html();
+        }
+
         function showResults(results) {
             var output, shown, query = getQuery();
 
             currentResults = query.id;
-            output = '<h1>Results for ' + query.query +
-                    (query.type ? ' (type: ' + query.type + ')' : '') + '</h1>';
+            output = '<h1>Results for ' + escape(query.query) +
+                (query.type ? ' (type: ' + escape(query.type) + ')' : '') + '</h1>';
             output += '<table class="search-results">';
 
             if (results.length > 0) {
@@ -650,4 +654,3 @@
 
     window.initSearch = initSearch;
 }());
-