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

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

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 474c0806968efb442642dd99969bc58bf4564e3c..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();
 
-  /* 
+  /*
    * 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();
   });
 
@@ -41,22 +41,20 @@ $(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");
-    var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
-    var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
+    var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
 
-    if (preview.contents().length == 0) {
+    if (preview.contents().length === 0) {
       preview.oneTime(500, "loading", function () {
         preview.addClass("loading");
       });
 
-      preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () {
+      preview.load(editor.data("previewUrl"), { text: editor.val() }, function () {
         preview.stopTime("loading");
         preview.removeClass("loading");
       });
     }
 
     editor.hide();
-    preview.width(width);
     preview.css("min-height", minHeight + "px");
     preview.show();