Codemirror 0.8.

[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..1986984 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -289,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();
         
         
@@ -313,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')){
@@ -487,8 +489,9 @@
             error: function(text){
                 /* only basic error message */
                 var errorArray = text.split("\n");
-                var errorLocation = errorArray[2].split(":")[0];
-                text = errorLocation;
+                if (errorArray.length >= 3) {
+                    text = errorArray[2].split(":")[0];
+                }
                 $('#html-view').html('<p class="error">Wystąpił błąd: '+ text + '</p>');
                 _finalize(failure);
             }