Merge remote-tracking branch 'upstream/pull/2354'

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d15ee58599e21538ecee03967a446260e65b425d..039cc0ef66b5ccb4c6da47ec98ae0c21dcd0e1d8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -21,8 +21,11 @@
 //= require index/query
 //= require router
 //= require bowser
+//= require querystring
 
 $(document).ready(function () {
+  var querystring = require("querystring-component");
+
   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {
@@ -264,7 +267,7 @@ $(document).ready(function () {
     var iframe = $("<iframe>")
       .hide()
       .appendTo("body")
-      .attr("src", url + qs.stringify(query))
+      .attr("src", url + querystring.stringify(query))
       .on("load", function () {
         $(this).remove();
         loaded = true;
@@ -309,7 +312,7 @@ $(document).ready(function () {
     };
 
     page.load = function () {
-      var params = qs.parse(location.search.substring(1));
+      var params = querystring.parse(location.search.substring(1));
       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }
@@ -344,6 +347,10 @@ $(document).ready(function () {
           });
         }
       });
+
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });
     }
 
     page.unload = function () {