X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4334b1df511eb3a8161e9a98b1d3f00777e4e054..51c6366416694fe151fdcea3d9da7a06a08f7ef1:/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 e5b0796b..decc7339 100644 --- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js +++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js @@ -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,76 +81,32 @@ 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()); - var tag = $(''); - range.collapse(false); - range.insertNode(tag[0]); - - xml2html({ - xml: '' + text + ' --- ', - 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()); } - }) - } - - - function addReference(){ - var selection = window.getSelection(); - var n = selection.rangeCount; - - if (n == 0) { - 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); - - if (!verifyTagInsertPoint(range.endContainer)) { - window.alert("Nie można wstawić w to miejsce przypisu."); - return false; } - var tag = $(''); range.collapse(false); range.insertNode(tag[0]); xml2html({ - xml: '', + xml: '' + text + ' --- ', success: function(text){ var t = $(text); tag.replaceWith(t); @@ -146,14 +114,13 @@ }, error: function(){ tag.remove(); - alert('Błąd przy dodawaniu referncji:' + errors); + alert('Błąd przy dodawaniu przypisu:' + errors); } }) } - /* Insert theme using current selection */ function addTheme(){ @@ -171,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."); @@ -185,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; } @@ -324,20 +289,20 @@ 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); - } + 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); } @@ -462,7 +427,7 @@ if ($origin.is('*[x-edit-no-format]')) { - $('.akap-edit-button').remove(); + $('.akap-edit-button').remove(); } if ($origin.is('[x-node="motyw"]')) { @@ -546,7 +511,6 @@ xml = '<' + nodeName + '>' + insertedText + ''; } - xml2html({ xml: xml, success: function(element){ @@ -562,6 +526,7 @@ $origin.html($(element).html()); } $overlay.remove(); + $.wiki.activePerspective().flush(); }, error: function(text){ alert('Błąd! ' + text); @@ -575,42 +540,42 @@ }); } - $('.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 = ""; - endTag = ""; - } else if (buttonName == "wyróżnienie") { - startTag = ""; - endTag = ""; - } else if (buttonName == "tytuł dzieła") { - startTag = ""; - endTag = ""; - } 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 = ""; + endTag = ""; + } else if (buttonName == "wyróżnienie") { + startTag = ""; + endTag = ""; + } else if (buttonName == "tytuł dzieła") { + startTag = ""; + endTag = ""; + } 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(); @@ -643,12 +608,10 @@ }); } - function VisualPerspective(options){ - perspective = this; - - var old_callback = options.callback; - - options.callback = function(){ + class VisualPerspective extends $.wiki.Perspective { + constructor(options) { + super(options); + let self = this; var element = $("#html-view"); var button = $(''); var uwagaButton = $(''); @@ -661,7 +624,10 @@ if (!editable.hasClass('active')) { editable.addClass('active').append(button); - if (!editable.is('[x-edit-attribute]')) { + if (!editable.is('[x-edit-attribute]') && + !editable.is('.annotation-inline-box') && + !editable.is('[x-edit-no-format]') + ) { editable.append(uwagaButton); } } @@ -671,41 +637,46 @@ } }); - perspective.caret = new Caret(element); - + self.caret = new Caret(element); + $('#insert-reference-button').click(function(){ - addReference(); + self.flush(); + self.addReference(); return false; }); $('#insert-annotation-button').click(function(){ + self.flush(); addAnnotation(); return false; }); $('#insert-theme-button').click(function(){ + self.flush(); addTheme(); return false; }); - $(".insert-inline-tag").click(function() { - perspective.insertInlineTag($(this).attr('data-tag')); + self.flush(); + self.insertInlineTag($(this).attr('data-tag')); return false; }); $(".insert-char").click(function() { - console.log('perspective', perspective); - addSymbol(caret=perspective.caret); + self.flush(); + addSymbol(caret=self.caret); return false; }); $(document).on('click', '.edit-button', function(event){ + self.flush(); event.preventDefault(); openForEdit($(this).parent()); }); $(document).on('click', '.uwaga-button', function(event){ + self.flush(); event.preventDefault(); createUwagaBefore($(this).parent()); }); @@ -716,151 +687,217 @@ }); element.on('click', '.annotation', function(event) { + self.flush(); event.preventDefault(); + event.redakcja_caret_ignore = true; $('[x-annotation-box]', $(this).parent()).toggleClass('editing'); - + self.caret.detach(); }); + } - old_callback.call(this); - }; - - $.wiki.Perspective.call(this, options); - }; + onEnter(success, failure) { + super.onEnter(); - VisualPerspective.prototype = new $.wiki.Perspective(); + $.blockUI({ + message: 'Uaktualnianie widoku...' + }); - VisualPerspective.prototype.onEnter = function(success, failure){ - $.wiki.Perspective.prototype.onEnter.call(this); + function _finalize(callback){ + $.unblockUI(); + if (callback) + callback(); + } - $.blockUI({ - message: 'Uaktualnianie widoku...' - }); + 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 = '

Wystąpił błąd:

'+text+'

'; + if (source) + err += '
'+source.replace(/&/g, '&').replace(/'
+                    $('#html-view').html(err);
+                    _finalize(failure);
+                }
+            });
+        }
 
-        function _finalize(callback){
-            $.unblockUI();
-            if (callback)
-                callback();
+        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 + '
'); + } + }); + } + }); } - perspective = this; - xml2html({ - xml: this.doc.text, - base: this.doc.getBase(), - success: function(element){ + onExit(success, failure) { + var self = this; - var htmlView = $('#html-view'); - htmlView.html(element); + self.caret.detach(); - _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();
 
-    VisualPerspective.prototype.onExit = function(success, failure){
-        var self = this;
+            self.flush().then(() => {
+                success && success();
+            }).catch((e) => {
+                // TODO report
+                console.log('REJECTED!', e);
+                failure && failure();
+            });
+        };
 
-        self.caret.detach();
+        insertInlineTag(tag) {
+            this.caret.detach();
+            let self = this;
 
-        $.wiki.exitTab('#PropertiesPerspective');
-        
-        $.blockUI({
-            message: 'Zapisywanie widoku...'
-        });
+            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);
 
-        function _finalize(callback){
-            $.unblockUI();
-            if (callback)
-                callback();
-        }
+            // 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;
 
-        if ($('#html-view .error').length > 0)
-            return _finalize(failure);
+            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;
+            }
 
-        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); + 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); + } } - }); - }; - VisualPerspective.prototype.insertInlineTag = function(tag) { - this.caret.detach(); + 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); + } + } - 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); + // We will construct a HTML element with the range selected. + let div = $(""); + while (current != end) { + n = current.nextSibling; + $(current).appendTo(div); + current = n; + } - // Make sure that: - // Both ends are in the same x-node container. - // TODO: That the container is a inline-text container. - let node = range.startContainer; - if (node.nodeType == node.TEXT_NODE) { - node = node.parentNode; - } - let endNode = range.endContainer; - if (endNode.nodeType == endNode.TEXT_NODE) { - endNode = endNode.parentNode; + html2text({ + element: div[0], + success: function(d) { + xml2html({ + xml: d = '<' + tag + '>' + d + '', + success: function(html) { + // What if no end? + node.insertBefore($(html)[0], end); + self.flush(); + } + }); + }, + error: function(a, b) { + console.log(a, b); + } + }); } - if (node != endNode) { - window.alert("Zły obszar."); - return false; + + insertAtRange(range, elem) { + let self = this; + let $end = $(range.endContainer); + if ($end.attr('id') == 'caret') { + self.caret.insert(elem); + } else { + range.insertNode(elem[0]); + } } - // We will construct a HTML element with the range selected. - let div = $(""); + addReference() { + let self = this; + var selection = window.getSelection(); + var n = selection.rangeCount; - contents = $(node).contents(); - let startChildIndex = node == range.startContainer ? 0 : contents.index(range.startContainer); - let endChildIndex = contents.index(range.endContainer); + // TODO: if no selection, take caret position.. + if (n == 0) { + window.alert("Nie zaznaczono żadnego obszaru"); + return false; + } - current = range.startContainer; - if (current.nodeType == current.TEXT_NODE) { - current = current.splitText(range.startOffset); - } - while (current != range.endContainer) { - n = current.nextSibling; - $(current).appendTo(div); - current = n; - } - if (current.nodeType == current.TEXT_NODE) { - end = current.splitText(range.endOffset); - } - $(current).appendTo(div); - - html2text({ - element: div[0], - success: function(d) { - xml2html({ - xml: d = '<' + tag + '>' + d + '', - success: function(html) { - // What if no end? - node.insertBefore($(html)[0], end); - } - }); - }, - error: function(a, b) { - console.log(a, b); + 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;