Simplify

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 1f68c93cb6f8ca39774c616a3993861f9f0fb2d8..5cc3a25b86c291815d808b277b45f8fa60344733 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -37,13 +37,7 @@ $(document).ready(function () {
 
   var layers = [
     new L.OSM.Mapnik({
 
   var layers = [
     new L.OSM.Mapnik({

-      attribution: donate,
-      code: "M",
-      keyid: "mapnik",
-      name: I18n.t("javascripts.map.base.standard")
-    }),
-    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")


@@ -237,27 +231,14 @@ $(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");
-      map.invalidateSize();
-      $("#view_tab").addClass("current");
-      $('#sidebar_content').load(path);
-    };
-
-    page.unload = function() {
-      $("#view_tab").removeClass("current");
-    };
-
-    page.minimizeSidebar = function() {

       $("#sidebar").addClass("minimized");
       map.invalidateSize();
       $("#sidebar").addClass("minimized");
       map.invalidateSize();

-      minimized = true;
+      $('#sidebar_content').load(path);

     };
 
     };
 

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

     return page;
   };
 
     return page;
   };
 


@@ -273,6 +254,8 @@ $(document).ready(function () {
     };
 
     page.load = function(path, type, id) {
     };
 
     page.load = function(path, type, id) {

+      $("#sidebar").removeClass("minimized");
+

       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
       if (type === 'note') {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
       if (type === 'note') {


@@ -320,4 +303,16 @@ $(document).ready(function () {
       map.getCenter().lng.toFixed(precision)));
   });
 
       map.getCenter().lng.toFixed(precision)));
   });
 

+  function removeSidebar() {
+    if ($(window).width() < 721) {
+      $('#sidebar').addClass("minimized");
+    }
+  }
+
+  $(window).resize(function() {
+    removeSidebar();
+  });
+
+  removeSidebar();
+

 });
 });