Compromise on fonts to look better on Windows

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f6cb0223038c145e79852b6a0e84544d3fb9f84f..ba1f08407d1587343bf5b6532faab2ff52a36e6b 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -33,17 +33,23 @@
     }
 
     $('#sidebar_content')
-      .empty()
-      .load(path, function(a, b, xhr) {
+      .empty();
+
+    $.ajax({
+      url: path,
+      dataType: "html",
+      complete: function(xhr) {
         clearTimeout(loaderTimeout);
         $('#sidebar_loader').hide();
+        $('#sidebar_content').html(xhr.responseText);
         if (xhr.getResponseHeader('X-Page-Title')) {
           document.title = xhr.getResponseHeader('X-Page-Title');
         }
         if (callback) {
           callback();
         }
-      });
+      }
+    });
   };
 })();
 
@@ -192,21 +198,23 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
-    page.pushstate = function(path) {
+    page.pushstate = function() {
       $("#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});
-      OSM.loadSidebarContent(path);
     };
 
     page.unload = function() {
-      map.panBy([300, 0], {animate: false});
+      map.panBy([350, 0], {animate: false});
       $("#content").removeClass("overlay-sidebar");
       map.invalidateSize({pan: false});
     };
@@ -224,9 +232,7 @@ $(document).ready(function () {
     };
 
     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 == ""});
+      map.addObject({type: type, id: parseInt(id)});
     };
 
     page.unload = function() {
@@ -236,22 +242,23 @@ $(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.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
-    "/history":                    history,
     "/new_note":                   OSM.NewNote(map),
+    "/history":                    history,
     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,
-    "/browse/note/:id":            note,
+    "/browse/note/:id":            OSM.Note(map),
     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
+  OSM.route.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();