X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8f5de4086a5456b580c4fd4de972da986d3cbb63..087829d6b0ab58254c1d702f131978b48ddba372:/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 257ec252..a0c962d1 100644
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -44,7 +44,7 @@
     }
 
     /* Convert HTML fragment to plaintext */
-    var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'theme'];
+    var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'motyw'];
 
     function html2plainText(fragment){
         var text = "";
@@ -91,7 +91,6 @@
         // BUG #273 - selected text can contain themes, which should be omitted from
         // defining term
         var text = html2plainText(range.cloneContents());
-
         var tag = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);
@@ -289,15 +288,20 @@
         else {
             $box = $origin;
         }
-
         var x = $box[0].offsetLeft;
-        var y = $box[0].offsetTop;
+        var y = $box[0].offsetTop;        
+        
         var w = $box.outerWidth();
         var h = $box.innerHeight();
 
         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
@@ -308,14 +312,17 @@
             top: y,
             width: w
         }).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')){
@@ -481,12 +488,8 @@
                 $('#html-view').html(element);
                 _finalize(success);
             },
-            error: function(text){
-                var message = $('<pre></pre>');
-                message.text(text);
-                $('#html-view').html('<p class="error">Wystąpił błąd:</p><pre>' +
-                message.html() +
-                '</pre>');
+            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);
             }
         });