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 e83b4994766726d0c3557906facb887728e6a8f5..1cbd97f86351e442f210d320e41167c5f42b1969 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -37,13 +37,28 @@
 
     $.ajax({
       url: path,
 
     $.ajax({
       url: path,

+      dataType: "html",

       complete: function(xhr) {
         clearTimeout(loaderTimeout);
       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();
         }


@@ -197,21 +212,23 @@ $(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})
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})

-        .panBy([-300, 0], {animate: false});
-      OSM.loadSidebarContent(path);
+        .panBy([-350, 0], {animate: false});
+    };
+
+    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() {

-      map.panBy([300, 0], {animate: false});
+      map.panBy([350, 0], {animate: false});

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


@@ -219,29 +236,17 @@ $(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) {
-      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
-
-      map.addObject({type: type, id: parseInt(id)},
-        {
-          zoom: window.location.hash == "",
-          style: {
-            color: "#FF6200",
-            weight: 4,
-            opacity: 1,
-            fillOpacity: 0.5
-          }
-        }
-      );
+    page.load = function(path, id) {
+      map.addObject({type: type, id: parseInt(id)});

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


@@ -251,25 +256,29 @@ $(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),
+    "/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;
   $(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) {


@@ -277,16 +286,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)));
   });