Merge branch 'pull/5297'

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 8ffa05c53e41ebcf88b58acd19e77f36950cf334..c419f93216b44507f4aed454b01792feba3744e9 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,7 +1,7 @@
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane

-//= require leaflet.locatecontrol/src/L.Control.Locate
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key


@@ -12,9 +12,9 @@
 //= require leaflet.contextmenu
 //= require index/contextmenu
 //= require index/search
 //= require leaflet.contextmenu
 //= require index/contextmenu
 //= require index/search

-//= require index/browse
+//= require index/layers/data

 //= require index/export
 //= require index/export

-//= require index/notes
+//= require index/layers/notes

 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/history
 //= require index/note
 //= require index/new_note


@@ -25,8 +25,6 @@
 //= require qs/dist/qs
 
 $(document).ready(function () {
 //= require qs/dist/qs
 
 $(document).ready(function () {

-  var loaderTimeout;
-

   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,


@@ -39,11 +37,7 @@ $(document).ready(function () {
 
     map.setSidebarOverlaid(false);
 
 
     map.setSidebarOverlaid(false);
 

-    clearTimeout(loaderTimeout);
-
-    loaderTimeout = setTimeout(function () {
-      $("#sidebar_loader").show();
-    }, 200);
+    $("#sidebar_loader").show().addClass("delayed-fade-in");

 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.


@@ -60,9 +54,8 @@ $(document).ready(function () {
       url: content_path,
       dataType: "html",
       complete: function (xhr) {
       url: content_path,
       dataType: "html",
       complete: function (xhr) {

-        clearTimeout(loaderTimeout);

         $("#flash").empty();
         $("#flash").empty();

-        $("#sidebar_loader").hide();
+        $("#sidebar_loader").removeClass("delayed-fade-in").hide();

 
         var content = $(xhr.responseText);
 
 
         var content = $(xhr.responseText);
 


@@ -160,12 +153,12 @@ $(document).ready(function () {
   OSM.initializeContextMenu(map);
 
   if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
   OSM.initializeContextMenu(map);
 
   if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {

-    OSM.initializeNotes(map);
+    OSM.initializeNotesLayer(map);

     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 

-    OSM.initializeBrowse(map);
+    OSM.initializeDataLayer(map);

     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }


@@ -396,7 +389,7 @@ $(document).ready(function () {
   OSM.router.load();
 
   $(document).on("click", "a", function (e) {
   OSM.router.load();
 
   $(document).on("click", "a", function (e) {

-    if (e.isDefaultPrevented() || e.isPropagationStopped()) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped() || $(e.target).data("turbo")) {

       return;
     }
 
       return;
     }
 


@@ -412,6 +405,9 @@ $(document).ready(function () {
 
     if (OSM.router.route(this.pathname + this.search + this.hash)) {
       e.preventDefault();
 
     if (OSM.router.route(this.pathname + this.search + this.hash)) {
       e.preventDefault();

+      if (this.pathname !== "/directions") {
+        $("header").addClass("closed");
+      }

     }
   });
 
     }
   });