Merge branch 'master' into notes

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e18c89536b74b56bd67991cf26ecdf94897da568..c0decd6a6ce9a9af8e3bdc0a3eaffd8cae490af8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,7 @@
 //= require index/browse
 //= require index/export
 //= require index/key
 //= require index/browse
 //= require index/export
 //= require index/key

+//= require index/notes

 
 $(document).ready(function () {
   var marker;
 
 $(document).ready(function () {
   var marker;


@@ -38,13 +39,6 @@ $(document).ready(function () {
 
   handleResize();
 
 
   handleResize();
 

-  $("#show_data").click(function (e) {
-    $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-      startBrowse(sidebarHtml);
-    }});
-    e.preventDefault();
-  });
-

   $("body").on("click", "a.set_position", function () {
     var data = $(this).data();
     var centre = new OpenLayers.LonLat(data.lon, data.lat);
   $("body").on("click", "a.set_position", function () {
     var data = $(this).data();
     var centre = new OpenLayers.LonLat(data.lon, data.lat);