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

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

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 56aad8c73a2c8642f09d4cc1d6b6f54f5b5a6f4d..eb13392eb5039c22b9694d10810748d199cb715f 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -5,9 +5,11 @@
    * the user next switches to it.
    */
   $(document).on("change", ".richtext_container textarea", function () {
    * the user next switches to it.
    */
   $(document).on("change", ".richtext_container textarea", function () {

-    var container = $(this).closest(".richtext_container");
+    const container = $(this).closest(".richtext_container");
+    const 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();

   });
 
   /*
   });
 
   /*


@@ -15,10 +17,10 @@
    * when switching away from an edit pane
    */
   $(document).on("hide.bs.tab", ".richtext_container button[data-bs-target$='_edit']", function () {
    * when switching away from an edit pane
    */
   $(document).on("hide.bs.tab", ".richtext_container button[data-bs-target$='_edit']", function () {

-    var container = $(this).closest(".richtext_container");
-    var editor = container.find("textarea");
-    var preview = container.find(".tab-pane[id$='_preview']");
-    var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
+    const container = $(this).closest(".richtext_container");
+    const editor = container.find("textarea");
+    const preview = container.find(".tab-pane[id$='_preview']");
+    const minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();

 
     preview.css("min-height", minHeight + "px");
   });
 
     preview.css("min-height", minHeight + "px");
   });


@@ -27,18 +29,15 @@
    * Install a handler to switch to preview mode
    */
   $(document).on("show.bs.tab", ".richtext_container button[data-bs-target$='_preview']", function () {
    * Install a handler to switch to preview mode
    */
   $(document).on("show.bs.tab", ".richtext_container button[data-bs-target$='_preview']", function () {

-    var container = $(this).closest(".richtext_container");
-    var editor = container.find("textarea");
-    var preview = container.find(".tab-pane[id$='_preview']");
+    const container = $(this).closest(".richtext_container");
+    const editor = container.find("textarea");
+    const 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");

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


@@ -51,18 +50,18 @@
   });
 
   function invalidTextareaListener() {
   });
 
   function invalidTextareaListener() {

-    var container = $(this).closest(".richtext_container");
+    const container = $(this).closest(".richtext_container");

 
     container.find("button[data-bs-target$='_edit']").tab("show");
   }
 
   function updateHelp() {
     $(".richtext_container .richtext_help_sidebar:not(:visible):not(:empty)").each(function () {
 
     container.find("button[data-bs-target$='_edit']").tab("show");
   }
 
   function updateHelp() {
     $(".richtext_container .richtext_help_sidebar:not(:visible):not(:empty)").each(function () {

-      var container = $(this).closest(".richtext_container");
+      const container = $(this).closest(".richtext_container");

       $(this).children().appendTo(container.find(".tab-pane[id$='_help']"));
     });
     $(".richtext_container .richtext_help_sidebar:visible:empty").each(function () {
       $(this).children().appendTo(container.find(".tab-pane[id$='_help']"));
     });
     $(".richtext_container .richtext_help_sidebar:visible:empty").each(function () {

-      var container = $(this).closest(".richtext_container");
+      const container = $(this).closest(".richtext_container");

       container.find(".tab-pane[id$='_help']").children().appendTo($(this));
       if (container.find("button[data-bs-target$='_help'].active").length) {
         container.find("button[data-bs-target$='_edit']").tab("show");
       container.find(".tab-pane[id$='_help']").children().appendTo($(this));
       if (container.find("button[data-bs-target$='_help'].active").length) {
         container.find("button[data-bs-target$='_edit']").tab("show");