Merge remote-tracking branch 'upstream/pull/5401'

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

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 56aad8c73a2c8642f09d4cc1d6b6f54f5b5a6f4d..bd00d937e2313068b310681a2be733f04dff0201 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -6,8 +6,10 @@
    */
   $(document).on("change", ".richtext_container textarea", function () {
     var container = $(this).closest(".richtext_container");
+    var preview = container.find(".tab-pane[id$='_preview']");
 
-    container.find(".tab-pane[id$='_preview']").empty();
+    preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");
+    preview.children(".richtext").empty();
   });
 
   /*
@@ -31,14 +33,11 @@
     var editor = container.find("textarea");
     var preview = container.find(".tab-pane[id$='_preview']");
 
-    if (preview.contents().length === 0) {
-      preview.oneTime(500, "loading", function () {
-        preview.addClass("loading");
-      });
+    if (preview.children(".richtext").contents().length === 0) {
+      preview.children(".richtext_placeholder").removeAttr("hidden").addClass("delayed-fade-in");
 
-      preview.load(editor.data("previewUrl"), { text: editor.val() }, function () {
-        preview.stopTime("loading");
-        preview.removeClass("loading");
+      preview.children(".richtext").load(editor.data("previewUrl"), { text: editor.val() }, function () {
+        preview.children(".richtext_placeholder").attr("hidden", true).removeClass("delayed-fade-in");
       });
     }
   });