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

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 96870f600869ab92c99a550820eeaecf499edebc..c5bddbaec058a714d2f01ded486cee431a3a1955 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -24,7 +24,7 @@
 //= require index/home
 //= require router
 
 //= require index/home
 //= require router
 

-$(document).ready(function () {
+$(function () {

   const map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   const map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,


@@ -311,7 +311,7 @@ $(document).ready(function () {
     };
 
     function addObject(type, id, version, center) {
     };
 
     function addObject(type, id, version, center) {

-      const hashParams = OSM.parseHash(window.location.hash);
+      const hashParams = OSM.parseHash(location.hash);

       map.addObject({ type: type, id: parseInt(id, 10), version: version && parseInt(version, 10) }, function (bounds) {
         if (!hashParams.center && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {
       map.addObject({ type: type, id: parseInt(id, 10), version: version && parseInt(version, 10) }, function (bounds) {
         if (!hashParams.center && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {


@@ -363,7 +363,7 @@ $(document).ready(function () {
     "/account/home": OSM.Home(map)
   });
 
     "/account/home": OSM.Home(map)
   });
 

-  if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
+  if (OSM.preferred_editor === "remote" && location.pathname === "/edit") {

     remoteEditHandler(map.getBounds(), params.object);
     OSM.router.setCurrentPath("/");
   }
     remoteEditHandler(map.getBounds(), params.object);
     OSM.router.setCurrentPath("/");
   }