- // 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]);
-
- xml2html({
- xml: '<pe><slowo_obce>' + text + '</slowo_obce> --- </pe>',
- success: function(text){
- var t = $(text);
- tag.replaceWith(t);
- openForEdit(t);
- },
- error: function(){
- tag.remove();
- alert('Błąd przy dodawaniu przypisu:' + errors);
+ text = '';
+ for (let i = 0; i < n; ++ i) {
+ let rangeI = selection.getRangeAt(i);
+ if (verifyTagInsertPoint(rangeI.startContainer) &&
+ verifyTagInsertPoint(rangeI.endContainer)) {
+ text += html2plainText(rangeI.cloneContents());
var specialChars = [' ', 'Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à',
'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã',
'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è',
var specialChars = [' ', 'Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à',
'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã',
'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è',
'„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·',
'×','÷','≈','≠','±','≤','≥','∈'];
var tableContent = "<tr>";
'„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·',
'×','÷','≈','≠','±','≤','≥','∈'];
var tableContent = "<tr>";
-
- 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);
- }
+
+ if (caret) {
+ caret.insertChar(insertVal);
+ caret.focus();
- // if we just want to insert single symbol
- insertAtCaret(editArea, insertVal);
+ 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 {
+ insertAtCaret(editArea, insertVal);
+ }
- var front = (txtarea.value).substring(0,strPos);
- var back = (txtarea.value).substring(backStart,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;
- }
+ var front = (txtarea.value).substring(0,strPos);
+ var back = (txtarea.value).substring(backStart,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;
+ }
$('.delete-button', $overlay).click(function(){
if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten motyw?")) {
$('[theme-class="' + $origin.attr('theme-class') + '"]').remove();
$('.delete-button', $overlay).click(function(){
if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten motyw?")) {
$('[theme-class="' + $origin.attr('theme-class') + '"]').remove();
- $('.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);
- }
- });
+ $('.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);
+ }
+ });
+ xml2html({
+ xml: this.doc.text,
+ base: this.doc.getBase(),
+ success: function(element){
+
+ var htmlView = $('#html-view');
+ htmlView.html(element);
+ if ('PropertiesPerspective' in $.wiki.perspectives)
+ $.wiki.perspectives.PropertiesPerspective.enable();
+
+ _finalize(success);
+ },
+ error: function(text, source){
+ let err = '<p class="error">Wystąpił błąd:</p><p>'+text+'</p>';
+ if (source)
+ err += '<pre>'+source.replace(/&/g, '&').replace(/</g, '<')+'</pre>'
+ $('#html-view').html(err);
+ _finalize(failure);
+ }
+ });
+ }
- VisualPerspective.prototype.onEnter = function(success, failure){
- $.wiki.Perspective.prototype.onEnter.call(this);
+ flush() {
+ let self = this;
+ return new Promise((resolve, reject) => {
+ if ($('#html-view .error').length > 0) {
+ reject()
+ } else {
+ //return _finalize(failure);
+ html2text({
+ element: $('#html-view').get(0),
+ stripOuter: true,
+ success: (text) => {
+ self.doc.setText(text);
+ resolve();
+ },
+ error: (text) => {
+ reject(text);
+ //$('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
+ }
+ });
+ }
+ });
+ }
- xml2html({
- xml: this.doc.text,
- success: function(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){
- err = '<p class="error">Wystąpił błąd:</p><p>'+text+'</p>';
- if (source)
- err += '<pre>'+source.replace(/&/g, '&').replace(/</g, '<')+'</pre>'
- $('#html-view').html(err);
- _finalize(failure);
+ if ('PropertiesPerspective' in $.wiki.perspectives)
+ $.wiki.perspectives.PropertiesPerspective.disable();
+
+ self.flush().then(() => {
+ success && success();
+ }).catch((e) => {
+ // TODO report
+ console.log('REJECTED!', e);
+ failure && failure();
+ });
+ };
+
+ insertInlineTag(tag) {
+ this.caret.detach();
+ let self = this;
+
+ let selection = window.getSelection();
+ var n = selection.rangeCount;
+ if (n != 1 || selection.isCollapsed) {
+ window.alert("Nie zaznaczono obszaru");
+ return false
- $.blockUI({
- message: 'Zapisywanie widoku...'
- });
+ if (commonNode.nodeType == Node.TEXT_NODE) {
+ commonNode = commonNode.parentNode;
+ }
+ let node = range.startContainer;
+ if (node.nodeType == Node.TEXT_NODE) {
+ node = node.parentNode;
+ }
+ if (node != commonNode) {
+ window.alert("Zły obszar.");
+ return false;
+ }
+
+ let end;
+ if (range.endContainer.nodeType == Node.TEXT_NODE) {
+ end = range.endContainer.splitText(range.endOffset);
+ } else {
+ end = document.createTextNode('');
+ let cont = $(range.endContainer).contents();
+ if (range.endOffset < cont.length) {
+ range.endContainer.insertBefore(end, cont[range.endOffset])
+ } else {
+ range.endContainer.append(end);
+ }
+ }
- function _finalize(callback){
- $.unblockUI();
- if (callback)
- callback();
+ let current;
+ if (range.startContainer.nodeType == Node.TEXT_NODE) {
+ current = range.startContainer.splitText(range.startOffset);
+ } else {
+ current = document.createTextNode('');
+ let cont = $(range.startContainer).contents();
+ if (range.startOffset < cont.length) {
+ range.startContainer.insertBefore(current, cont[range.startOffset])
+ } else {
+ startNode.append(current);
+ }
+ }
+
+ // We will construct a HTML element with the range selected.
+ let div = $("<span x-pass-thru='true'>");
+ while (current != end) {
+ n = current.nextSibling;
+ $(current).appendTo(div);
+ current = n;
+ }
+
+ html2text({
+ element: div[0],
+ success: function(d) {
+ xml2html({
+ xml: d = '<' + tag + '>' + d + '</' + tag + '>',
+ success: function(html) {
+ // What if no end?
+ node.insertBefore($(html)[0], end);
+ self.flush();
+ }
+ });
+ },
+ error: function(a, b) {
+ console.log(a, b);
+ }
+ });
- html2text({
- element: $('#html-view').get(0),
- stripOuter: true,
- success: function(text){
- self.doc.setText(text);
- _finalize(success);
- },
- error: function(text){
- $('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
- _finalize(failure);
+ addReference() {
+ let self = this;
+ var selection = window.getSelection();
+ var n = selection.rangeCount;
+
+ // TODO: if no selection, take caret position..
+ if (n == 0) {
+ window.alert("Nie zaznaczono żadnego obszaru");
+ return false;
+
+ var range = selection.getRangeAt(n - 1);
+ if (!verifyTagInsertPoint(range.endContainer)) {
+ window.alert("Nie można wstawić w to miejsce referencji.");
+ return false;
+ }
+
+ var tag = $('<span></span>');
+
+ range.collapse(false);
+ self.insertAtRange(range, tag);
+
+ xml2html({
+ xml: '<ref href=""/>',
+ success: function(text){
+ var t = $(text);
+ tag.replaceWith(t);
+ openForEdit(t);
+ },
+ error: function(){
+ tag.remove();
+ alert('Błąd przy dodawaniu referncji:' + errors);
+ }
+ })
+ }
+ }
fnp / redakcja.git / blobdiff