Merge branch 'master' into notes

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b608a1cd04561dd95e2d45ddc7e21d7245323b57..6ee15af5b8d98f8e559e674a3952123a0d24cc4d 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,6 +13,7 @@
 //= require sidebar
 //= require richtext
 //= require resize
+//= require notes
 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));
@@ -99,7 +100,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
     // ?{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[object.type]) {
+    if (args.layers || object) {
       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;