Add tests for new redirects and fix a few bugs in the redirects

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 59e231381778bb5d1591982f0256f57e2fc0e55e..3ce1a02da3d0a2ada5f01f9d9f79df19e18fea2e 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -40,11 +40,24 @@
       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')) {
           document.title = xhr.getResponseHeader('X-Page-Title');
         }
         if (xhr.getResponseHeader('X-Page-Title')) {
           document.title = xhr.getResponseHeader('X-Page-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();
         }


@@ -198,22 +211,19 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

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

       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
         .panBy([-350, 0], {animate: false});
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
         .panBy([-350, 0], {animate: false});

-      OSM.loadSidebarContent(path);
-      page.load();

     };
 
     page.load = function() {
       return map.getState();
     };
 
     };
 
     page.load = function() {
       return map.getState();
     };
 

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

       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});

-      OSM.loadSidebarContent(path);

     };
 
     page.unload = function() {
     };
 
     page.unload = function() {


@@ -245,27 +255,26 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  var history = OSM.History(map),
-    note = OSM.Note(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),

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

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

-    "/new_note":                   OSM.NewNote(map),
-    "/user/:display_name/edits":   history,
-    "/browse/friends":             history,
-    "/browse/nearby":              history,
-    "/browse/note/:id":            note,
-    "/browse/:type/:id(/history)": OSM.Browse(map)
+    "/user/:display_name/history": history,
+    "/note/:id":                  OSM.Note(map),
+    "/:type/:id(/history)":       OSM.Browse(map)

   });
 
   });
 

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

 
   $(document).on("click", "a", function(e) {
     if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
 
   $(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 (this.host === window.location.host && OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault();

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


@@ -273,16 +282,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)));
   });