Refactor: JS init + HTTPS-safe URLs

1 files changed, 4 insertions, 7 deletions

diff --git a/static/js/src/search.js b/static/js/src/search.js
index c7bdabf..9a9d389 100755
--- a/static/js/src/search.js
+++ b/static/js/src/search.js
@@ -159,18 +159,15 @@ Search = {
   },
 
   'doAjax': function(term) {
-    if (Domain == "/") {
       $.ajax({
         "dataType": "json",
         "url": "/cmd/search/" + term,
         "success": Search.results,
-        "error": Search.error,
+        "error": function(_xhr, _status, error){
+          Search.searchError(error || "search failed")
+        },
         "timeout": 20000,
       })
-    } else { // search main site via jsonp
-      $("#search-script").remove()
-      $("head").append("<s"+"cript src='/cmd/search/"+term+"?callback=Search.results' id='search-script'></s"+"cript>")
-    }
   },
 
   'click': function(e){
@@ -206,7 +203,7 @@ Search = {
         if (url.charAt(0) == '/')
           url = '/images' + url
         else
-          url = 'http://' + url
+          url = normalizeUrl(url)
         urls.push(url) 
       })
       ImgCache.add("search", urls)