Moved note description to the sidebar header

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2d930024721932b58c6cbd49c36c27785fddc4c7..e0ca66766ff877079a0d118cb2c4e588bf1e4bc2 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -11,6 +11,7 @@
 //= require index/notes
 //= require index/history
 //= require index/note
 //= require index/notes
 //= require index/history
 //= require index/note

+//= require index/new_note

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


@@ -158,19 +159,31 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

-    page.pushstate = page.popstate = function(path) {
-      $("#content").addClass("overlay-sidebar");
-      map.invalidateSize();
+    function loadContent(path) {

       $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
         if (xhr.getResponseHeader('X-Page-Title')) {
           document.title = xhr.getResponseHeader('X-Page-Title');
         }
       });
       $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
         if (xhr.getResponseHeader('X-Page-Title')) {
           document.title = xhr.getResponseHeader('X-Page-Title');
         }
       });

+    }
+
+    page.pushstate = function(path) {
+      $("#content").addClass("overlay-sidebar");
+      map.invalidateSize({pan: false})
+        .panBy([-300, 0], {animate: false});
+      loadContent(path);
+    };
+
+    page.popstate = function(path) {
+      $("#content").addClass("overlay-sidebar");
+      map.invalidateSize({pan: false});
+      loadContent(path);

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

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

       $("#content").removeClass("overlay-sidebar");
       $("#content").removeClass("overlay-sidebar");

-      map.invalidateSize();
+      map.invalidateSize({pan: false});

     };
 
     return page;
     };
 
     return page;


@@ -191,11 +204,7 @@ $(document).ready(function () {
     page.load = function(path, type, id) {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
     page.load = function(path, type, id) {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 

-      if (type === 'note') {
-        map.noteLayer.showNote(parseInt(id));
-      } else {
-        map.addObject({type: type, id: parseInt(id)}, {zoom: true});
-      }
+      map.addObject({type: type, id: parseInt(id)}, {zoom: true});

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


@@ -213,6 +222,7 @@ $(document).ready(function () {
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/history":                    history,
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/history":                    history,

+    "/new_note":                   OSM.NewNote(map),

     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,
     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,