Show spinner using delayed css animation in sidebar loader

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 706647ef51ff4415694c1f035cc58febaec42f6a..4dfc849feb5d9d24361566c50de3793d1c65ebd6 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);
     }


@@ -355,6 +348,16 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

+  OSM.OldBrowse = function () {
+    var page = {};
+
+    page.pushstate = page.popstate = function (path) {
+      OSM.loadSidebarContent(path);
+    };
+
+    return page;
+  };
+

   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {
   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {


@@ -369,8 +372,11 @@ $(document).ready(function () {
     "/user/:display_name/history": history,
     "/note/:id": OSM.Note(map),
     "/node/:id(/history)": OSM.Browse(map, "node"),
     "/user/:display_name/history": history,
     "/note/:id": OSM.Note(map),
     "/node/:id(/history)": OSM.Browse(map, "node"),

+    "/node/:id/history/:version": OSM.OldBrowse(),

     "/way/:id(/history)": OSM.Browse(map, "way"),
     "/way/:id(/history)": OSM.Browse(map, "way"),

+    "/way/:id/history/:version": OSM.OldBrowse(),

     "/relation/:id(/history)": OSM.Browse(map, "relation"),
     "/relation/:id(/history)": OSM.Browse(map, "relation"),

+    "/relation/:id/history/:version": OSM.OldBrowse(),

     "/changeset/:id": OSM.Changeset(map),
     "/query": OSM.Query(map)
   });
     "/changeset/:id": OSM.Changeset(map),
     "/query": OSM.Query(map)
   });


@@ -383,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;
     }