X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a592c332d7b2923669aa3705326c094388598b08..0a12bbba32c589d32de156783d205fd31ba9065a:/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 8fe8051c..75c1c635 100644 --- a/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -203,7 +203,7 @@ 'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î', 'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö', 'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š', - 'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú', + 'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú','Ù','ù', 'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ', 'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б', 'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж', @@ -257,7 +257,7 @@ // if we want to surround text with quotes // not sure if just check if value has length == 2 - if (insertVal.length) == 2) { + if (insertVal.length == 2) { var startTag = insertVal[0]; var endTag = insertVal[1]; var textAreaOpened = editArea; @@ -307,7 +307,6 @@ } } - $(specialCharsContainer).remove(); }); $('#specialCharsClose').click(function(){ $(specialCharsContainer).remove(); @@ -462,7 +461,6 @@ $overlay.remove(); }, error: function(text){ - $overlay.remove(); alert('Błąd! ' + text); } }) @@ -516,7 +514,7 @@ }); $(document).bind('click.blur-overlay', function(event){ - if ($(event.target).parents('.html-editarea').length > 0) { + if ($(event.target).closest('.html-editarea, #specialCharsContainer').length > 0) { return; } save(); @@ -637,7 +635,8 @@ return _finalize(failure); html2text({ - element: $('#html-view div').get(0), + element: $('#html-view').get(0), + stripOuter: true, success: function(text){ self.doc.setText(text); _finalize(success);