Replace some legacy routes with redirects

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index ba1f08407d1587343bf5b6532faab2ff52a36e6b..c5532cfc4ca0791858597f61cf51e9dc30032618 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -40,11 +40,25 @@
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);

+        $('#flash').empty();

         $('#sidebar_loader').hide();
         $('#sidebar_loader').hide();

-        $('#sidebar_content').html(xhr.responseText);
+
+        var content = $(xhr.responseText);
+

         if (xhr.getResponseHeader('X-Page-Title')) {
         if (xhr.getResponseHeader('X-Page-Title')) {

-          document.title = xhr.getResponseHeader('X-Page-Title');
+          var title = xhr.getResponseHeader('X-Page-Title');
+          document.title = decodeURIComponent(escape(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();
         }
         if (callback) {
           callback();
         }


@@ -126,18 +140,28 @@ $(document).ready(function () {
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 

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

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

-    updatelinks(
+    updateLinks(

       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 
       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 

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

     $.cookie("_osm_location", cookieContent(map), { expires: expiry });
   });
 
     $.cookie("_osm_location", cookieContent(map), { expires: expiry });
   });
 

+  if ($.cookie('_osm_welcome') == 'hide') {
+    $('.welcome').hide();
+  }
+
+  $('.welcome .close').on('click', function() {
+    $('.welcome').hide();
+    $.cookie("_osm_welcome", 'hide', { expires: expiry });
+  });
+

   if (OSM.PIWIK) {
     map.on('layeradd', function (e) {
       if (e.layer.options) {
   if (OSM.PIWIK) {
     map.on('layeradd', function (e) {
       if (e.layer.options) {


@@ -222,16 +246,16 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

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

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

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

       OSM.loadSidebarContent(path, function() {
       OSM.loadSidebarContent(path, function() {

-        page.load(path, type, id);
+        page.load(path, id);

       });
     };
 
       });
     };
 

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

       map.addObject({type: type, id: parseInt(id)});
     };
 
       map.addObject({type: type, id: parseInt(id)});
     };
 


@@ -244,24 +268,38 @@ $(document).ready(function () {
 
   var history = OSM.History(map);
 
 
   var history = OSM.History(map);
 

-  OSM.route = OSM.Router(map, {
+  OSM.router = OSM.Router(map, {

     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),

-    "/new_note":                   OSM.NewNote(map),
+    "/note/new":                   OSM.NewNote(map),
+    "/history/friends":            history,
+    "/history/nearby":             history,

     "/history":                    history,
     "/history":                    history,

-    "/user/:display_name/edits":   history,
-    "/browse/friends":             history,
-    "/browse/nearby":              history,
-    "/browse/note/:id":            OSM.Note(map),
-    "/browse/:type/:id(/history)": OSM.Browse(map)
+    "/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.Browse(map, 'changeset')

   });
 
   });
 

-  OSM.route.load();
+  OSM.router.load();

 
   $(document).on("click", "a", function(e) {
 
   $(document).on("click", "a", function(e) {

-    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
-    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
+    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();

   });
 
   $(".search_form").on("submit", function(e) {
   });
 
   $(".search_form").on("submit", function(e) {


@@ -269,16 +307,16 @@ $(document).ready(function () {
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     if (query) {
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     if (query) {

-      OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
+      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));

     } else {
     } else {

-      OSM.route("/" + OSM.formatHash(map));
+      OSM.router.route("/" + OSM.formatHash(map));

     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
     var precision = zoomPrecision(map.getZoom());
     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
     var precision = zoomPrecision(map.getZoom());

-    OSM.route("/search?query=" + encodeURIComponent(
+    OSM.router.route("/search?query=" + encodeURIComponent(

       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));
   });
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));
   });