Eliminate loading flash for welcome overlay

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6e60d5666de6a472e955898e2c7c1eab0a497658..365d33e3abc76d30c392d5855b7a3c607472844d 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -198,26 +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);
-      page.load();
+        .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});
     };
@@ -270,7 +267,7 @@ $(document).ready(function () {
 
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
-    $("#header").addClass("closed");
+    $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     if (query) {
       OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));