X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52f755cb27dd7dad2fe65a3deb5d4591c6675dec..d095dfe3d4c1ec90cebdfb3307564022cbeaf878:/app/assets/javascripts/index/changeset.js

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index 75a1f7b4d..1ec5940b2 100644
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -1,33 +1,30 @@
 OSM.Changeset = function (map) {
-  var page = {},
-      content = $("#sidebar_content"),
-      currentChangesetId;
+  const page = {},
+        content = $("#sidebar_content");
 
-  page.pushstate = page.popstate = function (path, id) {
+  page.pushstate = page.popstate = function (path) {
     OSM.loadSidebarContent(path, function () {
-      page.load(path, id);
+      page.load();
     });
   };
 
-  page.load = function (path, id) {
-    if (id) currentChangesetId = id;
-    initialize();
-    addChangeset(currentChangesetId, true);
-  };
+  page.load = function () {
+    const changesetData = content.find("[data-changeset]").data("changeset");
+    changesetData.type = "changeset";
 
-  function addChangeset(id, center) {
-    map.addObject({ type: "changeset", id: parseInt(id, 10) }, function (bounds) {
-      if (!window.location.hash && bounds.isValid() &&
-          (center || !map.getBounds().contains(bounds))) {
+    const hashParams = OSM.parseHash(window.location.hash);
+    initialize();
+    map.addObject(changesetData, function (bounds) {
+      if (!hashParams.center && bounds.isValid()) {
         OSM.router.withoutMoveListener(function () {
           map.fitBounds(bounds);
         });
       }
     });
-  }
+  };
 
   function updateChangeset(method, url, include_data) {
-    var data;
+    let data;
 
     content.find("#comment-error").prop("hidden", true);
     content.find("button[data-method][data-url]").prop("disabled", true);
@@ -59,19 +56,15 @@ OSM.Changeset = function (map) {
   function initialize() {
     content.find("button[data-method][data-url]").on("click", function (e) {
       e.preventDefault();
-      var data = $(e.target).data();
-      var include_data = e.target.name === "comment";
+      const data = $(e.target).data();
+      const include_data = e.target.name === "comment";
       updateChangeset(data.method, data.url, include_data);
     });
 
     content.find("textarea").on("input", function (e) {
-      var form = e.target.form;
-
-      if ($(e.target).val() === "") {
-        $(form.comment).prop("disabled", true);
-      } else {
-        $(form.comment).prop("disabled", false);
-      }
+      const form = e.target.form,
+            disabled = $(e.target).val() === "";
+      form.comment.disabled = disabled;
     });
 
     content.find("textarea").val("").trigger("input");