X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71e7208a0aceccf47edce739803130096999da5d..225b260640a0c17f3ae408c70987618ceb07fa0d:/app/assets/javascripts/leaflet.share.js?ds=inline diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js index c518eb4e9..b9c48f15a 100644 --- a/app/assets/javascripts/leaflet.share.js +++ b/app/assets/javascripts/leaflet.share.js @@ -1,20 +1,12 @@ L.OSM.share = function (options) { - var control = L.OSM.sidebarPane(options), + var control = L.OSM.sidebarPane(options, "share", "javascripts.share.title", "javascripts.share.title"), marker = L.marker([0, 0], { draggable: true }), locationFilter = new L.LocationFilter({ enableButton: false, adjustButton: false }); - control.onAdd = function (map) { - var $container = $("
") - .attr("class", "control-share"); - - var button = this.makeButton("share", "javascripts.share.title", toggle) - .appendTo($container); - - var $ui = this.makeUI("share-ui", "javascripts.share.title", toggle); - + control.onAddPane = function (map, button, $ui) { // Link / Embed var $linkSection = $("
") @@ -43,26 +35,25 @@ L.OSM.share = function (options) { .bind("change", toggleMarker)) .append(I18n.t("javascripts.share.include_marker"))); - $("
") - .attr("class", "share-tabs") + $("
") .appendTo($form) - .append($("") - .attr("class", "active") + .append($("") + .addClass("active") .attr("for", "long_input") .attr("id", "long_link") .text(I18n.t("javascripts.share.long_link"))) - .append($("") + .append($("") .attr("for", "short_input") .attr("id", "short_link") .text(I18n.t("javascripts.share.short_link"))) - .append($("") + .append($("") .attr("for", "embed_html") .attr("href", "#") .text(I18n.t("javascripts.share.embed"))) .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") @@ -100,8 +91,7 @@ L.OSM.share = function (options) { .append( $("

") .attr("class", "text-muted") - .text(I18n.t("javascripts.share.paste_html")) - .appendTo($linkSection)); + .text(I18n.t("javascripts.share.paste_html"))); // Geo URI @@ -228,11 +218,15 @@ L.OSM.share = function (options) { map.on("move", movedMap); map.on("moveend layeradd layerremove", update); - options.sidebar.addPane($ui); - $ui + .on("show", shown) .on("hide", hidden); + function shown() { + $("#mapnik_scale").val(getScale()); + update(); + } + function hidden() { map.removeLayer(marker); map.options.scrollWheelZoom = map.options.doubleClickZoom = true; @@ -240,18 +234,6 @@ L.OSM.share = function (options) { update(); } - function toggle(e) { - e.stopPropagation(); - e.preventDefault(); - - $("#mapnik_scale").val(getScale()); - marker.setLatLng(map.getCenter()); - - update(); - options.sidebar.togglePane($ui, button); - $(".leaflet-control .control-button").tooltip("hide"); - } - function toggleMarker() { if ($(this).is(":checked")) { marker.setLatLng(map.getCenter()); @@ -396,8 +378,6 @@ L.OSM.share = function (options) { var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2); return precision * Math.ceil(scale / precision); } - - return $container[0]; }; return control;