Merge branch 'master' into moderation

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

diff --git a/app/assets/javascripts/leaflet.note.js b/app/assets/javascripts/leaflet.note.js
index c0f72af208eee184b3e0de58e0f2bcd3bb9216de..8451e9b72eb3742c3d4a08cfcfa708641d45a23b 100644 (file)
--- a/app/assets/javascripts/leaflet.note.js
+++ b/app/assets/javascripts/leaflet.note.js
@@ -13,10 +13,8 @@ L.OSM.note = function (options) {
 
     map.on('zoomend', update);
 
-    update();
-
     function update() {
-      var disabled = map.getZoom() < 12;
+      var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;
       link
         .toggleClass('disabled', disabled)
         .attr('data-original-title', I18n.t(disabled ?
@@ -24,6 +22,8 @@ L.OSM.note = function (options) {
           'javascripts.site.createnote_tooltip'));
     }
 
+    update();
+
     return $container[0];
   };