Add annotation - better positioning

[redakcja.git] / redakcja / static / js / wiki / view_editor_wysiwyg.js

diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index a661a1c..a0c962d 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -288,11 +288,8 @@
         else {
             $box = $origin;
         }
-
-        /* always stick to the left to avoid interfering with gallery */
-        var x = 20;
-        var y = $origin.offset().top + $("#html-view").scrollTop();
-        
+        var x = $box[0].offsetLeft;
+        var y = $box[0].offsetTop;        
         
         var w = $box.outerWidth();
         var h = $box.innerHeight();
@@ -300,6 +297,11 @@
         if ($origin.is(".annotation-inline-box")) {
             w = Math.max(w, 400);
             h = Math.max(h, 60);
+            if($('.htmlview div').offset().left + $('.htmlview div').width() > ($('.vsplitbar').offset().left - 480)){
+                x = -(Math.max($origin.offset().left, $origin.width())); 
+            } else {
+                x = 100;
+            }
         }
 
         // start edition on this node
@@ -309,16 +311,18 @@
             left: x,
             top: y,
             width: w
-        }).appendTo($('#html-view')).show();  /* appending outside of the document structure */
+        }).appendTo($box[0].offsetParent || $box.parent()).show();
         
 
         if ($origin.is('.motyw')) {
-            $('textarea', $overlay).autocomplete('/themes', {
-                autoFill: true,
-                multiple: true,
-                selectFirst: true,
-                highlight: false
-            });
+            withThemes(function(canonThemes){
+                $('textarea', $overlay).autocomplete(canonThemes, {
+                    autoFill: true,
+                    multiple: true,
+                    selectFirst: true,
+                    highlight: false
+                });
+            })
         }
 
         if ($origin.is('.motyw')){
@@ -484,12 +488,8 @@
                 $('#html-view').html(element);
                 _finalize(success);
             },
-            error: function(text){
-                /* only basic error message */
-                var errorArray = text.split("\n");
-                var errorLocation = errorArray[2].split(":")[0];
-                text = errorLocation;
-                $('#html-view').html('<p class="error">Wystąpił błąd: '+ text + '</p>');
+            error: function(text, source){
+                $('#html-view').html('<p class="error">Wystąpił błąd:</p><p>'+text+'</p><pre>'+source.replace(/&/g, '&amp;').replace(/</g, '&lt;')+'</pre>');
                 _finalize(failure);
             }
         });