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

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

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index 687f1e0447043285b3e3be9d44fa7a1f8bea4bfe..ba16d9df2451a394d79bb5f726b0fc4d7d22b71b 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -1,18 +1,20 @@
 //= require iD
 
 //= require iD
 

-document.addEventListener("DOMContentLoaded", function() {
+/* globals iD */
+
+document.addEventListener("DOMContentLoaded", function () {

   var container = document.getElementById("id-container");
 
   var container = document.getElementById("id-container");
 

-  if (typeof iD === 'undefined' || !iD.Detect().support) {
-    container.innerHTML = 'This editor is supported ' +
-      'in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. ' +
-      'Please upgrade your browser or use Potlatch 2 to edit the map.';
-    container.className = 'unsupported';
+  if (typeof iD === "undefined" || !iD.Detect().support) {
+    container.innerHTML = "This editor is supported " +
+      "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " +
+      "Please upgrade your browser or use Potlatch 2 to edit the map.";
+    container.className = "unsupported";

   } else {
     var id = iD.Context()
       .embed(true)
       .assetPath("iD/")
   } else {
     var id = iD.Context()
       .embed(true)
       .assetPath("iD/")

-      .assetMap(container.dataset.assetMap)
+      .assetMap(JSON.parse(container.dataset.assetMap))

       .locale(container.dataset.locale, container.dataset.localePath)
       .preauth({
         urlroot: location.protocol + "//" + location.host,
       .locale(container.dataset.locale, container.dataset.localePath)
       .preauth({
         urlroot: location.protocol + "//" + location.host,


@@ -22,11 +24,11 @@ document.addEventListener("DOMContentLoaded", function() {
         oauth_token_secret: container.dataset.tokenSecret
       });
 
         oauth_token_secret: container.dataset.tokenSecret
       });
 

-    id.map().on('move.embed', parent.$.throttle(250, function() {
+    id.map().on("move.embed", parent.$.throttle(250, function () {

       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),
       if (id.inIntro()) return;
       var zoom = ~~id.map().zoom(),

-        center = id.map().center(),
-        llz = { lon: center[0], lat: center[1], zoom: zoom };
+          center = id.map().center(),
+          llz = { lon: center[0], lat: center[1], zoom: zoom };

 
       parent.updateLinks(llz, zoom);
 
 
       parent.updateLinks(llz, zoom);
 


@@ -44,7 +46,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
       // 0ms timeout to avoid iframe JS context weirdness.
       // http://bl.ocks.org/jfirebaugh/5439412
 
       // 0ms timeout to avoid iframe JS context weirdness.
       // http://bl.ocks.org/jfirebaugh/5439412

-      setTimeout(function() {
+      setTimeout(function () {

         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));
         id.map().centerZoom(
           [data.lon, data.lat],
           Math.max(data.zoom || 15, 13));