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 085b615c7244f66214f2cddee69f89400c28d3d0..a2169643f37b8e99b3264fb895fab59f2903951f 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,12 +1,14 @@
 //= 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.share
 //= require leaflet.polyline
 //= require leaflet.query
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.polyline
 //= require leaflet.query

+//= require leaflet.contextmenu
+//= require index/contextmenu

 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/search
 //= require index/browse
 //= require index/export


@@ -18,53 +20,63 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

+//= require qs/dist/qs

 
 $(document).ready(function () {
   var loaderTimeout;
 
 
 $(document).ready(function () {
   var loaderTimeout;
 

-  OSM.loadSidebarContent = function(path, callback) {
+  var map = new L.OSM.Map("map", {
+    zoomControl: false,
+    layerControl: false,
+    contextmenu: true,
+    worldCopyJump: true
+  });
+
+  OSM.loadSidebarContent = function (path, callback) {
+    var content_path = path;
+

     map.setSidebarOverlaid(false);
 
     clearTimeout(loaderTimeout);
 
     map.setSidebarOverlaid(false);
 
     clearTimeout(loaderTimeout);
 

-    loaderTimeout = setTimeout(function() {
-      $('#sidebar_loader').show();
+    loaderTimeout = setTimeout(function () {
+      $("#sidebar_loader").show();

     }, 200);
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
     }, 200);
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.

-    if (path.indexOf('?') >= 0) {
-      path += '&xhr=1';
+    if (content_path.indexOf("?") >= 0) {
+      content_path += "&xhr=1";

     } else {
     } else {

-      path += '?xhr=1';
+      content_path += "?xhr=1";

     }
 
     }
 

-    $('#sidebar_content')
+    $("#sidebar_content")

       .empty();
 
     $.ajax({
       .empty();
 
     $.ajax({

-      url: path,
+      url: content_path,

       dataType: "html",
       dataType: "html",

-      complete: function(xhr) {
+      complete: function (xhr) {

         clearTimeout(loaderTimeout);
         clearTimeout(loaderTimeout);

-        $('#flash').empty();
-        $('#sidebar_loader').hide();
+        $("#flash").empty();
+        $("#sidebar_loader").hide();

 
         var content = $(xhr.responseText);
 
 
         var content = $(xhr.responseText);
 

-        if (xhr.getResponseHeader('X-Page-Title')) {
-          var title = xhr.getResponseHeader('X-Page-Title');
+        if (xhr.getResponseHeader("X-Page-Title")) {
+          var title = xhr.getResponseHeader("X-Page-Title");

           document.title = decodeURIComponent(title);
         }
 
           document.title = decodeURIComponent(title);
         }
 

-        $('head')
-          .find('link[type="application/atom+xml"]')
+        $("head")
+          .find("link[type=\"application/atom+xml\"]")

           .remove();
 
           .remove();
 

-        $('head')
-          .append(content.filter('link[type="application/atom+xml"]'));
+        $("head")
+          .append(content.filter("link[type=\"application/atom+xml\"]"));

 
 

-        $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));
+        $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]"));

 
         if (callback) {
           callback();
 
         if (callback) {
           callback();


@@ -75,12 +87,7 @@ $(document).ready(function () {
 
   var params = OSM.mapParams();
 
 
   var params = OSM.mapParams();
 

-  var map = new L.OSM.Map("map", {
-    zoomControl: false,
-    layerControl: false
-  });
-
-  map.attributionControl.setPrefix('');
+  map.attributionControl.setPrefix("");

 
   map.updateLayers(params.layers);
 
 
   map.updateLayers(params.layers);
 


@@ -90,20 +97,34 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";

 
 

-  L.OSM.zoom({position: position})
+  L.OSM.zoom({ position: position })

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

-  L.control.locate({
+  var locate = L.control.locate({

     position: position,
     position: position,

+    icon: "icon geolocate",
+    iconLoading: "icon geolocate",

     strings: {
     strings: {

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

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

-  var sidebar = L.OSM.sidebar('#map-ui')
+  var locateContainer = locate.getContainer();
+
+  $(locateContainer)
+    .removeClass("leaflet-control-locate leaflet-bar")
+    .addClass("control-locate")
+    .children("a")
+    .attr("href", "#")
+    .removeClass("leaflet-bar-part leaflet-bar-part-single")
+    .addClass("control-button");
+
+  var sidebar = L.OSM.sidebar("#map-ui")

     .addTo(map);
 
   L.OSM.layers({
     .addTo(map);
 
   L.OSM.layers({


@@ -118,9 +139,9 @@ $(document).ready(function () {
   }).addTo(map);
 
   L.OSM.share({
   }).addTo(map);
 
   L.OSM.share({

-    position: position,
-    sidebar: sidebar,
-    short: true
+    "position": position,
+    "sidebar": sidebar,
+    "short": true

   }).addTo(map);
 
   L.OSM.note({
   }).addTo(map);
 
   L.OSM.note({


@@ -136,7 +157,9 @@ $(document).ready(function () {
   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 

-  if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+  OSM.initializeContextMenu(map);
+
+  if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {

     OSM.initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     OSM.initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);


@@ -146,15 +169,19 @@ $(document).ready(function () {
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }

+
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
+    }

   }
 
   }
 

-  var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
-  $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'});
+  var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
+  $(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" });

 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 

-  map.on('moveend layeradd layerremove', function() {
+  map.on("moveend layeradd layerremove", function () {

     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),
     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),


@@ -162,25 +189,37 @@ $(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').hide();
+  if ($.cookie("_osm_welcome") !== "hide") {
+    $(".welcome").addClass("visible");

   }
 
   }
 

-  $('.welcome .close').on('click', function() {
-    $('.welcome').hide();
-    $.cookie("_osm_welcome", 'hide', { expires: expiry });
+  $(".welcome .close").on("click", function () {
+    $(".welcome").removeClass("visible");
+    $.cookie("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/" });
+  });
+
+  var bannerExpiry = new Date();
+  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+  $("#banner .close-wrap").on("click", function (e) {
+    var cookieId = e.target.id;
+    $("#banner").hide();
+    e.preventDefault();
+    if (cookieId) {
+      $.cookie(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/" });
+    }

   });
 
   if (OSM.PIWIK) {
   });
 
   if (OSM.PIWIK) {

-    map.on('layeradd', function (e) {
+    map.on("layeradd", function (e) {

       if (e.layer.options) {
         var goal = OSM.PIWIK.goals[e.layer.options.keyid];
 
         if (goal) {
       if (e.layer.options) {
         var goal = OSM.PIWIK.goals[e.layer.options.keyid];
 
         if (goal) {

-          $('body').trigger('piwikgoal', goal);
+          $("body").trigger("piwikgoal", goal);

         }
       }
     });
         }
       }
     });


@@ -192,27 +231,23 @@ $(document).ready(function () {
     map.setView([params.lat, params.lon], params.zoom);
   }
 
     map.setView([params.lat, params.lon], params.zoom);
   }
 

-  var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
-

   if (params.marker) {
   if (params.marker) {

-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+    L.marker([params.mlat, params.mlon]).addTo(map);

   }
 
   }
 

-  $("#homeanchor").on("click", function(e) {
+  $("#homeanchor").on("click", function (e) {

     e.preventDefault();
 
     var data = $(this).data(),
     e.preventDefault();
 
     var data = $(this).data(),

-      center = L.latLng(data.lat, data.lon);
+        center = L.latLng(data.lat, data.lon);

 
     map.setView(center, data.zoom);
 
     map.setView(center, data.zoom);

-    marker.setLatLng(center).addTo(map);
+    L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);

   });
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,
   });
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,

-        url = document.location.protocol === "https:" ?
-        "https://127.0.0.1:8112/load_and_zoom?" :
-        "http://127.0.0.1:8111/load_and_zoom?",
+        url,

         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,


@@ -220,20 +255,22 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
           bottom: bbox.getSouth() - 0.0001
         };
 

+    url = "http://127.0.0.1:8111/load_and_zoom?";
+

     if (object) query.select = object.type + object.id;
 
     if (object) query.select = object.type + object.id;
 

-    var iframe = $('<iframe>')
-        .hide()
-        .appendTo('body')
-        .attr("src", url + querystring.stringify(query))
-        .on('load', function() {
-          $(this).remove();
-          loaded = true;
-        });
+    var iframe = $("<iframe>")
+      .hide()
+      .appendTo("body")
+      .attr("src", url + Qs.stringify(query))
+      .on("load", function () {
+        $(this).remove();
+        loaded = true;
+      });

 
     setTimeout(function () {
       if (!loaded) {
 
     setTimeout(function () {
       if (!loaded) {

-        alert(I18n.t('site.index.remote_failed'));
+        alert(I18n.t("site.index.remote_failed"));

         iframe.remove();
       }
     }, 1000);
         iframe.remove();
       }
     }, 1000);


@@ -241,36 +278,36 @@ $(document).ready(function () {
     return false;
   }
 
     return false;
   }
 

-  $("a[data-editor=remote]").click(function(e) {
+  $("a[data-editor=remote]").click(function (e) {

     var params = OSM.mapParams(this.search);
     remoteEditHandler(map.getBounds(), params.object);
     e.preventDefault();
   });
 
   if (OSM.params().edit_help) {
     var params = OSM.mapParams(this.search);
     remoteEditHandler(map.getBounds(), params.object);
     e.preventDefault();
   });
 
   if (OSM.params().edit_help) {

-    $('#editanchor')
-      .removeAttr('title')
+    $("#editanchor")
+      .removeAttr("title")

       .tooltip({
       .tooltip({

-        placement: 'bottom',
-        title: I18n.t('javascripts.edit_help')
+        placement: "bottom",
+        title: I18n.t("javascripts.edit_help")

       })
       })

-      .tooltip('show');
+      .tooltip("show");

 
 

-    $('body').one('click', function() {
-      $('#editanchor').tooltip('hide');
+    $("body").one("click", function () {
+      $("#editanchor").tooltip("hide");

     });
   }
 
     });
   }
 

-  OSM.Index = function(map) {
+  OSM.Index = function (map) {

     var page = {};
 
     var page = {};
 

-    page.pushstate = page.popstate = function() {
+    page.pushstate = page.popstate = function () {

       map.setSidebarOverlaid(true);
       map.setSidebarOverlaid(true);

-      document.title = I18n.t('layouts.project_name.title');
+      document.title = I18n.t("layouts.project_name.title");

     };
 
     };
 

-    page.load = function() {
-      var params = querystring.parse(location.search.substring(1));
+    page.load = function () {
+      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);
       }


@@ -283,21 +320,21 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  OSM.Browse = function(map, type) {
+  OSM.Browse = function (map, type) {

     var page = {};
 
     var page = {};
 

-    page.pushstate = page.popstate = function(path, id) {
-      OSM.loadSidebarContent(path, function() {
+    page.pushstate = page.popstate = function (path, id) {
+      OSM.loadSidebarContent(path, function () {

         addObject(type, id);
       });
     };
 
         addObject(type, id);
       });
     };
 

-    page.load = function(path, id) {
+    page.load = function (path, id) {

       addObject(type, id, true);
     };
 
     function addObject(type, id, center) {
       addObject(type, id, true);
     };
 
     function addObject(type, id, center) {

-      map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+      map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {

         if (!window.location.hash && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {
         if (!window.location.hash && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {


@@ -305,9 +342,13 @@ $(document).ready(function () {
           });
         }
       });
           });
         }
       });

+
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });

     }
 
     }
 

-    page.unload = function() {
+    page.unload = function () {

       map.removeObject();
     };
 
       map.removeObject();
     };
 


@@ -317,21 +358,21 @@ $(document).ready(function () {
   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {
   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {

-    "/":                           OSM.Index(map),
-    "/search":                     OSM.Search(map),
-    "/directions":                 OSM.Directions(map),
-    "/export":                     OSM.Export(map),
-    "/note/new":                   OSM.NewNote(map),
-    "/history/friends":            history,
-    "/history/nearby":             history,
-    "/history":                    history,
+    "/": OSM.Index(map),
+    "/search": OSM.Search(map),
+    "/directions": OSM.Directions(map),
+    "/export": OSM.Export(map),
+    "/note/new": OSM.NewNote(map),
+    "/history/friends": history,
+    "/history/nearby": history,
+    "/history": history,

     "/user/:display_name/history": history,
     "/user/:display_name/history": history,

-    "/note/:id":                   OSM.Note(map),
-    "/node/:id(/history)":         OSM.Browse(map, 'node'),
-    "/way/:id(/history)":          OSM.Browse(map, 'way'),
-    "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
-    "/changeset/:id":              OSM.Changeset(map),
-    "/query":                      OSM.Query(map)
+    "/note/:id": OSM.Note(map),
+    "/node/:id(/history)": OSM.Browse(map, "node"),
+    "/way/:id(/history)": OSM.Browse(map, "way"),
+    "/relation/:id(/history)": OSM.Browse(map, "relation"),
+    "/changeset/:id": OSM.Changeset(map),
+    "/query": OSM.Query(map)

   });
 
   if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
   });
 
   if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {


@@ -341,19 +382,23 @@ $(document).ready(function () {
 
   OSM.router.load();
 
 
   OSM.router.load();
 

-  $(document).on("click", "a", function(e) {
-    if (e.isDefaultPrevented() || e.isPropagationStopped())
+  $(document).on("click", "a", function (e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) {

       return;
       return;

+    }

 
     // Open links in a new tab as normal.
 
     // Open links in a new tab as normal.

-    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) {

       return;
       return;

+    }

 
     // Ignore cross-protocol and cross-origin links.
 
     // Ignore cross-protocol and cross-origin links.

-    if (location.protocol !== this.protocol || location.host !== this.host)
+    if (location.protocol !== this.protocol || location.host !== this.host) {

       return;
       return;

+    }

 
 

-    if (OSM.router.route(this.pathname + this.search + this.hash))
+    if (OSM.router.route(this.pathname + this.search + this.hash)) {

       e.preventDefault();
       e.preventDefault();

+    }

   });
 });
   });
 });