Redo mobile styles

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index db858c7c16bcea52ef7063a108b8e5c75dc9a233..2ed869905995753fecea8b6515c4f72ed63414cc 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,7 +9,7 @@
 //= require index/browse
 //= require index/export
 //= require index/notes
 //= require index/browse
 //= require index/export
 //= require index/notes

-//= require index/changeset
+//= require index/history

 //= require router
 
 $(document).ready(function () {
 //= require router
 
 $(document).ready(function () {


@@ -24,11 +24,20 @@ $(document).ready(function () {
 
   map.hash = L.hash(map);
 
 
   map.hash = L.hash(map);
 

+  $(window).on('popstate', function(e) {
+    // popstate is triggered when the hash changes as well as on actual navigation
+    // events. We want to update the hash on the latter and not the former.
+    if (e.originalEvent.state) {
+      map.hash.update();
+    }
+  });
+

   var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
   var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});

+  var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'});

 
   var layers = [
     new L.OSM.Mapnik({
 
   var layers = [
     new L.OSM.Mapnik({

-      attribution: copyright,
+      attribution: copyright + " ♥ " + donate,

       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")
       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")


@@ -222,27 +231,19 @@ $(document).ready(function () {
   initializeNotes(map);
 
   OSM.Index = function(map) {
   initializeNotes(map);
 
   OSM.Index = function(map) {

-    var page = {}, minimized = false;
+    var page = {};

 
     page.pushstate = page.popstate = function(path) {
 
     page.pushstate = page.popstate = function(path) {

-      if (minimized) $("#sidebar").addClass("minimized");
+      $("#content").addClass("overlay-sidebar");

       map.invalidateSize();
       map.invalidateSize();

-      $("#view_tab").addClass("current");

       $('#sidebar_content').load(path);
     };
 
     page.unload = function() {
       $('#sidebar_content').load(path);
     };
 
     page.unload = function() {

-      $("#view_tab").removeClass("current");
-    };
-
-    page.minimizeSidebar = function() {
-      $("#sidebar").addClass("minimized");
+      $("#content").removeClass("overlay-sidebar");

       map.invalidateSize();
       map.invalidateSize();

-      minimized = true;

     };
 
     };
 

-    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
-

     return page;
   };
 
     return page;
   };
 


@@ -250,8 +251,6 @@ $(document).ready(function () {
     var page = {};
 
     page.pushstate = page.popstate = function(path, type, id) {
     var page = {};
 
     page.pushstate = page.popstate = function(path, type, id) {

-      $("#sidebar").removeClass("minimized");
-      map.invalidateSize();

       $('#sidebar_content').load(path, function() {
         page.load(path, type, id);
       });
       $('#sidebar_content').load(path, function() {
         page.load(path, type, id);
       });


@@ -274,25 +273,34 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  var router = OSM.Router({
+  var history = OSM.History(map);
+
+  OSM.route = OSM.Router({

     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),

-    "/browse/changesets":          OSM.ChangesetList(map),
+    "/history":                    history,
+    "/user/:display_name/edits":   history,
+    "/browse/friends":             history,
+    "/browse/nearby":              history,

     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
   $(document).on("click", "a", function(e) {
     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
   $(document).on("click", "a", function(e) {

-    if (router(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
+    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();

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

-    router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+    OSM.route("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));

   });
 
   $("#describe_location").on("click", function(e) {
     e.preventDefault();
   });
 
   $("#describe_location").on("click", function(e) {
     e.preventDefault();

-    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+    var precision = zoomPrecision(map.getZoom());
+    OSM.route("/search?query=" + encodeURIComponent(
+      map.getCenter().lat.toFixed(precision) + "," +
+      map.getCenter().lng.toFixed(precision)));

   });
 });
   });
 });