Fixes and cleanups suggested by JSHint

diff --git a/app/assets/javascripts/menu.js b/app/assets/javascripts/menu.js
index 8db1be4b9acebd6e44bd208e63eb7aecdac4a2eb..e829f2aa6664fda4f6f4ce636612c373a7c94784 100644 (file)
--- a/app/assets/javascripts/menu.js
+++ b/app/assets/javascripts/menu.js
@@ -35,7 +35,7 @@ function enterMenuAnchor(event, anchor, menu, delay, align) {
     clearTimeout(menu.timer);
 
     if (delay > 0) {
-      menu.timer = setTimeout(function () { openMenu(anchor, menu, align) }, delay);
+      menu.timer = setTimeout(function () { openMenu(anchor, menu, align); }, delay);
     } else {
       openMenu(event, menu, align);
     }
@@ -48,7 +48,7 @@ function enterMenuAnchor(event, anchor, menu, delay, align) {
 function leaveMenuAnchor(event, anchor, menu) {
   var to = event.relatedTarget;
 
-  if (!menu.is(to) && menu.has(to).length == 0) {
+  if (!menu.is(to) && menu.has(to).length === 0) {
     menu.hide();
   }
 
@@ -61,7 +61,7 @@ function leaveMenuAnchor(event, anchor, menu) {
 function leaveMenu(event, anchor, menu) {
   var to = event.relatedTarget;
 
-  if (!anchor.is(to) && menu.has(to).length == 0) {
+  if (!anchor.is(to) && menu.has(to).length === 0) {
     menu.hide();
   }
 
@@ -75,9 +75,9 @@ function createMenu(anchorid, menuid, delay, align) {
   var anchor = $("#" + anchorid);
   var menu = $("#" + menuid);
 
-  anchor.mouseup(function (event) { closeMenu(menu) });
-  anchor.mouseover(function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align) });
-  anchor.mouseout(function (event) { leaveMenuAnchor(event, anchor, menu) });
-  menu.mouseup(function (event) { closeMenu(menu) });
-  menu.mouseout(function (event) { leaveMenu(event, anchor, menu) });
+  anchor.mouseup(function (event) { closeMenu(menu); });
+  anchor.mouseover(function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align); });
+  anchor.mouseout(function (event) { leaveMenuAnchor(event, anchor, menu); });
+  menu.mouseup(function (event) { closeMenu(menu); });
+  menu.mouseout(function (event) { leaveMenu(event, anchor, menu); });
 }

diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js
index ea7585a44bb894f1775f12855aaa9593ae4e2e82..0ae8d5a02e716ba083906ba92855e90916f6d314 100644 (file)
--- a/app/assets/javascripts/site.js
+++ b/app/assets/javascripts/site.js
@@ -72,17 +72,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") {
-      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]) {
+    if (args.layers || args[objtype]) {
       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;
@@ -105,7 +105,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) {
@@ -116,7 +116,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;
         }
      }
   }
@@ -128,10 +128,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 {
@@ -167,7 +166,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 + '\\]\\]';