From: Lukasz Anwajler <lukasz@anwajler.com>
Date: Thu, 16 Sep 2010 09:07:49 +0000 (-0500)
Subject: Add annotation - fix
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/9f7006aba22398b2cc26b7becefb24c22f21964b?ds=sidebyside;hp=--cc

Add annotation - fix
---

9f7006aba22398b2cc26b7becefb24c22f21964b
diff --git a/redakcja/static/css/html.css b/redakcja/static/css/html.css
index 6f2552bd..820aed7a 100644
--- a/redakcja/static/css/html.css
+++ b/redakcja/static/css/html.css
@@ -417,7 +417,6 @@ div[x-node] > .uwaga {
 
 .htmlview .annotation-inline-box > span[x-annotation-box] {
     display: none;
-    position: absolute;
     width: 300px;
     font-size: 10pt;
     line-height: 12pt;
diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 37e86139..87d77075 100644
--- 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;
         }
-
-        /* check sidebar width and display textarea on the right but avoiding interfering with gallery */
-        var x = $(document).width() - $("#sidebar").width() - 576 - 100; // and little margin here: 100px
-        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,12 @@
         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 - 450)){
+                x = 0;    
+            } else {
+                x = 100;
+            }
+            alert('Origin left: ' + ($('.htmlview div').offset().left + $('.htmlview div').width()) + ', Belka-odstep: ' + ($('.vsplitbar').offset().left - 450));
         }
 
         // start edition on this node
@@ -309,7 +312,7 @@
             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')) {