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

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

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 2ce8974f5d0decd3d55bbfe5fb74bd270d184517..3937f738172592a5fe00703069b5583c39b38fa1 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -1,3 +1,5 @@
+//= require qs/dist/qs
+

 $(document).ready(function () {
   var id = $("#id-embed");
 
 $(document).ready(function () {
   var id = $("#id-embed");
 


@@ -20,14 +22,18 @@ $(document).ready(function () {
 
     if (hashParams.background) params.background = hashParams.background;
     if (hashParams.comment) params.comment = hashParams.comment;
 
     if (hashParams.background) params.background = hashParams.background;
     if (hashParams.comment) params.comment = hashParams.comment;

-    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;
-    if (hashParams.source) params.source = hashParams.source;

     if (hashParams.disable_features) params.disable_features = hashParams.disable_features;
     if (hashParams.disable_features) params.disable_features = hashParams.disable_features;

-    if (hashParams.offset) params.offset = hashParams.offset;
-    if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
+    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;

     if (hashParams.locale) params.locale = hashParams.locale;
     if (hashParams.maprules) params.maprules = hashParams.maprules;
     if (hashParams.locale) params.locale = hashParams.locale;
     if (hashParams.maprules) params.maprules = hashParams.maprules;

+    if (hashParams.offset) params.offset = hashParams.offset;
+    if (hashParams.photo) params.photo = hashParams.photo;
+    if (hashParams.photo_dates) params.photo_dates = hashParams.photo_dates;
+    if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay;
+    if (hashParams.photo_username) params.photo_username = hashParams.photo_username;

     if (hashParams.presets) params.presets = hashParams.presets;
     if (hashParams.presets) params.presets = hashParams.presets;

+    if (hashParams.source) params.source = hashParams.source;
+    if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;

 
     if (id.data("gpx")) {
       params.gpx = id.data("gpx");
 
     if (id.data("gpx")) {
       params.gpx = id.data("gpx");


@@ -35,7 +41,7 @@ $(document).ready(function () {
       params.gpx = hashParams.gpx;
     }
 
       params.gpx = hashParams.gpx;
     }
 

-    id.attr("src", id.data("url") + "#" + querystring.stringify(params));
+    id.attr("src", id.data("url") + "#" + Qs.stringify(params));

   } else {
     alert(I18n.t("site.edit.id_not_configured"));
   }
   } else {
     alert(I18n.t("site.edit.id_not_configured"));
   }