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 8d3a043d6f8e00a47d9281b7166a4bec5f2b9cb7..a2169643f37b8e99b3264fb895fab59f2903951f 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,170 +1,404 @@
 //= require_self
 //= require_self

+//= require leaflet.sidebar
+//= 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.contextmenu
+//= require index/contextmenu
+//= require index/search

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

-//= require index/key

 //= require index/notes
 //= require index/notes

-//= require index/map_ui
+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
+//= require router
+//= require qs/dist/qs

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

-  var permalinks = $("#permalink").detach().html();
-  var marker;
-  var params = OSM.mapParams();
-  var map = createMap("map", {
+  var loaderTimeout;
+
+  var map = new L.OSM.Map("map", {

     zoomControl: false,
     zoomControl: false,

-    layerControl: false
-  }, {
-    locateControl: true
+    layerControl: false,
+    contextmenu: true,
+    worldCopyJump: true

   });
 
   });
 

-  L.control.zoom({position: 'topright'})
-    .addTo(map);
+  OSM.loadSidebarContent = function (path, callback) {
+    var content_path = path;

 
 

-  OSM.mapUI().addTo(map);
+    map.setSidebarOverlaid(false);

 
 

-  L.control.share({
-      getUrl: function(map) {
-          return setArgs('http://osm.org/', {
-              lon: map.getCenter().lng,
-              lat: map.getCenter().lat
-          });
+    clearTimeout(loaderTimeout);
+
+    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.
+    if (content_path.indexOf("?") >= 0) {
+      content_path += "&xhr=1";
+    } else {
+      content_path += "?xhr=1";
+    }
+
+    $("#sidebar_content")
+      .empty();
+
+    $.ajax({
+      url: content_path,
+      dataType: "html",
+      complete: function (xhr) {
+        clearTimeout(loaderTimeout);
+        $("#flash").empty();
+        $("#sidebar_loader").hide();
+
+        var content = $(xhr.responseText);
+
+        if (xhr.getResponseHeader("X-Page-Title")) {
+          var title = xhr.getResponseHeader("X-Page-Title");
+          document.title = decodeURIComponent(title);
+        }
+
+        $("head")
+          .find("link[type=\"application/atom+xml\"]")
+          .remove();
+
+        $("head")
+          .append(content.filter("link[type=\"application/atom+xml\"]"));
+
+        $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]"));
+
+        if (callback) {
+          callback();
+        }

       }
       }

-  }).addTo(map);
+    });
+  };

 
 

-  L.control.locate({
-      position: 'topright'
-  }).addTo(map);
+  var params = OSM.mapParams();

 
 

-  L.control.scale().addTo(map);
+  map.attributionControl.setPrefix("");

 
 

-  map.attributionControl.setPrefix(permalinks);
+  map.updateLayers(params.layers);

 
 

-  map.on("moveend layeradd layerremove", updateLocation);
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });

 
 

-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = L.latLngBounds([params.minlat, params.minlon],
-                                [params.maxlat, params.maxlon]);
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";

 
 

-      map.fitBounds(bbox);
+  L.OSM.zoom({ position: position })
+    .addTo(map);

 
 

-      if (params.box) {
-        L.rectangle(bbox, {
-          weight: 2,
-          color: '#e90',
-          fillOpacity: 0
-        }).addTo(map);
+  var locate = L.control.locate({
+    position: position,
+    icon: "icon geolocate",
+    iconLoading: "icon geolocate",
+    strings: {
+      title: I18n.t("javascripts.map.locate.title"),
+      popup: function (options) {
+        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });

       }
       }

-    } else {
-      map.setView([params.lat, params.lon], params.zoom);

     }
     }

-  }
+  }).addTo(map);

 
 

-  if (params.layers) {
-    setMapLayers(params.layers);
-  }
+  var locateContainer = locate.getContainer();

 
 

-  if (params.marker) {
-    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
-  }
+  $(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");

 
 

-  if (params.object) {
-    addObjectToMap(params.object, { zoom: params.object_zoom });
-  }
+  var sidebar = L.OSM.sidebar("#map-ui")
+    .addTo(map);

 
 

-  handleResize();
+  L.OSM.layers({
+    position: position,
+    layers: map.baseLayers,
+    sidebar: sidebar
+  }).addTo(map);

 
 

-  $("body").on("click", "a.set_position", function (e) {
-    e.preventDefault();
+  L.OSM.key({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);

 
 

-    var data = $(this).data();
-    var centre = L.latLng(data.lat, data.lon);
+  L.OSM.share({
+    "position": position,
+    "sidebar": sidebar,
+    "short": true
+  }).addTo(map);

 
 

-    if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      map.fitBounds([[data.minLat, data.minLon],
-                     [data.maxLat, data.maxLon]]);
-    } else {
-      map.setView(centre, data.zoom);
+  L.OSM.note({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.control.scale()
+    .addTo(map);
+
+  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);

     }
 
     }
 

-    if (data.type && data.id) {
-      addObjectToMap(data, { zoom: true, style: { opacity: 0.2, fill: false } });
+    OSM.initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);

     }
 
     }
 

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

     }
     }

+  }

 
 

-    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
+  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);
+
+  map.on("moveend layeradd layerremove", function () {
+    updateLinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
+
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" });

   });
 
   });
 

-  function updateLocation() {
-    var center = map.getCenter().wrap();
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = map.getBounds().wrap();
-
-    updatelinks(center.lng,
-                center.lat,
-                zoom,
-                layers,
-                extents.getWest(),
-                extents.getSouth(),
-                extents.getEast(),
-                extents.getNorth(),
-                params.object);
-
-    var expiry = new Date();
-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
+  if ($.cookie("_osm_welcome") !== "hide") {
+    $(".welcome").addClass("visible");

   }
 
   }
 

-  function remoteEditHandler() {
-    var extent = map.getBounds();
-    var loaded = false;
+  $(".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) {
+    map.on("layeradd", function (e) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+
+        if (goal) {
+          $("body").trigger("piwikgoal", goal);
+        }
+      }
+    });
+  }
+
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);
+  }
+
+  if (params.marker) {
+    L.marker([params.mlat, params.mlon]).addTo(map);
+  }
+
+  $("#homeanchor").on("click", function (e) {
+    e.preventDefault();
+
+    var data = $(this).data(),
+        center = L.latLng(data.lat, data.lon);

 
 

-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWest()
-                                                                   + "&bottom=" + extent.getSouth()
-                                                                   + "&right=" + extent.getEast()
-                                                                   + "&top=" + extent.getNorth());
+    map.setView(center, data.zoom);
+    L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
+  });
+
+  function remoteEditHandler(bbox, object) {
+    var loaded = false,
+        url,
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 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;
+
+    var iframe = $("<iframe>")
+      .hide()
+      .appendTo("body")
+      .attr("src", url + Qs.stringify(query))
+      .on("load", function () {
+        $(this).remove();
+        loaded = true;
+      });

 
     setTimeout(function () {
 
     setTimeout(function () {

-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
+      if (!loaded) {
+        alert(I18n.t("site.index.remote_failed"));
+        iframe.remove();
+      }

     }, 1000);
 
     return false;
   }
 
     }, 1000);
 
     return false;
   }
 

-  $("a[data-editor=remote]").click(remoteEditHandler);
+  $("a[data-editor=remote]").click(function (e) {
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();
+  });

 
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+  if (OSM.params().edit_help) {
+    $("#editanchor")
+      .removeAttr("title")
+      .tooltip({
+        placement: "bottom",
+        title: I18n.t("javascripts.edit_help")
+      })
+      .tooltip("show");
+
+    $("body").one("click", function () {
+      $("#editanchor").tooltip("hide");
+    });

   }
 
   }
 

-  $(window).resize(handleResize);
+  OSM.Index = function (map) {
+    var page = {};

 
 

-  $("#search_form").submit(function () {
-    var bounds = map.getBounds();
+    page.pushstate = page.popstate = function () {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t("layouts.project_name.title");
+    };

 
 

-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
-    $("#sidebar_content").load($(this).attr("action"), {
-      query: $("#query").val(),
-      minlon: bounds.getWest(),
-      minlat: bounds.getSouth(),
-      maxlon: bounds.getEast(),
-      maxlat: bounds.getNorth()
-    }, openSidebar);
+    page.load = function () {
+      var params = Qs.parse(location.search.substring(1));
+      if (params.query) {
+        $("#sidebar .search_form input[name=query]").value(params.query);
+      }
+      if (!("autofocus" in document.createElement("input"))) {
+        $("#sidebar .search_form input[name=query]").focus();
+      }
+      return map.getState();
+    };
+
+    return page;
+  };
+
+  OSM.Browse = function (map, type) {
+    var page = {};
+
+    page.pushstate = page.popstate = function (path, id) {
+      OSM.loadSidebarContent(path, function () {
+        addObject(type, id);
+      });
+    };
+
+    page.load = function (path, id) {
+      addObject(type, id, true);
+    };
+
+    function addObject(type, id, center) {
+      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 () {
+            map.fitBounds(bounds);
+          });
+        }
+      });

 
 

-    return false;
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });
+    }
+
+    page.unload = function () {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  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,
+    "/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)

   });
 
   });
 

-  if ($("#query").val()) {
-    $("#search_form").submit();
+  if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");

   }
 
   }
 

-  // Focus the search field for browsers that don't support
-  // the HTML5 'autofocus' attribute
-  if (!("autofocus" in document.createElement("input"))) {
-    $("#query").focus();
-  }
+  OSM.router.load();
+
+  $(document).on("click", "a", function (e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) {
+      return;
+    }
+
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) {
+      return;
+    }
+
+    // Ignore cross-protocol and cross-origin links.
+    if (location.protocol !== this.protocol || location.host !== this.host) {
+      return;
+    }
+
+    if (OSM.router.route(this.pathname + this.search + this.hash)) {
+      e.preventDefault();
+    }
+  });

 });
 });