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

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

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index a5323bc0774c3adcd81ba28a191c27c88ffcce0f..3036f169b07ed34c6ec3d45b9176c21e01dcc23a 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -2,12 +2,12 @@ $(document).ready(function () {
   /* Hide the preview panes */
   $(".richtext_preview").hide();
 
   /* Hide the preview panes */
   $(".richtext_preview").hide();
 

-  /* 
+  /*

    * When the text in an edit pane is changed, clear the contents of
    * the associated preview pne so that it will be regenerated when
    * the user next switches to it.
    */
    * When the text in an edit pane is changed, clear the contents of
    * the associated preview pne so that it will be regenerated when
    * the user next switches to it.
    */

-  $(".richtext_content textarea").change(function () { 
+  $(".richtext_content textarea").change(function () {

     $(this).parents(".richtext_container").find(".richtext_preview").empty();
   });
 
     $(this).parents(".richtext_container").find(".richtext_preview").empty();
   });
 


@@ -41,7 +41,6 @@ $(document).ready(function () {
   $(".richtext_dopreview").click(function (event) {
     var editor = $(this).parents(".richtext_container").find("textarea");
     var preview = $(this).parents(".richtext_container").find(".richtext_preview");
   $(".richtext_dopreview").click(function (event) {
     var editor = $(this).parents(".richtext_container").find("textarea");
     var preview = $(this).parents(".richtext_container").find(".richtext_preview");

-    var width = editor.outerWidth() - preview.outerWidth() + preview.width();

     var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
 
     if (preview.contents().length === 0) {
     var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
 
     if (preview.contents().length === 0) {


@@ -56,7 +55,6 @@ $(document).ready(function () {
     }
 
     editor.hide();
     }
 
     editor.hide();

-    preview.width(width);

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