X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/77f5f5a80c712f09605140d215551ada7699834d..bdc2a3ea27e2980c8c0fbdba2efe6b65291692c2:/redakcja/static/js/wiki/view_editor_wysiwyg.js?ds=inline diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js index ab0c9889..3ec4f701 100644 --- a/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -37,7 +37,7 @@ } // don't allow themes inside annotations - if (node.is('*[x-annotation-box] *')) + if (node.closest('[x-node="pe"]').length > 0) return false; return true; @@ -155,12 +155,21 @@ var random = Math.floor(4000000000 * Math.random()); var id = ('' + date) + '-' + ('' + random); - var spoint = document.createRange(); - var epoint = document.createRange(); - - spoint.setStart(range.startContainer, range.startOffset); - epoint.setStart(range.endContainer, range.endOffset); - + var createPoint = function(container, offset) { + var offsetBetweenCommas = function(text, offset) { + if(text.length < 2 || offset < 1 || offset > text.length) + return false; + return text[offset-1] === ',' && text[offset] === ','; + } + var point = document.createRange(); + offset = offsetBetweenCommas(container.textContent, offset) ? offset - 1 : offset; + point.setStart(container, offset); + return point; + } + + var spoint = createPoint(range.startContainer, range.startOffset); + var epoint = createPoint(range.endContainer, range.endOffset); + var mtag, btag, etag, errors; // insert theme-ref @@ -197,13 +206,13 @@ if($('div.html-editarea textarea')[0]) { var specialCharsContainer = $("
"); - var specialChars = ['Ä','Ä ','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ', + var specialChars = ['â', 'Ä','Ä ','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ', 'Ã','â','Ã','ä','à ','Ã¥','Ä','Ä','Ä','Ä','Ã','ã', 'Ã','æ','Ã','ç','Ä','Ä','Ä','Ä','Ä','Ä','Ã','é','Ã','è', 'Ã','ê','Ã','ë','Ä','Ä','Ä','Ä','Ä ','Ä¡','Ħ','ħ','Ã','Ã','Ã','î', 'Ī','Ä«','Ĭ','Ä','Ľ','ľ','Ã','ñ','Å','Å','Ã','ó','Ã','ö', 'Ã','ô','Å','Å','Ç','Ç','Å','Å','Ã','ø','Å','Å','Å ', - 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú', + 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú','Ã','ù', 'Ã','ü','Å®','ů','Ū','Å«','Ã','û','Ŭ','Å', 'Ã','ý','Ž','ž','Ã','Ã','ð','Ã','þ','Ð','а','Ð', 'б','Ð','в','Ð','г','Ð','д','Ð','е','Ð','Ñ','Ð', @@ -218,7 +227,7 @@ 'Τ','Ï','Î¥','Ï ','Φ','Ï','Χ','Ï','Ψ','Ï','Ω','Ï','â', 'â','¡','¿','$','¢','£','â¬','©','®','°','¹','²','³', '¼','½','¾','â ','§','â°','â¢','â','â','â','â', - 'â','â','ââ','«','»','«»','â','[',']','~','|','â','·', + 'â','â','ââ','«','»','«»','»«','â','[',']','~','|','â','·', 'Ã','÷','â','â ','±','â¤','â¥','â']; var tableContent = "