Merge remote-tracking branch 'upstream/pull/2500'

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

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index 5bf3f543a3ed4cde9fddcd043eaa7da861195467..3793c573e6122d5165df17181e545e99701dd7d0 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -1,7 +1,7 @@
 OSM.Note = function (map) {
 OSM.Note = function (map) {

-  var content = $('#sidebar_content'),
-    page = {},
-    halo, currentNote;
+  var content = $("#sidebar_content"),
+      page = {},
+      halo, currentNote;

 
   var noteIcons = {
     "new": L.icon({
 
   var noteIcons = {
     "new": L.icon({


@@ -28,7 +28,7 @@ OSM.Note = function (map) {
       url: url,
       type: method,
       oauth: true,
       url: url,
       type: method,
       oauth: true,

-      data: {text: $(form.text).val()},
+      data: { text: $(form.text).val() },

       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       }
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       }


@@ -36,16 +36,16 @@ OSM.Note = function (map) {
   }
 
   page.pushstate = page.popstate = function (path) {
   }
 
   page.pushstate = page.popstate = function (path) {

-    OSM.loadSidebarContent(path, function() {
-      initialize(function() {
-        var data = $('.details').data(),
-          latLng = L.latLng(data.coordinates.split(','));
-        if (!map.getBounds().contains(latLng)) moveToNote();        
+    OSM.loadSidebarContent(path, function () {
+      initialize(function () {
+        var data = $(".details").data(),
+            latLng = L.latLng(data.coordinates.split(","));
+        if (!map.getBounds().contains(latLng)) moveToNote();

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

-  page.load = function() {
+  page.load = function () {

     initialize(moveToNote);
   };
 
     initialize(moveToNote);
   };
 


@@ -68,10 +68,10 @@ OSM.Note = function (map) {
       }
     });
 
       }
     });
 

-    content.find("textarea").val('').trigger("input");
+    content.find("textarea").val("").trigger("input");

 
 

-    var data = $('.details').data(),
-      latLng = L.latLng(data.coordinates.split(','));
+    var data = $(".details").data(),
+        latLng = L.latLng(data.coordinates.split(","));

 
     if (!map.hasLayer(halo)) {
       halo = L.circleMarker(latLng, {
 
     if (!map.hasLayer(halo)) {
       halo = L.circleMarker(latLng, {


@@ -87,7 +87,7 @@ OSM.Note = function (map) {
     currentNote = L.marker(latLng, {
       icon: noteIcons[data.status],
       opacity: 1,
     currentNote = L.marker(latLng, {
       icon: noteIcons[data.status],
       opacity: 1,

-      clickable: true
+      interactive: true

     });
 
     map.addLayer(currentNote);
     });
 
     map.addLayer(currentNote);


@@ -96,12 +96,12 @@ OSM.Note = function (map) {
   }
 
   function moveToNote() {
   }
 
   function moveToNote() {

-    var data = $('.details').data(),
-      latLng = L.latLng(data.coordinates.split(','));
+    var data = $(".details").data(),
+        latLng = L.latLng(data.coordinates.split(","));

 
     if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
       OSM.router.withoutMoveListener(function () {
 
     if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
       OSM.router.withoutMoveListener(function () {

-        map.setView(latLng, 15, {reset: true});
+        map.setView(latLng, 15, { reset: true });

       });
     }
   }
       });
     }
   }