minor fixes: #860, #861, #870

[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 94d7703..dc24aea 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -43,8 +43,8 @@
         return true;
     }
 
         return true;
     }
 

-    /* Convert HTML frament to plaintext */
-    var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'theme'];
+    /* Convert HTML fragment to plaintext */
+    var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'motyw'];

 
     function html2plainText(fragment){
         var text = "";
 
     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());
         // 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]);
         var tag = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);


@@ -194,6 +193,90 @@
         });
     }
 
         });
     }
 

+    function addSymbol() {
+        if($('div.html-editarea textarea')[0]) {
+            var specialCharsContainer = $("<div id='specialCharsContainer'><a href='#' id='specialCharsClose'>Zamknij</a><table id='tableSpecialChars' style='width: 600px;'></table></div>");
+            var specialChars = ['Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à',
+            'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã',
+            'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è',
+            'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
+            'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
+            'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',
+            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú',
+            'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
+            'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
+            'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',
+            'ж','З','з','И','и','Й','й','К','к','Л','л','М',
+            'м','Н','н','О','о','П','п','Р','р','С','с',
+            'Т','т','У','у','Ф','ф','Х','х','Ц','ц','Ч',
+            'ч','Ш','ш','Щ','щ','Ъ','ъ','Ы','ы','Ь','ь','Э',
+            'э','Ю','ю','Я','я','ѓ','є','і','ї','ј','љ','њ',
+            'Ґ','ґ','Α','α','Β','β','Γ','γ','Δ','δ','Ε','ε',
+            'Ζ','ζ','Η','η','Θ','θ','Ι','ι','Κ','κ','Λ','λ','Μ',
+            'μ','Ν','ν','Ξ','ξ','Ο','ο','Π','π','Ρ','ρ','Σ','ς','σ',
+            'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–',
+            '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³',
+            '¼','½','¾','†','§','‰','•','←','↑','→','↓',
+            '„”','«»','’','[',']','[','~','|','−','·',
+            '×','÷','≈','≠','±','≤','≥','∈'];
+            var tableContent = "<tr>";
+            
+            for(var i in specialChars) {
+                if(i % 14 == 0 && i > 0) {
+                    tableContent += "</tr><tr>";
+                }              
+                tableContent += "<td><input type='button' class='specialBtn' value='"+specialChars[i]+"'/></td>";              
+            }
+            
+            tableContent += "</tr>";                                   
+            $("#content").append(specialCharsContainer);
+            $("#tableSpecialChars").append(tableContent);
+            
+            /* events */
+            
+            $('.specialBtn').click(function(){
+                insertAtCaret($('div.html-editarea textarea')[0], $(this).val());
+                $(specialCharsContainer).remove();
+            });         
+            $('#specialCharsClose').click(function(){
+                $(specialCharsContainer).remove();
+            });                   
+            
+        } else {
+            window.alert('Najedź na fragment tekstu, wybierz "Edytuj" i ustaw kursor na miejscu gdzie chcesz wstawić symbol.');
+        }
+    }
+
+    function insertAtCaret(txtarea,text) { 
+        /* http://www.scottklarr.com/topic/425/how-to-insert-text-into-a-textarea-where-the-cursor-is/ */
+        var scrollPos = txtarea.scrollTop; 
+        var strPos = 0; 
+        var br = ((txtarea.selectionStart || txtarea.selectionStart == '0') ? "ff" : (document.selection ? "ie" : false ) );
+        if (br == "ie") { 
+            txtarea.focus();
+            var range = document.selection.createRange(); 
+            range.moveStart ('character', -txtarea.value.length); 
+            strPos = range.text.length; 
+        } else if (br == "ff") strPos = txtarea.selectionStart; 
+        var front = (txtarea.value).substring(0,strPos); 
+        var back = (txtarea.value).substring(strPos,txtarea.value.length); 
+        txtarea.value=front+text+back; 
+        strPos = strPos + text.length; 
+        if (br == "ie") { 
+            txtarea.focus(); 
+            var range = document.selection.createRange(); 
+            range.moveStart ('character', -txtarea.value.length); 
+            range.moveStart ('character', strPos); 
+            range.moveEnd ('character', 0); 
+            range.select(); 
+        } else if (br == "ff") { 
+            txtarea.selectionStart = strPos; 
+            txtarea.selectionEnd = strPos; 
+            txtarea.focus(); 
+        } 
+        txtarea.scrollTop = scrollPos; 
+    } 
+

     /* open edition window for selected fragment */
     function openForEdit($origin){
         var $box = null
     /* open edition window for selected fragment */
     function openForEdit($origin){
         var $box = null


@@ -205,15 +288,20 @@
         else {
             $box = $origin;
         }
         else {
             $box = $origin;
         }

-

         var x = $box[0].offsetLeft;
         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);
         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
         }
 
         // start edition on this node


@@ -224,14 +312,17 @@
             top: y,
             width: w
         }).appendTo($box[0].offsetParent || $box.parent()).show();
             top: y,
             width: w
         }).appendTo($box[0].offsetParent || $box.parent()).show();

+        

 
         if ($origin.is('.motyw')) {
 
         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')){
         }
 
         if ($origin.is('.motyw')){


@@ -255,7 +346,14 @@
             });
         }
         else {
             });
         }
         else {

-            $('.delete-button', $overlay).hide();
+            $('.delete-button', $overlay).html("Anuluj");
+            $('.delete-button', $overlay).click(function(){
+                if (window.confirm("Czy jesteś pewien, że chcesz anulować zmiany?")) {
+                    $overlay.remove();
+                    $(document).unbind('click.blur-overlay');
+                    return false;
+                };
+            });

         }
 
 
         }
 
 


@@ -290,6 +388,14 @@
                             alert('Błąd! ' + text);
                         }
                     })
                             alert('Błąd! ' + text);
                         }
                     })

+                    
+                    var msg = $("<div class='saveNotify'><p>Twoje zmiany zostały naniesione na tekst źródłowy. Pamiętaj, że aby zmiany zostały utrwalone <span>należy je zapisać</span>!</p><p class='notifyTip'>Ta wiadomość zostanie automatycznie zamknięta za 6 sekund.</p></div>");
+                    $("#base").prepend(msg);
+                    $("#save-button").css({border: '5px solid red'});
+                    $('#base .saveNotify').fadeOut(7000, function(){
+                        $(this).remove(); 
+                        $("#save-button").css({border: '1px solid black'});
+                    });

                 }
 
                 $('.accept-button', $overlay).click(function(){
                 }
 
                 $('.accept-button', $overlay).click(function(){


@@ -301,7 +407,6 @@
                         return;
                     }
                     save();
                         return;
                     }
                     save();

-

                     $(document).unbind('click.blur-overlay');
                 });
 
                     $(document).unbind('click.blur-overlay');
                 });
 


@@ -349,6 +454,11 @@
                     addTheme();
                     return false;
                 });
                     addTheme();
                     return false;
                 });

+                
+                $('#insert-symbol-button').click(function(){
+                    addSymbol();
+                    return false;
+                });                

 
                 $('.edit-button').live('click', function(event){
                     event.preventDefault();
 
                 $('.edit-button').live('click', function(event){
                     event.preventDefault();


@@ -392,12 +502,8 @@
                 $('#html-view').html(element);
                 _finalize(success);
             },
                 $('#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);
             }
         });
                 _finalize(failure);
             }
         });