Update offset for marker icon to accurately position it

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

diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js
index 5d727a0697fa3a982f56dc56c0b66d4a496eabd9..311798aa57379fe18a0a14a6410768d40356bb11 100644 (file)
--- a/app/assets/javascripts/site.js
+++ b/app/assets/javascripts/site.js
@@ -1,6 +1,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.autogrowtextarea
 //= require jquery
 //= require jquery_ujs
 //= require jquery.autogrowtextarea

+//= require jquery.timers

 
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
 
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the


@@ -215,8 +216,18 @@ function previewRichtext(event) {
   var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
   var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
 
   var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
   var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
 

+  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.stopTime("loading");
+      preview.removeClass("loading");
+    });
+  }
+

   editor.hide();
   editor.hide();

-  preview.load(editor.attr("data-preview-url"), { text: editor.val() });

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


@@ -248,6 +259,9 @@ function editRichtext(event) {
  */
 $(document).ready(function () {
   $(".richtext_preview").hide();
  */
 $(document).ready(function () {
   $(".richtext_preview").hide();

+  $(".richtext_content textarea").change(function () { 
+    $(this).parents(".richtext_container").find(".richtext_preview").empty();
+  });

   $(".richtext_doedit").prop("disabled", true);
   $(".richtext_dopreview").prop("disabled", false);
   $(".richtext_doedit").click(editRichtext);
   $(".richtext_doedit").prop("disabled", true);
   $(".richtext_dopreview").prop("disabled", false);
   $(".richtext_doedit").click(editRichtext);