Merge branch 'master' into tag-colour-preview-rebase

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d73b3c69c1605a67c94315cfd1e0955735ddc7f2..fbc76e4a8db29f442dccfeafd0904d51437f096e 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -17,17 +17,16 @@
 //= require richtext
 //= require querystring
 
-var querystring = require("querystring-component");
-
 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
 window.updateLinks = function (loc, zoom, layers, object) {
-  $(".geolink").each(function(index, link) {
-    var href = link.href.split(/[?#]/)[0],
-      args = querystring.parse(link.search.substring(1)),
-      editlink = $(link).hasClass("editlink");
+  $(".geolink").each(function (index, link) {
+    var querystring = require("querystring-component"),
+        href = link.href.split(/[?#]/)[0],
+        args = querystring.parse(link.search.substring(1)),
+        editlink = $(link).hasClass("editlink");
 
     delete args.node;
     delete args.way;
@@ -58,9 +57,9 @@ window.updateLinks = function (loc, zoom, layers, object) {
 
   var editDisabled = zoom < 13;
   $("#edit_tab")
-    .tooltip({placement: "bottom"})
+    .tooltip({ placement: "bottom" })
     .off("click.minzoom")
-    .on("click.minzoom", function() { return !editDisabled; })
+    .on("click.minzoom", function () { return !editDisabled; })
     .toggleClass("disabled", editDisabled)
     .attr("data-original-title", editDisabled ?
       I18n.t("javascripts.site.edit_disabled_tooltip") : "");
@@ -97,13 +96,13 @@ $(document).ready(function () {
    * to defer the measurement slightly as a workaround.
    */
   setTimeout(function () {
-    $("header").children(":visible").each(function (i,e) {
+    $("header").children(":visible").each(function (i, e) {
       headerWidth = headerWidth + $(e).outerWidth();
     });
 
     $("body").addClass("compact");
 
-    $("header").children(":visible").each(function (i,e) {
+    $("header").children(":visible").each(function (i, e) {
       compactWidth = compactWidth + $(e).outerWidth();
     });
 
@@ -114,12 +113,12 @@ $(document).ready(function () {
     $(window).resize(updateHeader);
   }, 0);
 
-  $("#menu-icon").on("click", function(e) {
+  $("#menu-icon").on("click", function (e) {
     e.preventDefault();
     $("header").toggleClass("closed");
   });
 
-  $("nav.primary li a").on("click", function() {
+  $("nav.primary li a").on("click", function () {
     $("header").toggleClass("closed");
   });