X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..54612c196135c939a7d17d51b81b1357f6eac9c3:/src/redakcja/static/js/wiki/view_editor_wysiwyg.js diff --git a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js index 3ec4f701..decc7339 100644 --- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -1,4 +1,4 @@ -(function($){ +(function($) { /* Show theme to the user */ function selectTheme(themeId){ @@ -6,8 +6,8 @@ selection.removeAllRanges(); var range = document.createRange(); - var s = $(".motyw[theme-class='" + themeId + "']")[0]; - var e = $(".end[theme-class='" + themeId + "']")[0]; + var s = $("[x-node='motyw'][theme-class='" + themeId + "']")[0]; + var e = $("[x-node='end'][theme-class='" + themeId + "']")[0]; if (s && e) { range.setStartAfter(s); @@ -18,15 +18,21 @@ /* Verify insertion port for annotation or theme */ function verifyTagInsertPoint(node){ - if (node.nodeType == 3) { // Text Node + if (node.nodeType == Node.TEXT_NODE) { node = node.parentNode; } - if (node.nodeType != 1) { + if (node.nodeType != Node.ELEMENT_NODE) { return false; } node = $(node); + if (node.attr('id') == 'caret') { + node = node.parent(); + } + while (node.attr('x-pass-thru')) { + node = node.parent(); + } var xtype = node.attr('x-node'); if (!xtype || (xtype.search(':') >= 0) || @@ -36,6 +42,12 @@ return false; } + return true; + } + + function verifyThemeBoundaryPoint(node) { + if (!verifyTagInsertPoint(node)) return false; + node = $(node); // don't allow themes inside annotations if (node.closest('[x-node="pe"]').length > 0) return false; @@ -50,10 +62,10 @@ var text = ""; $(fragment.childNodes).each(function(){ - if (this.nodeType == 3) // textNode + if (this.nodeType == Node.TEXT_NODE) text += this.nodeValue; else { - if (this.nodeType == 1 && + if (this.nodeType == Node.ELEMENT_NODE && $.inArray($(this).attr('x-node'), ANNOT_FORBIDDEN) == -1) { text += html2plainText(this); } @@ -69,28 +81,26 @@ var selection = window.getSelection(); var n = selection.rangeCount; - if (n == 0) { + if (selection.isCollapsed) { window.alert("Nie zaznaczono żadnego obszaru"); return false; } - // for now allow only 1 range - if (n > 1) { - window.alert("Zaznacz jeden obszar"); - return false; - } - - // remember the selected range - var range = selection.getRangeAt(0); + var range = selection.getRangeAt(n - 1); if (!verifyTagInsertPoint(range.endContainer)) { window.alert("Nie można wstawiÄ w to miejsce przypisu."); return false; } - // BUG #273 - selected text can contain themes, which should be omitted from - // defining term - var text = html2plainText(range.cloneContents()); + 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 tag = $(''); range.collapse(false); range.insertNode(tag[0]); @@ -110,6 +120,7 @@ } + /* Insert theme using current selection */ function addTheme(){ @@ -127,11 +138,9 @@ return false; } - // remember the selected range var range = selection.getRangeAt(0); - if ($(range.startContainer).is('.html-editarea') || $(range.endContainer).is('.html-editarea')) { window.alert("Motywy można oznaczaÄ tylko na tekÅcie nie otwartym do edycji. \n Zamknij edytowany fragment i spróbuj ponownie."); @@ -141,12 +150,12 @@ // verify if the start/end points make even sense - // they must be inside a x-node (otherwise they will be discarded) // and the x-node must be a main text - if (!verifyTagInsertPoint(range.startContainer)) { + if (!verifyThemeBoundaryPoint(range.startContainer)) { window.alert("Motyw nie może siÄ zaczynaÄ w tym miejscu."); return false; } - if (!verifyTagInsertPoint(range.endContainer)) { + if (!verifyThemeBoundaryPoint(range.endContainer)) { window.alert("Motyw nie może siÄ koÅczyÄ w tym miejscu."); return false; } @@ -166,10 +175,10 @@ 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 @@ -193,7 +202,7 @@ spoint.insertNode(btag[0]) btag.replaceWith(text); selection.removeAllRanges(); - openForEdit($('.motyw[theme-class=' + id + ']')); + openForEdit($('[x-node="motyw"][theme-class="' + id + '"]')); } }); } @@ -202,10 +211,18 @@ }); } - function addSymbol() { - if($('div.html-editarea textarea')[0]) { + function addSymbol(caret) { + let editArea; + + if (caret) { + editArea = $("textarea", caret.element)[0]; + } else { + editArea = $('div.html-editarea textarea')[0]; + } + + if(editArea) { var specialCharsContainer = $("
"); - + var specialChars = ['â', 'Ä','Ä ','Ä','Ä','Ä','Ä','Å','Å','Å','Å','Ã','ó','Å','Å','Å»','ż','Ź','ź','Ã','á','Ã','à ', 'Ã','â','Ã','ä','à ','Ã¥','Ä','Ä','Ä','Ä','Ã','ã', 'Ã','æ','Ã','ç','Ä','Ä','Ä','Ä','Ä','Ä','Ã','é','Ã','è', @@ -230,18 +247,18 @@ 'â','â','ââ','«','»','«»','»«','â','[',']','~','|','â','·', 'Ã','÷','â','â ','±','â¤','â¥','â']; var tableContent = "PamiÄtaj, żeby zapisaÄ swoje zmiany.
WystÄ piÅ bÅÄ d:
'+text+'
'; + if (source) + err += ''+source.replace(/&/g, '&').replace(/'
+ $('#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('WystÄ
piÅ bÅÄ
d:
' + text + '
');
+ }
+ });
+ }
+ });
+ }
- $.blockUI({
- message: 'Uaktualnianie widoku...'
- });
+ onExit(success, failure) {
+ var self = this;
- function _finalize(callback){
- $.unblockUI();
- if (callback)
- callback();
- }
+ self.caret.detach();
- 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 = 'WystÄ
piÅ bÅÄ
d:
'+text+'
';
- if (source)
- err += ''+source.replace(/&/g, '&').replace(/'
- $('#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
}
- });
- };
+ let range = selection.getRangeAt(0);
- VisualPerspective.prototype.onExit = function(success, failure){
- var self = this;
+ // Make sure that:
+ // Both ends are in the same x-node container.
+ // Both ends are set to text nodes.
+ // TODO: That the container is a inline-text container.
+ let commonNode = range.endContainer;
- $.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 = $("");
+ 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);
+ }
+ });
}
- if ($('#html-view .error').length > 0)
- return _finalize(failure);
+ insertAtRange(range, elem) {
+ let self = this;
+ let $end = $(range.endContainer);
+ if ($end.attr('id') == 'caret') {
+ self.caret.insert(elem);
+ } else {
+ range.insertNode(elem[0]);
+ }
+ }
- html2text({
- element: $('#html-view').get(0),
- stripOuter: true,
- success: function(text){
- self.doc.setText(text);
- _finalize(success);
- },
- error: function(text){
- $('#source-editor').html('WystÄ
piÅ bÅÄ
d:
' + text + '
');
- _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 = $('');
+
+ range.collapse(false);
+ self.insertAtRange(range, tag);
+
+ xml2html({
+ xml: '',
+ success: function(text){
+ var t = $(text);
+ tag.replaceWith(t);
+ openForEdit(t);
+ },
+ error: function(){
+ tag.remove();
+ alert('BÅÄ
d przy dodawaniu referncji:' + errors);
+ }
+ })
+ }
+ }
$.wiki.VisualPerspective = VisualPerspective;