X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/41e4e58d2d389558b91565c16b0c7c0ec7c558fa..5eb6cec012d33fb46914d7edeeaa12132175bb47:/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 5f450622..37e86139 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]);
@@ -290,8 +289,8 @@
             $box = $origin;
         }
 
-        /* always stick to the left to avoid interfering with gallery */
-        var x = 20;
+        /* 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();
         
         
@@ -314,12 +313,14 @@
         
 
         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')){
@@ -485,12 +486,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);
             }
         });