Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cecceaf3563b9bf210cff59669e4a7c73b1d1373..5064d115b91ada67fd2198077b3ad9125a12cfd6 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,74 +9,46 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
 //= require osm
 //= require leaflet
 //= require leaflet.osm

-//= require leaflet.hash
+//= require leaflet.map

 //= require leaflet.zoom
 //= require leaflet.zoom

-//= require leaflet.extend

 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik

-//= require map

 //= require richtext
 //= require querystring
 
 var querystring = require('querystring-component');
 
 //= require richtext
 //= require querystring
 
 var querystring = require('querystring-component');
 

-function zoomPrecision(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-}
-
-function remoteEditHandler(bbox, select) {
-  var loaded = false,
-      query = {
-          left: bbox.getWest() - 0.0001,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-      };
-
-  if (select) query.select = select;
-
-  var iframe = $('<iframe>')
-    .hide()
-    .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
-    .on('load', function() {
-      $(this).remove();
-      loaded = true;
-    });
-
-  setTimeout(function () {
-    if (!loaded) {
-      alert(I18n.t('site.index.remote_failed'));
-      iframe.remove();
-    }
-  }, 1000);
-
-  return false;
-}
-

 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */

-function updatelinks(loc, zoom, layers, object) {
+window.updateLinks = function (loc, zoom, layers, object) {

   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],

-        args = querystring.parse(link.search.substring(1));
+      args = querystring.parse(link.search.substring(1)),
+      editlink = $(link).hasClass("editlink");

 
 

-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    delete args.node;
+    delete args.way;
+    delete args.relation;
+    delete args.changeset;
+
+    if (object && editlink) {
+      args[object.type] = object.id;
+    }

 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
     args = {
       lat: loc.lat,
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
     args = {
       lat: loc.lat,

-      lon: loc.lon || loc.lng,
+      lon: 'lon' in loc ? loc.lon : loc.lng,

       zoom: zoom
     };
 
       zoom: zoom
     };
 

-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {

       args.layers = layers;
     }
 
       args.layers = layers;
     }
 


@@ -93,45 +65,54 @@ function updatelinks(loc, zoom, layers, object) {
     .toggleClass('disabled', editDisabled)
     .attr('data-original-title', editDisabled ?
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');
     .toggleClass('disabled', editDisabled)
     .attr('data-original-title', editDisabled ?
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');

-}
-
-// generate a cookie-safe string of map state
-function cookieContent(map) {
-  var center = map.getCenter().wrap();
-  return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
-}
-
-function escapeHTML(string) {
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;'
-  };
-  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
-      return htmlEscapes[match];
-  });
-}
+};

 
 

-function maximiseMap() {
+window.maximiseMap = function () {

   $("#content").addClass("maximised");
   $("#content").addClass("maximised");

-}
+};

 
 

-function minimiseMap() {
+window.minimiseMap = function () {

   $("#content").removeClass("maximised");
   $("#content").removeClass("maximised");

-}
+};

 
 

-/*
- * Forms which have been cached by rails may have the wrong
- * authenticity token, so patch up any forms with the correct
- * token taken from the page header.
- */

 $(document).ready(function () {
 $(document).ready(function () {

-  var auth_token = $("meta[name=csrf-token]").attr("content");
-  $("form input[name=authenticity_token]").val(auth_token);
+  var headerWidth = 0,
+      compactWidth = 0;
+
+  $("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");
+
+  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");
+    }
+  }
+
+  updateHeader();
+
+  $(window).resize(updateHeader);
+
+  $("#menu-icon").on("click", function(e) {
+    e.preventDefault();
+    $("header").toggleClass("closed");
+  });

 
 

-  $("#menu-icon").on("click", function() {
+  $("nav.primary li a").on("click", function() {

     $("header").toggleClass("closed");
   });
 });
     $("header").toggleClass("closed");
   });
 });