From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Feb 2015 00:19:08 +0000 (+0000)
Subject: Move some javascript functions out of global scope
X-Git-Tag: live~4752
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/bd2e999756de84c91593c693fcbef47778936a65

Move some javascript functions out of global scope
---

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4e202ad00..132b69fc5 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,39 +20,6 @@
 
 var querystring = require('querystring-component');
 
-function remoteEditHandler(bbox, object) {
-  var loaded = false,
-    url = document.location.protocol === "https:" ?
-            "https://127.0.0.1:8112/load_and_zoom?" :
-            "http://127.0.0.1:8111/load_and_zoom?",
-    query = {
-        left: bbox.getWest() - 0.0001,
-        top: bbox.getNorth() + 0.0001,
-        right: bbox.getEast() + 0.0001,
-        bottom: bbox.getSouth() - 0.0001
-    };
-
-  if (object) query.select = object.type + object.id;
-
-  var iframe = $('<iframe>')
-    .hide()
-    .appendTo('body')
-    .attr("src", url + querystring.stringify(query))
-    .on('load', function() {
-      $(this).remove();
-      loaded = true;
-    });
-
-  setTimeout(function () {
-    if (!loaded) {
-      alert(I18n.t('site.index.remote_failed'));
-      iframe.remove();
-    }
-  }, 1000);
-
-  return false;
-}
-
 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
@@ -100,19 +67,6 @@ function updateLinks(loc, zoom, layers, object) {
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');
 }
 
-function escapeHTML(string) {
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;'
-  };
-  return string === null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
-      return htmlEscapes[match];
-  });
-}
-
 function maximiseMap() {
   $("#content").addClass("maximised");
 }
diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 5a19cb4d6..b513057c1 100644
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -9,7 +9,7 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+    marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)
       .bindPopup(I18n.t('diary_entry.edit.marker_text'));
   }
 
@@ -34,7 +34,7 @@ $(document).ready(function () {
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
-      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
+      marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)
         .bindPopup(I18n.t('diary_entry.edit.marker_text'));
     }
 
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 79c866b2e..9a05b62c2 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -137,12 +137,12 @@ $(document).ready(function () {
     .addTo(map);
 
   if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
-    initializeNotes(map);
+    OSM.initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 
-    initializeBrowse(map);
+    OSM.initializeBrowse(map);
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
@@ -191,7 +191,7 @@ $(document).ready(function () {
     map.setView([params.lat, params.lon], params.zoom);
   }
 
-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+  var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
 
   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
@@ -207,6 +207,39 @@ $(document).ready(function () {
     marker.setLatLng(center).addTo(map);
   });
 
+  function remoteEditHandler(bbox, object) {
+    var loaded = false,
+        url = document.location.protocol === "https:" ?
+        "https://127.0.0.1:8112/load_and_zoom?" :
+        "http://127.0.0.1:8111/load_and_zoom?",
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+        };
+
+    if (object) query.select = object.type + object.id;
+
+    var iframe = $('<iframe>')
+        .hide()
+        .appendTo('body')
+        .attr("src", url + querystring.stringify(query))
+        .on('load', function() {
+          $(this).remove();
+          loaded = true;
+        });
+
+    setTimeout(function () {
+      if (!loaded) {
+        alert(I18n.t('site.index.remote_failed'));
+        iframe.remove();
+      }
+    }, 1000);
+
+    return false;
+  }
+
   $("a[data-editor=remote]").click(function(e) {
     var params = OSM.mapParams(this.search);
     remoteEditHandler(map.getBounds(), params.object);
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 5db23a975..28a830858 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,4 +1,4 @@
-function initializeBrowse(map) {
+OSM.initializeBrowse = function (map) {
   var browseBounds;
   var selectedLayer;
   var dataLayer = map.dataLayer;
@@ -127,4 +127,4 @@ function initializeBrowse(map) {
     // Stash the currently drawn feature
     selectedLayer = layer;
   }
-}
+};
diff --git a/app/assets/javascripts/index/notes.js b/app/assets/javascripts/index/notes.js
index 307b11e0d..d5ffbead1 100644
--- a/app/assets/javascripts/index/notes.js
+++ b/app/assets/javascripts/index/notes.js
@@ -1,4 +1,4 @@
-function initializeNotes(map) {
+OSM.initializeNotes = function (map) {
   var noteLayer = map.noteLayer,
       notes = {};
 
@@ -93,4 +93,4 @@ function initializeNotes(map) {
       noteLoader = null;
     }
   }
-}
+};
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index a87c561d2..b829b582c 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -74,7 +74,7 @@ OSM.Search = function(map) {
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 
-      marker = L.marker([data.lat, data.lon], {icon: getUserIcon()});
+      marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()});
 
       $(this).data("marker", marker);
     }
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index d60f3b2f6..f433cd371 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -275,7 +275,7 @@ L.extend(L.Icon.Default.prototype, {
   }
 });
 
-function getUserIcon(url) {
+OSM.getUserIcon = function (url) {
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,
     iconSize: [25, 41],
@@ -284,4 +284,4 @@ function getUserIcon(url) {
     shadowUrl: OSM.MARKER_SHADOW,
     shadowSize: [41, 41]
   });
-}
+};
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index d4c829532..44d02c097 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -274,6 +274,19 @@ L.OSM.share = function (options) {
       update();
     }
 
+    function escapeHTML(string) {
+      var htmlEscapes = {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#x27;'
+      };
+      return string === null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+        return htmlEscapes[match];
+      });
+    }
+
     function update() {
       var bounds = map.getBounds();
 
diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index fb4aa0300..22c2ad829 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -26,7 +26,7 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
-    var marker = L.marker([0, 0], {icon: getUserIcon()});
+    var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
 
     if (OSM.home) {
       marker.setLatLng([OSM.home.lat, OSM.home.lon]);
@@ -51,7 +51,7 @@ $(document).ready(function () {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+        L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map)
           .bindPopup(user.description);
       }
     });
diff --git a/config/jshint.yml b/config/jshint.yml
index 5ce76655b..402190237 100644
--- a/config/jshint.yml
+++ b/config/jshint.yml
@@ -19,12 +19,7 @@ options:
     L: true
     OSM: true
     Piwik: true
-    escapeHTML: false
-    getUserIcon: false
-    initializeBrowse: false
-    initializeNotes: false
     maximiseMap: false
     minimiseMap: false
     querystring: false
-    remoteEditHandler: false
     updateLinks: false