Include the event type in the JSON output of a note

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

diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js
index be16dd0599a4058c1ba6c371efcca204e3c9b0ab..93a5127f9ed85ba316c94cf7323505ad0e6e6d84 100644 (file)
--- a/app/assets/javascripts/site.js
+++ b/app/assets/javascripts/site.js
@@ -1,8 +1,5 @@
-//= require prototype
-//= require prototype_ujs
-//= require effects
-//= require dragdrop
-//= require controls
+//= require jquery
+//= require jquery_ujs
 
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
@@ -22,50 +19,50 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     maxlat = Math.round(maxlat * decimals) / decimals;
   }
 
-  $$(".geolink").each(function (link) {
+  $(".geolink").each(function (index, link) {
     var args = getArgs(link.href);
 
-    if (link.hasClassName("llz")) {
+    if ($(link).hasClass("llz")) {
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
-    } else if (minlon && link.hasClassName("bbox")) {
+    } else if (minlon && $(link).hasClass("bbox")) {
       args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
     }
 
-    if (layers && link.hasClassName("layers")) {
+    if (layers && $(link).hasClass("layers")) {
       args.layers = layers;
     }
 
-    if (objtype && link.hasClassName("object")) {
+    if (objtype && $(link).hasClass("object")) {
       args[objtype] = objid;
     }
 
-    if (link.hasClassName("minzoom[0-9]+")) {
-      $w(link.className).each(function (classname) {
-        if (match = classname.match(/^minzoom([0-9]+)$/)) {
-          var minzoom = match[1];
-          var name = link.id.replace(/anchor$/, "");
-
-          if (zoom >= minzoom) {
-            link.onclick = null;
-            link.title = i18n("javascripts.site." + name + "_tooltip");
-            link.removeClassName("disabled");
-          } else {
-            link.onclick = function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; };
-            link.title = i18n("javascripts.site." + name + "_disabled_tooltip");
-            link.addClassName("disabled");
-          }
+    var classes = $(link).attr("class").split(" ");
+
+    $(classes).each(function (index, classname) {
+      if (match = classname.match(/^minzoom([0-9]+)$/)) {
+        var minzoom = match[1];
+        var name = link.id.replace(/anchor$/, "");
+
+        $(link).off("click.minzoom");
+
+        if (zoom >= minzoom) {
+          $(link).attr("title", i18n("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).addClass("disabled");
         }
-      });
-    }
+      }
+    });
 
     link.href = setArgs(link.href, args);
   });
 
-  node = $("shortlinkanchor");
-  if (node) {
-    var args = getArgs(node.href);
+  $("#shortlinkanchor").each(function () {
+    var args = getArgs(this.href);
     var code = makeShortCode(lat, lon, zoom);
     var prefix = shortlinkPrefix();
 
@@ -76,22 +73,22 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
 
     // This is a hack to omit the default mapnik layer from the shortlink.
     if (layers && layers != "M") {
-      args["layers"] = layers;
+      args.layers = layers;
     }
     else {
-      delete args["layers"];
+      delete args.layers;
     }
 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink
     // which encodes lat/lon/zoom. If new URL parameters are added to
     // the main slippy map this needs to be changed.
-    if (args["layers"] || args[objtype]) {
-      node.href = setArgs(prefix + "/go/" + code, args);
+    if (args.layers || args[objtype]) {
+      this.href = setArgs(prefix + "/go/" + code, args);
     } else {
-      node.href = prefix + "/go/" + code;
+      this.href = prefix + "/go/" + code;
     }
-  }
+  });
 }
 
 /*
@@ -109,7 +106,7 @@ function shortlinkPrefix() {
  * Called to get the arguments from a URL as a hash.
  */
 function getArgs(url) {
-  var args = new Object();
+  var args = {};
   var querystart = url.indexOf("?");
 
   if (querystart >= 0) {
@@ -120,7 +117,7 @@ function getArgs(url) {
         if (match = queryitems[i].match(/^(.*)=(.*)$/)) {
            args[unescape(match[1])] = unescape(match[2]);
         } else {
-           args[unescape(queryitems[i])] = null
+           args[unescape(queryitems[i])] = null;
         }
      }
   }
@@ -132,10 +129,9 @@ function getArgs(url) {
  * Called to set the arguments on a URL from the given hash.
  */
 function setArgs(url, args) {
-   var queryitems = new Array();
+   var queryitems = [];
 
-   for (arg in args)
-   {
+   for (arg in args) {
       if (args[arg] == null) {
          queryitems.push(escape(arg));
       } else {
@@ -171,7 +167,7 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
-  string = i18n_strings[string] || string
+  string = i18n_strings[string] || string;
 
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
@@ -204,7 +200,7 @@ function interlace(x, y) {
  * Called to create a short code for the short link.
  */
 function makeShortCode(lat, lon, zoom) {
-    char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
+    char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~";
     var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0));
     var y = Math.round((lat +  90.0) * ((1 << 30) / 45.0));
     // JavaScript only has to keep 32 bits of bitwise operators, so this has to be