X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ea63736b5c1b6e1d1adbf043f025cc9cb4171bcb:/app/assets/javascripts/site.js..4d91fe3dd95c1058cb8d24fd4c900223e30b9059:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/application.js
similarity index 59%
rename from app/assets/javascripts/site.js
rename to app/assets/javascripts/application.js
index 311798aa5..71eb71711 100644
--- a/app/assets/javascripts/site.js
+++ b/app/assets/javascripts/application.js
@@ -2,23 +2,46 @@
 //= require jquery_ujs
 //= require jquery.autogrowtextarea
 //= require jquery.timers
+//= require jquery.cookie
+//= require augment
+//= require openlayers
+//= require i18n/translations
+//= require globals
+//= require params
+//= require piwik
+//= require browse
+//= require export
+//= require map
+//= require key
+//= require menu
+//= require sidebar
+//= require richtext
+//= require resize
+//= require notes
+
+function zoomPrecision(zoom) {
+    var decimals = Math.pow(10, Math.floor(zoom/3));
+    return function(x) {
+         return Math.round(x * decimals) / decimals;
+    };
+}
 
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */
 function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) {
-  var decimals = Math.pow(10, Math.floor(zoom/3));
+  var toPrecision = zoomPrecision(zoom);
   var node;
 
-  lat = Math.round(lat * decimals) / decimals;
-  lon = Math.round(lon * decimals) / decimals;
+  lat = toPrecision(lat);
+  lon = toPrecision(lon);
 
   if (minlon) {
-    minlon = Math.round(minlon * decimals) / decimals;
-    minlat = Math.round(minlat * decimals) / decimals;
-    maxlon = Math.round(maxlon * decimals) / decimals;
-    maxlat = Math.round(maxlat * decimals) / decimals;
+    minlon = toPrecision(minlon);
+    minlat = toPrecision(minlat);
+    maxlon = toPrecision(maxlon);
+    maxlat = toPrecision(maxlat);
   }
 
   $(".geolink").each(function (index, link) {
@@ -40,25 +63,21 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args[objtype] = objid;
     }
 
-    var classes = $(link).attr("class").split(" ");
-
-    $(classes).each(function (index, classname) {
-      if (match = classname.match(/^minzoom([0-9]+)$/)) {
-        var minzoom = match[1];
+    var minzoom = $(link).data("minzoom");
+    if (minzoom) {
         var name = link.id.replace(/anchor$/, "");
 
         $(link).off("click.minzoom");
 
         if (zoom >= minzoom) {
-          $(link).attr("title", i18n("javascripts.site." + name + "_tooltip"));
+          $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"));
           $(link).removeClass("disabled");
         } else {
-          $(link).on("click.minzoom", function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
-          $(link).attr("title", i18n("javascripts.site." + name + "_disabled_tooltip"));
+          $(link).on("click.minzoom", function () { alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; });
+          $(link).attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"));
           $(link).addClass("disabled");
         }
-      }
-    });
+    }
 
     link.href = setArgs(link.href, args);
   });
@@ -144,26 +163,6 @@ function setArgs(url, args) {
    return url.replace(/\?.*$/, "") + "?" + queryitems.join("&");
 }
 
-/*
- * Called to interpolate JavaScript variables in strings using a
- * similar syntax to rails I18n string interpolation - the only
- * difference is that [[foo]] is the placeholder syntax instead
- * of {{foo}} which allows the same string to be processed by both
- * rails and then later by javascript.
- */
-function i18n(string, keys) {
-  string = i18n_strings[string] || string;
-
-  for (var key in keys) {
-    var re_key = '\\[\\[' + key + '\\]\\]';
-    var re = new RegExp(re_key, "g");
-
-    string = string.replace(re, keys[key]);
-  }
-
-  return string;
-}
-
 /*
  * Called to interlace the bits in x and y, making a Morton code.
  */
@@ -208,62 +207,18 @@ function makeShortCode(lat, lon, zoom) {
 }
 
 /*
- * Click handler to switch a rich text control to preview mode
+ * Forms which have been cached by rails may have he wrong
+ * authenticity token, so patch up any forms with the correct
+ * token taken from the page header.
  */
-function previewRichtext(event) {
-  var editor = $(this).parents(".richtext_container").find("textarea");
-  var preview = $(this).parents(".richtext_container").find(".richtext_preview");
-  var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
-  var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
-
-  if (preview.contents().length == 0) {
-    preview.oneTime(500, "loading", function () {
-      preview.addClass("loading");
-    });
-
-    preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () {
-      preview.stopTime("loading");
-      preview.removeClass("loading");
-    });
-  }
-
-  editor.hide();
-  preview.width(width);
-  preview.css("min-height", minHeight + "px");
-  preview.show();
-
-  $(this).siblings(".richtext_doedit").prop("disabled", false);
-  $(this).prop("disabled", true);
-
-  event.preventDefault();
-}
-
-/*
- * Click handler to switch a rich text control to edit mode
- */
-function editRichtext(event) {
-  var editor = $(this).parents(".richtext_container").find("textarea");
-  var preview = $(this).parents(".richtext_container").find(".richtext_preview");
-
-  preview.hide();
-  editor.show();
-
-  $(this).siblings(".richtext_dopreview").prop("disabled", false);
-  $(this).prop("disabled", true);
-
-  event.preventDefault();
-}
+$(document).ready(function () {
+  var auth_token = $("meta[name=csrf-token]").attr("content");
+  $("form input[name=authenticity_token]").val(auth_token);
+});
 
 /*
- * Setup any rich text controls
+ * Enable auto expansion for all text areas
  */
 $(document).ready(function () {
-  $(".richtext_preview").hide();
-  $(".richtext_content textarea").change(function () { 
-    $(this).parents(".richtext_container").find(".richtext_preview").empty();
-  });
-  $(".richtext_doedit").prop("disabled", true);
-  $(".richtext_dopreview").prop("disabled", false);
-  $(".richtext_doedit").click(editRichtext);
-  $(".richtext_dopreview").click(previewRichtext);
+  $("textarea").autoGrow();
 });