X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b5f8d214ba00903379f8716ef563f19743a120b6..92407309a3a6c4cd125086728910effddd92ab20:/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 2beb4d4a..4353848e 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 @@ -196,13 +205,14 @@ 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 = ['Ä','Ä ','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ', 'Ã','â','Ã','ä','à ','Ã¥','Ä','Ä','Ä','Ä','Ã','ã', 'Ã','æ','Ã','ç','Ä','Ä','Ä','Ä','Ä','Ä','Ã','é','Ã','è', 'Ã','ê','Ã','ë','Ä','Ä','Ä','Ä','Ä ','Ä¡','Ħ','ħ','Ã','Ã','Ã','î', 'Ī','Ä«','Ĭ','Ä','Ľ','ľ','Ã','ñ','Å','Å','Ã','ó','Ã','ö', 'Ã','ô','Å','Å','Ç','Ç','Å','Å','Ã','ø','Å','Å','Å ', - 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú', + 'Å¡','Å','Å','Ť','Å¥','Å¢','Å£','Å°','ű','Ã','ú','Ã','ù', 'Ã','ü','Å®','ů','Ū','Å«','Ã','û','Ŭ','Å', 'Ã','ý','Ž','ž','Ã','Ã','ð','Ã','þ','Ð','а','Ð', 'б','Ð','в','Ð','г','Ð','д','Ð','е','Ð','Ñ','Ð', @@ -217,7 +227,7 @@ 'Τ','Ï','Î¥','Ï ','Φ','Ï','Χ','Ï','Ψ','Ï','Ω','Ï','â', 'â','¡','¿','$','¢','£','â¬','©','®','°','¹','²','³', '¼','½','¾','â ','§','â°','â¢','â','â','â','â', - 'ââ','«»','â','[',']','[','~','|','â','·', + 'â','â','ââ','«','»','«»','»«','â','[',']','~','|','â','·', 'Ã','÷','â','â ','±','â¤','â¥','â']; var tableContent = "<tr>"; @@ -230,12 +240,81 @@ tableContent += "</tr>"; $("#content").append(specialCharsContainer); + + + // localStorage for recently used characters - reading + if (typeof(localStorage) != 'undefined') { + if (localStorage.getItem("recentSymbols")) { + var recent = localStorage.getItem("recentSymbols"); + var recentArray = recent.split(";"); + var recentRow = ""; + for(var i in recentArray.reverse()) { + recentRow += "<td><input type='button' class='specialBtn recentSymbol' value='"+recentArray[i]+"'/></td>"; + } + recentRow = "<tr>" + recentRow + "</tr>"; + } + } + $("#tableSpecialChars").append(recentRow); $("#tableSpecialChars").append(tableContent); /* events */ $('.specialBtn').click(function(){ - insertAtCaret($('div.html-editarea textarea')[0], $(this).val()); + var editArea = $('div.html-editarea textarea')[0]; + var insertVal = $(this).val(); + + // if we want to surround text with quotes + // not sure if just check if value has length == 2 + + if (insertVal.length == 2) { + var startTag = insertVal[0]; + var endTag = insertVal[1]; + var textAreaOpened = editArea; + //IE support + if (document.selection) { + textAreaOpened.focus(); + sel = document.selection.createRange(); + sel.text = startTag + sel.text + endTag; + } + //MOZILLA/NETSCAPE support + else if (textAreaOpened.selectionStart || textAreaOpened.selectionStart == '0') { + var startPos = textAreaOpened.selectionStart; + var endPos = textAreaOpened.selectionEnd; + textAreaOpened.value = textAreaOpened.value.substring(0, startPos) + + startTag + textAreaOpened.value.substring(startPos, endPos) + endTag + textAreaOpened.value.substring(endPos, textAreaOpened.value.length); + } + } else { + // if we just want to insert single symbol + insertAtCaret(editArea, insertVal); + } + + // localStorage for recently used characters - saving + if (typeof(localStorage) != 'undefined') { + if (localStorage.getItem("recentSymbols")) { + var recent = localStorage.getItem("recentSymbols"); + var recentArray = recent.split(";"); + var valIndex = $.inArray(insertVal, recentArray); + //alert(valIndex); + if(valIndex == -1) { + // value not present in array yet + if(recentArray.length > 13){ + recentArray.shift(); + recentArray.push(insertVal); + } else { + recentArray.push(insertVal); + } + } else { + // value already in the array + for(var i = valIndex; i < recentArray.length; i++){ + recentArray[i] = recentArray[i+1]; + } + recentArray[recentArray.length-1] = insertVal; + } + localStorage.setItem("recentSymbols", recentArray.join(";")); + } else { + localStorage.setItem("recentSymbols", insertVal); + } + } $(specialCharsContainer).remove(); }); $('#specialCharsClose').click(function(){ @@ -251,15 +330,19 @@ /* 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 backStart = 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; + strPos = backStart = range.text.length; + } else if (br == "ff") { + strPos = txtarea.selectionStart; + backStart = txtarea.selectionEnd; + } var front = (txtarea.value).substring(0,strPos); - var back = (txtarea.value).substring(strPos,txtarea.value.length); + var back = (txtarea.value).substring(backStart,txtarea.value.length); txtarea.value=front+text+back; strPos = strPos + text.length; if (br == "ie") { @@ -305,7 +388,7 @@ } // start edition on this node - var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">UsuÅ</button><textarea></textarea></div>').css({ + var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">UsuÅ</button><button class="tytul-button akap-edit-button">tytuÅ dzieÅa</button><button class="wyroznienie-button akap-edit-button">wyróżnienie</button><button class="slowo-button akap-edit-button">sÅowo obce</button><button class="znak-button akap-edit-button">znak spec.</button><textarea></textarea></div>').css({ position: 'absolute', height: h, left: x, @@ -315,6 +398,7 @@ if ($origin.is('.motyw')) { + $('.akap-edit-button').remove(); withThemes(function(canonThemes){ $('textarea', $overlay).autocomplete(canonThemes, { autoFill: true, @@ -380,30 +464,71 @@ xml2html({ xml: '<' + nodeName + '>' + insertedText + '</' + nodeName + '>', success: function(element){ - $origin.html($(element).html()); + if (nodeName == 'out-of-flow-text') { + $(element).children().insertAfter($origin); + $origin.remove() + } + else { + $origin.html($(element).html()); + } $overlay.remove(); }, error: function(text){ - $overlay.remove(); 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>"); + var msg = $("<div class='saveNotify'><p>PamiÄtaj, żeby zapisaÄ swoje zmiany.</p></div>"); $("#base").prepend(msg); - $("#save-button").css({border: '5px solid red'}); - $('#base .saveNotify').fadeOut(7000, function(){ + $('#base .saveNotify').fadeOut(3000, function(){ $(this).remove(); - $("#save-button").css({border: '1px solid black'}); }); } + $('.akap-edit-button', $overlay).click(function(){ + var textAreaOpened = $('textarea', $overlay)[0]; + var startTag = ""; + var endTag = ""; + var buttonName = this.innerHTML; + + if(buttonName == "sÅowo obce") { + startTag = "<slowo_obce>"; + endTag = "</slowo_obce>"; + } else if (buttonName == "wyróżnienie") { + startTag = "<wyroznienie>"; + endTag = "</wyroznienie>"; + } else if (buttonName == "tytuÅ dzieÅa") { + startTag = "<tytul_dziela>"; + endTag = "</tytul_dziela>"; + } else if(buttonName == "znak spec."){ + addSymbol(); + return false; + } + + var myField = textAreaOpened; + + //IE support + if (document.selection) { + textAreaOpened.focus(); + sel = document.selection.createRange(); + sel.text = startTag + sel.text + endTag; + } + //MOZILLA/NETSCAPE support + else if (textAreaOpened.selectionStart || textAreaOpened.selectionStart == '0') { + var startPos = textAreaOpened.selectionStart; + var endPos = textAreaOpened.selectionEnd; + textAreaOpened.value = textAreaOpened.value.substring(0, startPos) + + startTag + textAreaOpened.value.substring(startPos, endPos) + endTag + textAreaOpened.value.substring(endPos, textAreaOpened.value.length); + } + }); + $('.accept-button', $overlay).click(function(){ save(); + $(document).unbind('click.blur-overlay'); }); $(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(); @@ -453,12 +578,7 @@ $('#insert-theme-button').click(function(){ addTheme(); return false; - }); - - $('#insert-symbol-button').click(function(){ - addSymbol(); - return false; - }); + }); $('.edit-button').live('click', function(event){ event.preventDefault(); @@ -499,7 +619,16 @@ xml2html({ xml: this.doc.text, success: function(element){ - $('#html-view').html(element); + var htmlView = $('#html-view'); + htmlView.html(element); + htmlView.find('*[x-node]').dblclick(function(e) { + if($(e.target).is('textarea')) + return; + var selection = window.getSelection(); + selection.collapseToStart(); + selection.modify('extend', 'forward', 'word'); + e.stopPropagation(); + }); _finalize(success); }, error: function(text, source){ @@ -529,7 +658,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);