X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e0706f06b19b04295cf8c87acceb536d96eaf427..eb7678145a87c1b9e3cd7ff2d3b5dc08132e4b51:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 354cfe66e..d73b3c69c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,24 +1,23 @@ -//= require jquery +//= require jquery3 //= require jquery_ujs //= require jquery.timers //= require jquery.cookie //= require jquery.throttle-debounce //= require bootstrap.tooltip //= require bootstrap.dropdown -//= require augment //= require osm //= require leaflet //= require leaflet.osm //= require leaflet.map //= require leaflet.zoom //= require leaflet.locationfilter -//= require i18n/translations +//= require i18n //= require oauth //= require piwik //= require richtext //= require querystring -var querystring = require('querystring-component'); +var querystring = require("querystring-component"); /* * Called as the user scrolls/zooms around to maniplate hrefs of the @@ -40,11 +39,11 @@ window.updateLinks = function (loc, zoom, layers, object) { } var query = querystring.stringify(args); - if (query) href += '?' + query; + if (query) href += "?" + query; args = { lat: loc.lat, - lon: 'lon' in loc ? loc.lon : loc.lng, + lon: "lon" in loc ? loc.lon : loc.lng, zoom: zoom }; @@ -58,13 +57,13 @@ window.updateLinks = function (loc, zoom, layers, object) { }); var editDisabled = zoom < 13; - $('#edit_tab') - .tooltip({placement: 'bottom'}) - .off('click.minzoom') - .on('click.minzoom', function() { return !editDisabled; }) - .toggleClass('disabled', editDisabled) - .attr('data-original-title', editDisabled ? - I18n.t('javascripts.site.edit_disabled_tooltip') : ''); + $("#edit_tab") + .tooltip({placement: "bottom"}) + .off("click.minzoom") + .on("click.minzoom", function() { return !editDisabled; }) + .toggleClass("disabled", editDisabled) + .attr("data-original-title", editDisabled ? + I18n.t("javascripts.site.edit_disabled_tooltip") : ""); }; window.maximiseMap = function () { @@ -76,6 +75,45 @@ window.minimiseMap = function () { }; $(document).ready(function () { + var headerWidth = 0, + compactWidth = 0; + + function updateHeader() { + var windowWidth = $(window).width(); + + if (windowWidth < compactWidth) { + $("body").removeClass("compact").addClass("small"); + } else if (windowWidth < headerWidth) { + $("body").addClass("compact").removeClass("small"); + } else { + $("body").removeClass("compact").removeClass("small"); + } + } + + /* + * Chrome 60 and later seem to fire the "ready" callback + * before the DOM is fully ready causing us to measure the + * wrong sizes for the header elements - use a 0ms timeout + * to defer the measurement slightly as a workaround. + */ + setTimeout(function () { + $("header").children(":visible").each(function (i,e) { + headerWidth = headerWidth + $(e).outerWidth(); + }); + + $("body").addClass("compact"); + + $("header").children(":visible").each(function (i,e) { + compactWidth = compactWidth + $(e).outerWidth(); + }); + + $("body").removeClass("compact"); + + updateHeader(); + + $(window).resize(updateHeader); + }, 0); + $("#menu-icon").on("click", function(e) { e.preventDefault(); $("header").toggleClass("closed"); @@ -84,4 +122,24 @@ $(document).ready(function () { $("nav.primary li a").on("click", function() { $("header").toggleClass("closed"); }); + + var application_data = $("head").data(); + + I18n.default_locale = OSM.DEFAULT_LOCALE; + I18n.locale = application_data.locale; + I18n.fallbacks = true; + + OSM.preferred_editor = application_data.preferredEditor; + + if (application_data.user) { + OSM.user = application_data.user; + + if (application_data.userHome) { + OSM.home = application_data.userHome; + } + } + + if (application_data.location) { + OSM.location = application_data.location; + } });