Tighten up cookie security

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index fdba06e98eb8facdc9aa3d1cfdb90cf22a858d9a..a2169643f37b8e99b3264fb895fab59f2903951f 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,6 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

-//= require leaflet.locate
+//= require leaflet.locatecontrol/src/L.Control.Locate

 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note


@@ -20,11 +20,9 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

-//= require querystring
+//= require qs/dist/qs

 
 $(document).ready(function () {
 
 $(document).ready(function () {

-  var querystring = require("querystring-component");
-

   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {
   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {


@@ -110,9 +108,9 @@ $(document).ready(function () {
     iconLoading: "icon geolocate",
     strings: {
       title: I18n.t("javascripts.map.locate.title"),
     iconLoading: "icon geolocate",
     strings: {
       title: I18n.t("javascripts.map.locate.title"),

-      metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
-      feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
-      popup: I18n.t("javascripts.map.locate.popup")
+      popup: function (options) {
+        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+      }

     }
   }).addTo(map);
 
     }
   }).addTo(map);
 


@@ -191,16 +189,16 @@ $(document).ready(function () {
       map._object);
 
     $.removeCookie("_osm_location");
       map._object);
 
     $.removeCookie("_osm_location");

-    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+    $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" });

   });
 
   if ($.cookie("_osm_welcome") !== "hide") {
     $(".welcome").addClass("visible");
   }
 
   });
 
   if ($.cookie("_osm_welcome") !== "hide") {
     $(".welcome").addClass("visible");
   }
 

-  $(".welcome .close-wrap").on("click", function () {
+  $(".welcome .close").on("click", function () {

     $(".welcome").removeClass("visible");
     $(".welcome").removeClass("visible");

-    $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+    $.cookie("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/" });

   });
 
   var bannerExpiry = new Date();
   });
 
   var bannerExpiry = new Date();


@@ -211,7 +209,7 @@ $(document).ready(function () {
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {

-      $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+      $.cookie(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/" });

     }
   });
 
     }
   });
 


@@ -264,7 +262,7 @@ $(document).ready(function () {
     var iframe = $("<iframe>")
       .hide()
       .appendTo("body")
     var iframe = $("<iframe>")
       .hide()
       .appendTo("body")

-      .attr("src", url + querystring.stringify(query))
+      .attr("src", url + Qs.stringify(query))

       .on("load", function () {
         $(this).remove();
         loaded = true;
       .on("load", function () {
         $(this).remove();
         loaded = true;


@@ -309,7 +307,7 @@ $(document).ready(function () {
     };
 
     page.load = function () {
     };
 
     page.load = function () {

-      var params = querystring.parse(location.search.substring(1));
+      var params = Qs.parse(location.search.substring(1));

       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }
       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }