Use Activerecord '#or' method for queries

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 2f422e1f93cf0b4f4e84a6dde912fee5dd3fd8bb..7b1c995c2d1a45fe03cc6fe9e6fe3dffcd13f620 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -35,7 +35,7 @@ L.OSM.share = function (options) {
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 

-    $("<div class='share-tabs btn-group btn-group-sm mb-2'>")
+    $("<div class='btn-group btn-group-sm mb-2'>")

       .appendTo($form)
       .append($("<a class='btn btn-primary'>")
         .addClass("active")
       .appendTo($form)
       .append($("<a class='btn btn-primary'>")
         .addClass("active")


@@ -53,7 +53,7 @@ L.OSM.share = function (options) {
       .on("click", "a", function (e) {
         e.preventDefault();
         var id = "#" + $(this).attr("for");
       .on("click", "a", function (e) {
         e.preventDefault();
         var id = "#" + $(this).attr("for");

-        $linkSection.find(".share-tabs a")
+        $(this).siblings("a")

           .removeClass("active");
         $(this).addClass("active");
         $linkSection.find(".share-tab")
           .removeClass("active");
         $(this).addClass("active");
         $linkSection.find(".share-tab")


@@ -66,7 +66,6 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
 
     $("<div>")
       .attr("class", "share-tab")

-      .css("display", "block")

       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")


@@ -75,6 +74,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
 
     $("<div>")
       .attr("class", "share-tab")

+      .hide()

       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")


@@ -83,6 +83,7 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
 
     $("<div>")
       .attr("class", "share-tab")

+      .hide()

       .appendTo($form)
       .append(
         $("<textarea>")
       .appendTo($form)
       .append(
         $("<textarea>")


@@ -91,8 +92,7 @@ L.OSM.share = function (options) {
       .append(
         $("<p>")
           .attr("class", "text-muted")
       .append(
         $("<p>")
           .attr("class", "text-muted")

-          .text(I18n.t("javascripts.share.paste_html"))
-          .appendTo($linkSection));
+          .text(I18n.t("javascripts.share.paste_html")));

 
     // Geo URI
 
 
     // Geo URI
 


@@ -316,7 +316,7 @@ L.OSM.share = function (options) {
       }
 
       $("#embed_html").val(
       }
 
       $("#embed_html").val(

-        "<iframe width=\"425\" height=\"350\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"" +
+        "<iframe width=\"425\" height=\"350\" src=\"" +

           escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
           "\" style=\"border: 1px solid black\"></iframe><br/>" +
           "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +
           escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
           "\" style=\"border: 1px solid black\"></iframe><br/>" +
           "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +