Show spinner using delayed css animation in richtext preview

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 0c0a699230078a2cdbbfe0cdc5cebb66d05a21df..bd00d937e2313068b310681a2be733f04dff0201 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -8,7 +8,7 @@
     var container = $(this).closest(".richtext_container");
     var preview = container.find(".tab-pane[id$='_preview']");
 
     var container = $(this).closest(".richtext_container");
     var preview = container.find(".tab-pane[id$='_preview']");
 

-    preview.children(".richtext_placeholder").attr("hidden", true);
+    preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");

     preview.children(".richtext").empty();
   });
 
     preview.children(".richtext").empty();
   });
 


@@ -34,13 +34,10 @@
     var preview = container.find(".tab-pane[id$='_preview']");
 
     if (preview.children(".richtext").contents().length === 0) {
     var preview = container.find(".tab-pane[id$='_preview']");
 
     if (preview.children(".richtext").contents().length === 0) {

-      preview.oneTime(200, "loading", function () {
-        preview.children(".richtext_placeholder").removeAttr("hidden");
-      });
+      preview.children(".richtext_placeholder").removeAttr("hidden").addClass("delayed-fade-in");

 
       preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () {
 
       preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () {

-        preview.stopTime("loading");
-        preview.children(".richtext_placeholder").attr("hidden", true);
+        preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");

       });
     }
   });
       });
     }
   });

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8dba773d876297785cbc8eb44e7de950c59f8fcf..73f8521d7fbc3f2a816deaa75661c81783df846d 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -70,6 +70,18 @@ time[title] {
   }
 }
 
   }
 }
 

+/* Utility for delayed loading spinner */
+
+.delayed-fade-in {
+  animation: 300ms linear forwards delayed-fade-in;
+}
+
+@keyframes delayed-fade-in {
+  0%   { opacity: 0 }
+  66%  { opacity: 0 }
+  100% { opacity: 1 }
+}
+

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {