cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes and cleanups suggested by JSHint

Browse source
This commit is contained in:
Tom MacWright 2012-01-31 17:50:31 -05:00 • committed by Tom Hughes
parent 870c36ecf6
commit eb8efa0a4b
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/menu.js
View file

@ -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); });
}

17
app/assets/javascripts/site.js
View file

@ -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 + '\\]\\]';