Resolve conflict

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

diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js.erb
index 780bccbca1958abe25bcc91badebc0095719a505..9990da7836c366830edb216b614a2a5e5ebf6634 100644 (file)
--- a/app/assets/javascripts/index/new_note.js.erb
+++ b/app/assets/javascripts/index/new_note.js.erb
@@ -30,11 +30,11 @@ OSM.NewNote = function(map) {
 
     if ($(this).hasClass('disabled')) return;
 
 
     if ($(this).hasClass('disabled')) return;
 

-    OSM.route('/new_note');
+    OSM.router.route('/note/new');

   });
 
   function createNote(marker, form, url) {
   });
 
   function createNote(marker, form, url) {

-    var location = marker.getLatLng();
+    var location = marker.getLatLng().wrap();

 
     marker.options.draggable = false;
     marker.dragging.disable();
 
     marker.options.draggable = false;
     marker.dragging.disable();


@@ -61,7 +61,7 @@ OSM.NewNote = function(map) {
       newNote = null;
       noteLayer.removeLayer(marker);
       addNoteButton.removeClass("active");
       newNote = null;
       noteLayer.removeLayer(marker);
       addNoteButton.removeClass("active");

-      OSM.route('/browse/note/' + feature.properties.id);
+      OSM.router.route('/note/' + feature.properties.id);

     }
   }
 
     }
   }
 


@@ -149,6 +149,8 @@ OSM.NewNote = function(map) {
       e.preventDefault();
       createNote(newNote, e.target.form, '/api/0.6/notes.json');
     });
       e.preventDefault();
       createNote(newNote, e.target.form, '/api/0.6/notes.json');
     });

+
+    return map.getState();

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