Allow moderator to unhide diary entries as well as hide them

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index fd707e566e2902f42873bcbd49bc5dce8dc33b58..38c4981696f5d37aacc066769169cd136c61a179 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,5 +1,7 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/src/L.Control.Locate

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key


@@ -20,7 +22,7 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

-//= require bowser
+//= require qs/dist/qs

 
 $(document).ready(function () {
   var loaderTimeout;
 
 $(document).ready(function () {
   var loaderTimeout;


@@ -28,10 +30,13 @@ $(document).ready(function () {
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,

-    contextmenu: true
+    contextmenu: true,
+    worldCopyJump: true

   });
 
   OSM.loadSidebarContent = function (path, callback) {
   });
 
   OSM.loadSidebarContent = function (path, callback) {

+    var content_path = path;
+

     map.setSidebarOverlaid(false);
 
     clearTimeout(loaderTimeout);
     map.setSidebarOverlaid(false);
 
     clearTimeout(loaderTimeout);


@@ -42,17 +47,17 @@ $(document).ready(function () {
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.

-    if (path.indexOf("?") >= 0) {
-      path += "&xhr=1";
+    if (content_path.indexOf("?") >= 0) {
+      content_path += "&xhr=1";

     } else {
     } else {

-      path += "?xhr=1";
+      content_path += "?xhr=1";

     }
 
     $("#sidebar_content")
       .empty();
 
     $.ajax({
     }
 
     $("#sidebar_content")
       .empty();
 
     $.ajax({

-      url: path,
+      url: content_path,

       dataType: "html",
       complete: function (xhr) {
         clearTimeout(loaderTimeout);
       dataType: "html",
       complete: function (xhr) {
         clearTimeout(loaderTimeout);


@@ -94,60 +99,60 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
-
-  L.OSM.zoom({ position: position })
+  var sidebar = L.OSM.sidebar("#map-ui")

     .addTo(map);
 
     .addTo(map);
 

-  var locate = L.control.locate({
-    position: position,
-    icon: "icon geolocate",
-    iconLoading: "icon geolocate",
-    strings: {
-      title: I18n.t("javascripts.map.locate.title"),
-      popup: I18n.t("javascripts.map.locate.popup")
-    }
-  }).addTo(map);
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";

 
 

-  var locateContainer = locate.getContainer();
+  function addControlGroup(controls) {
+    controls.forEach(function (control) {
+      control.addTo(map);
+    });

 
 

-  $(locateContainer)
-    .removeClass("leaflet-control-locate leaflet-bar")
-    .addClass("control-locate")
-    .children("a")
-    .attr("href", "#")
-    .removeClass("leaflet-bar-part leaflet-bar-part-single")
-    .addClass("control-button");
+    var firstContainer = controls[0].getContainer();
+    $(firstContainer).find(".control-button").first()
+      .addClass("control-button-first");

 
 

-  var sidebar = L.OSM.sidebar("#map-ui")
-    .addTo(map);
+    var lastContainer = controls[controls.length - 1].getContainer();
+    $(lastContainer).find(".control-button").last()
+      .addClass("control-button-last");
+  }

 
 

-  L.OSM.layers({
-    position: position,
-    layers: map.baseLayers,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.key({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.share({
-    "position": position,
-    "sidebar": sidebar,
-    "short": true
-  }).addTo(map);
-
-  L.OSM.note({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.query({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
+  addControlGroup([
+    L.OSM.zoom({ position: position }),
+    L.OSM.locate({ position: position })
+  ]);
+
+  addControlGroup([
+    L.OSM.layers({
+      position: position,
+      layers: map.baseLayers,
+      sidebar: sidebar
+    }),
+    L.OSM.key({
+      position: position,
+      sidebar: sidebar
+    }),
+    L.OSM.share({
+      "position": position,
+      "sidebar": sidebar,
+      "short": true
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.note({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.query({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);

 
   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);


@@ -183,38 +188,37 @@ $(document).ready(function () {
       map.getLayersCode(),
       map._object);
 
       map.getLayersCode(),
       map._object);
 

-    $.removeCookie("_osm_location");
-    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+    Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   });
 

-  if ($.cookie("_osm_welcome") !== "hide") {
+  if (Cookies.get("_osm_welcome") !== "hide") {

     $(".welcome").addClass("visible");
   }
 
     $(".welcome").addClass("visible");
   }
 

-  $(".welcome .close-wrap").on("click", function () {
+  $(".welcome .btn-close").on("click", function () {

     $(".welcome").removeClass("visible");
     $(".welcome").removeClass("visible");

-    $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+    Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   var bannerExpiry = new Date();
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
   });
 
   var bannerExpiry = new Date();
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 

-  $("#banner .close-wrap").on("click", function (e) {
+  $("#banner .btn-close").on("click", function (e) {

     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {
     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {

-      $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+      Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });

     }
   });
 
     }
   });
 

-  if (OSM.PIWIK) {
+  if (OSM.MATOMO) {

     map.on("layeradd", function (e) {
       if (e.layer.options) {
     map.on("layeradd", function (e) {
       if (e.layer.options) {

-        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.keyid];

 
         if (goal) {
 
         if (goal) {

-          $("body").trigger("piwikgoal", goal);
+          $("body").trigger("matomogoal", goal);

         }
       }
     });
         }
       }
     });


@@ -241,8 +245,8 @@ $(document).ready(function () {
   });
 
   function remoteEditHandler(bbox, object) {
   });
 
   function remoteEditHandler(bbox, object) {

-    var loaded = false,
-        url,
+    var remoteEditHost = "http://127.0.0.1:8111",
+        osmHost = location.protocol + "//" + location.host,

         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,


@@ -250,30 +254,31 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
           bottom: bbox.getSouth() - 0.0001
         };
 

-    if (location.protocol === "http" ||
-        bowser.check({ chrome: "53", firefox: "55" })) {
-      url = "http://127.0.0.1:8111/load_and_zoom?";
-    } else {
-      url = "https://127.0.0.1:8112/load_and_zoom?";
-    }
-
-    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;
-      });
+    if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes
+    sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () {
+      if (object && object.type === "note") {
+        var noteQuery = { url: osmHost + OSM.apiUrl(object) };
+        sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery));
+      }
+    });

 
 

-    setTimeout(function () {
-      if (!loaded) {
+    function sendRemoteEditCommand(url, callback) {
+      var iframe = $("<iframe>");
+      var timeoutId = setTimeout(function () {

         alert(I18n.t("site.index.remote_failed"));
         iframe.remove();
         alert(I18n.t("site.index.remote_failed"));
         iframe.remove();

-      }
-    }, 1000);
+      }, 5000);
+
+      iframe
+        .hide()
+        .appendTo("body")
+        .attr("src", url)
+        .on("load", function () {
+          clearTimeout(timeoutId);
+          iframe.remove();
+          if (callback) callback();
+        });
+    }

 
     return false;
   }
 
     return false;
   }


@@ -307,7 +312,7 @@ $(document).ready(function () {
     };
 
     page.load = function () {
     };
 
     page.load = function () {

-      var params = querystring.parse(location.search.substring(1));
+      var params = Qs.parse(location.search.substring(1));

       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }
       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }


@@ -342,6 +347,10 @@ $(document).ready(function () {
           });
         }
       });
           });
         }
       });

+
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });

     }
 
     page.unload = function () {
     }
 
     page.unload = function () {


@@ -397,4 +406,8 @@ $(document).ready(function () {
       e.preventDefault();
     }
   });
       e.preventDefault();
     }
   });

+
+  $(document).on("click", "#sidebar_content .btn-close", function () {
+    OSM.router.route("/" + OSM.formatHash(map));
+  });

 });
 });