Default background for input fields to white

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index a259954f21eda7bee4fb972eb2f9797a5a8f2c12..df975db48fe75b7690d5223cf6ecf894fcaff231 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,6 +5,7 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share

+//= require leaflet.query

 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/search
 //= require index/browse
 //= require index/export


@@ -12,6 +13,8 @@
 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/history
 //= require index/note
 //= require index/new_note

+//= require index/changeset
+//= require index/query

 //= require router
 
 (function() {
 //= require router
 
 (function() {


@@ -123,6 +126,11 @@ $(document).ready(function () {
     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 

+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+

   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 


@@ -154,15 +162,6 @@ $(document).ready(function () {
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 

-  if ($.cookie('_osm_sotm') == 'hide') {
-    $('#sotm').hide();
-  }
-
-  $('#sotm .close').on('click', function() {
-    $('#sotm').hide();
-    $.cookie("_osm_sotm", 'hide', { expires: expiry });
-  });
-

   if ($.cookie('_osm_welcome') == 'hide') {
     $('.welcome').hide();
   }
   if ($.cookie('_osm_welcome') == 'hide') {
     $('.welcome').hide();
   }


@@ -304,7 +303,8 @@ $(document).ready(function () {
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),

-    "/changeset/:id":              OSM.Browse(map, 'changeset')
+    "/changeset/:id":              OSM.Changeset(map),
+    "/query":                      OSM.Query(map)

   });
 
   if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
   });
 
   if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {