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 ea7585a44bb894f1775f12855aaa9593ae4e2e82..93a5127f9ed85ba316c94cf7323505ad0e6e6d84 100644 (file)
--- a/app/assets/javascripts/site.js
+++ b/app/assets/javascripts/site.js
@@ -45,12 +45,13 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
         var minzoom = match[1];
         var name = link.id.replace(/anchor$/, "");
 
         var minzoom = match[1];
         var name = link.id.replace(/anchor$/, "");
 

+        $(link).off("click.minzoom");
+

         if (zoom >= minzoom) {
         if (zoom >= minzoom) {

-          $(link).off("click");

           $(link).attr("title", i18n("javascripts.site." + name + "_tooltip"));
           $(link).removeClass("disabled");
         } else {
           $(link).attr("title", i18n("javascripts.site." + name + "_tooltip"));
           $(link).removeClass("disabled");
         } else {

-          $(link).click(function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
+          $(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).attr("title", i18n("javascripts.site." + name + "_disabled_tooltip"));
           $(link).addClass("disabled");
         }


@@ -72,17 +73,17 @@ 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") {
 
     // This is a hack to omit the default mapnik layer from the shortlink.
     if (layers && layers != "M") {

-      args["layers"] = layers;
+      args.layers = layers;

     }
     else {
     }
     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.
     }
 
     // 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]) {
+    if (args.layers || args[objtype]) {

       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;
       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;


@@ -105,7 +106,7 @@ function shortlinkPrefix() {
  * Called to get the arguments from a URL as a hash.
  */
 function getArgs(url) {
  * 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) {
   var querystart = url.indexOf("?");
 
   if (querystart >= 0) {


@@ -116,7 +117,7 @@ function getArgs(url) {
         if (match = queryitems[i].match(/^(.*)=(.*)$/)) {
            args[unescape(match[1])] = unescape(match[2]);
         } else {
         if (match = queryitems[i].match(/^(.*)=(.*)$/)) {
            args[unescape(match[1])] = unescape(match[2]);
         } else {

-           args[unescape(queryitems[i])] = null
+           args[unescape(queryitems[i])] = null;

         }
      }
   }
         }
      }
   }


@@ -128,10 +129,9 @@ function getArgs(url) {
  * Called to set the arguments on a URL from the given hash.
  */
 function setArgs(url, args) {
  * 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 {
       if (args[arg] == null) {
          queryitems.push(escape(arg));
       } else {


@@ -167,7 +167,7 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
  * 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 + '\\]\\]';
 
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';