Force the X-Page-Title value to be treated as UTF-8

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e0ca66766ff877079a0d118cb2c4e588bf1e4bc2..1cbd97f86351e442f210d320e41167c5f42b1969 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -14,6 +14,59 @@
 //= require index/new_note
 //= require router
 
+(function() {
+  var loaderTimeout;
+
+  OSM.loadSidebarContent = function(path, callback) {
+    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 (path.indexOf('?') >= 0) {
+      path += '&xhr=1'
+    } else {
+      path += '?xhr=1'
+    }
+
+    $('#sidebar_content')
+      .empty();
+
+    $.ajax({
+      url: 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(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();
+        }
+      }
+    });
+  };
+})();
+
 $(document).ready(function () {
   var params = OSM.mapParams();
 
@@ -159,29 +212,23 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
-    function loadContent(path) {
-      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
-        if (xhr.getResponseHeader('X-Page-Title')) {
-          document.title = xhr.getResponseHeader('X-Page-Title');
-        }
-      });
-    }
-
-    page.pushstate = function(path) {
+    page.pushstate = function() {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
-        .panBy([-300, 0], {animate: false});
-      loadContent(path);
+        .panBy([-350, 0], {animate: false});
     };
 
-    page.popstate = function(path) {
+    page.load = function() {
+      return map.getState();
+    };
+
+    page.popstate = function() {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});
-      loadContent(path);
     };
 
     page.unload = function() {
-      map.panBy([300, 0], {animate: false});
+      map.panBy([350, 0], {animate: false});
       $("#content").removeClass("overlay-sidebar");
       map.invalidateSize({pan: false});
     };
@@ -189,22 +236,17 @@ $(document).ready(function () {
     return page;
   };
 
-  OSM.Browse = function(map) {
+  OSM.Browse = function(map, type) {
     var page = {};
 
-    page.pushstate = page.popstate = function(path, type, id) {
-      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
-        if (xhr.getResponseHeader('X-Page-Title')) {
-          document.title = xhr.getResponseHeader('X-Page-Title');
-        }
-        page.load(path, type, id);
+    page.pushstate = page.popstate = function(path, id) {
+      OSM.loadSidebarContent(path, function() {
+        page.load(path, id);
       });
     };
 
-    page.load = function(path, type, id) {
-      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
-
-      map.addObject({type: type, id: parseInt(id)}, {zoom: true});
+    page.load = function(path, id) {
+      map.addObject({type: type, id: parseInt(id)});
     };
 
     page.unload = function() {
@@ -214,37 +256,46 @@ $(document).ready(function () {
     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),
+    "/note/new":                   OSM.NewNote(map),
+    "/history/friends":            history,
+    "/history/nearby":             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),
+    "/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.router.load();
+
   $(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) {
     e.preventDefault();
     $("header").addClass("closed");
-    OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map));
+    var query = $(this).find("input[name=query]").val();
+    if (query) {
+      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
+    } else {
+      OSM.router.route("/" + OSM.formatHash(map));
+    }
   });
 
   $(".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)));
   });