fnp / redakcja.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Show active users.
[redakcja.git] / 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 82920fd..e43905c 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -1,229 +1,4 @@
 (function($) {
 (function($) {
-    class Caret {
-        constructor(view) {
-            self = this;
-            self.view = view;
-            self.singleClick = false;
-            
-            let caret = this.element = $('<span id="caret"><textarea></textarea></span>');
-
-            // When user writes into caret, add it to the document.
-            $('textarea', caret).on('input', function() {
-                let v = $(this).val();
-                $(this).val('');
-                self.insertChar(v);
-
-            });
-
-            // On click on x-node element, set caret position.
-            self.view.on('click', '*[x-node]', function(e) {
-                if (e.redakcja_caret_inserted) return;
-                e.redakcja_caret_inserted = true;
-
-                if (self.singleClick) {
-                    self.singleClick = false;
-                    return;
-                }
-                
-                self.detach();
-
-                var selection = window.getSelection();
-                if (!selection.isCollapsed) return;
-
-                self.singleClick = true;
-                setTimeout(function() {
-                    if (self.singleClick) {
-                        self.element.insertBefore(
-                            selection.anchorNode.splitText(
-                                selection.anchorOffset
-                            )
-                        )
-                        self.focus();
-                    }
-                    self.singleClick = false;
-                }, 250);
-
-            });
-
-            self.view.on('keydown', function(e) {
-                // TODO:
-                // Enter (split block)
-                // delete selection?
-
-                // cases:
-                // we are in <akap> (no going up)
-                // we are in <wyroznienie> (can go up)
-                // we are next to <wyroznienie> (can go inside)
-
-                switch (e.key) {
-                case "ArrowRight":
-                    if (e.shiftKey) {
-                        self.detach();
-                        return;
-                    }
-
-                    self.moveRight();
-                    break;
-                case "ArrowLeft":
-                    if (e.shiftKey) {
-                        self.detach();
-                        return;
-                    }
-
-                    self.moveLeft();
-                    break;
-                case "ArrowUp":
-                    if (e.shiftKey) {
-                        self.detach();
-                        return;
-                    }
-                    break;
-                case "ArrowDown":
-                    if (e.shiftKey) {
-                        self.detach();
-                        return;
-                    }
-                    break;
-                case "Backspace":
-                    self.deleteBefore();
-                    break;
-                case "Delete":
-                    self.deleteAfter();
-                    break;
-//                default:
-//                    console.log('key', e.key, e.code);
-                }
-            })
-        }
-
-        get attached() {
-            return this.element.parent().length;
-        }
-
-        detach() {
-            let p;
-            if (this.attached) {
-                p = this.element.parent()[0]
-                this.element.detach();
-                p.normalize()
-            }
-        }
-
-        focus() {
-            $("textarea", self.element).focus();
-        }
-
-        normalize() {
-            this.element.parent()[0].normalize();
-        }
-
-        insertChar(ch) {
-            $(document.createTextNode(ch)).insertBefore(this.element);
-            this.normalize();
-        }
-
-        deleteBefore() {
-            let contents = this.element.parent().contents();
-            // Find the text before caret.
-            let textBefore = contents[contents.index(this.element) - 1];
-
-            // Should be text, but what if not?
-            textBefore.textContent = textBefore.textContent.substr(0, textBefore.textContent.length - 1);
-            this.normalize();
-
-        }
-
-        deleteAfter() {
-            let contents = this.element.parent().contents();
-            // Find the text after caret.
-            let textAfter = contents[contents.index(this.element) + 1];
-            textAfter.textContent = textAfter.textContent.substr(1);
-        }
-
-        moveLeft() {
-            this.move({
-                move: -1,
-                edge: (i, l) => {return !i;},
-                enter: (l) => {return l - 1;},
-                splitTarget: (t) => {return t.splitText(t.length - 1);},
-                noSplitTarget: (t) => {return t.splitText(t.length);},
-            })
-        }
-
-        moveRight() {
-            this.move({
-                move: 1,
-                edge: (i, l) => {return i == l - 1;},
-                enter: (l) => {return 0;},
-                splitTarget: (t) => {return t.splitText(1);},
-                noSplitTarget: (t) => {return t;},
-            })
-        }
-
-        move(opts) {
-            if (!this.attached) return;
-            this.normalize();
-
-            let contents = this.element.parent().contents();
-            let index = contents.index(this.element);
-            let target, moved, oldparent;
-
-            let parent = this.element.parent()[0];
-
-            if (opts.edge(index, contents.length)) {
-                // We're at the end -- what to do?
-                // can we go up?
-
-                if (parent.nodeName == 'EM') {
-                    oldparent = parent;
-                    parent = parent.parentNode;
-                    contents = $(parent).contents();
-                    index = contents.index(oldparent);
-                }
-            }
-
-            index += opts.move;
-            target = contents[index];
-            moved = false;
-
-            while (target.nodeType == 1) {
-                // we've encountered a node.
-                // can we go inside?
-
-                if (target.nodeName == 'EM') {
-                    // enter
-                    parent = $(target);
-                    contents = parent.contents();
-                    index = opts.enter(contents.length);
-                    target = contents[index];
-
-                    // what if it has no elements?
-                } else {
-                    // skip
-                    index += opts.move; // again, what if end?
-                    target = contents[index];
-                    moved = true;
-                }
-
-                // if editable?
-                // what if editable but empty?
-
-            }
-
-            if (target.nodeType == 3) {
-                if (!moved) {
-                    target = opts.splitTarget(target);
-                } else {
-                    target = opts.noSplitTarget(target);
-                }
-
-                this.element.insertBefore(target);
-            }
-            this.normalize();
-            this.focus();
-        }
-    }
-
 
     /* Show theme to the user */
     function selectTheme(themeId){
 
     /* Show theme to the user */
     function selectTheme(themeId){
@@ -231,8 +6,8 @@
         selection.removeAllRanges();
 
         var range = document.createRange();
         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);
 
         if (s && e) {
             range.setStartAfter(s);
@@ -243,15 +18,21 @@
 
     /* Verify insertion port for annotation or theme */
     function verifyTagInsertPoint(node){
 
     /* 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;
         }
 
             node = node.parentNode;
         }
 
-        if (node.nodeType != 1) {
+        if (node.nodeType != Node.ELEMENT_NODE) {
             return false;
         }
 
         node = $(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) ||
         var xtype = node.attr('x-node');
 
         if (!xtype || (xtype.search(':') >= 0) ||
@@ -261,6 +42,12 @@
             return false;
         }
 
             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;
         // don't allow themes inside annotations
         if (node.closest('[x-node="pe"]').length > 0)
             return false;
@@ -275,10 +62,10 @@
         var text = "";
 
         $(fragment.childNodes).each(function(){
         var text = "";
 
         $(fragment.childNodes).each(function(){
-            if (this.nodeType == 3) // textNode
+            if (this.nodeType == Node.TEXT_NODE)
                 text += this.nodeValue;
             else {
                 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);
                 }
                         $.inArray($(this).attr('x-node'), ANNOT_FORBIDDEN) == -1) {
                     text += html2plainText(this);
                 }
@@ -294,76 +81,32 @@
         var selection = window.getSelection();
         var n = selection.rangeCount;
 
         var selection = window.getSelection();
         var n = selection.rangeCount;
 
-        if (n == 0) {
+        if (selection.isCollapsed) {
             window.alert("Nie zaznaczono żadnego obszaru");
             return false;
         }
 
             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;
         }
 
 
         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 = $('<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());
             }
             }
-        })
-    }
-
-
-    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 = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);
 
         xml2html({
         var tag = $('<span></span>');
         range.collapse(false);
         range.insertNode(tag[0]);
 
         xml2html({
-            xml: '<ref href=""/>',
+            xml: '<pe><slowo_obce>' + text + '</slowo_obce> --- </pe>',
             success: function(text){
                 var t = $(text);
                 tag.replaceWith(t);
             success: function(text){
                 var t = $(text);
                 tag.replaceWith(t);
@@ -371,14 +114,13 @@
             },
             error: function(){
                 tag.remove();
             },
             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(){
     /* Insert theme using current selection */
 
     function addTheme(){
@@ -396,11 +138,9 @@
             return false;
         }
 
             return false;
         }
 
-
         // remember the selected range
         var range = selection.getRangeAt(0);
 
         // 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.");
         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.");
@@ -410,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
         // 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;
         }
 
             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;
         }
             window.alert("Motyw nie może się kończyć w tym miejscu.");
             return false;
         }
@@ -462,7 +202,7 @@
                                 spoint.insertNode(btag[0])
                                 btag.replaceWith(text);
                                 selection.removeAllRanges();
                                 spoint.insertNode(btag[0])
                                 btag.replaceWith(text);
                                 selection.removeAllRanges();
-                                openForEdit($('.motyw[theme-class="' + id + '"]'));
+                                openForEdit($('[x-node="motyw"][theme-class="' + id + '"]'));
                             }
                         });
                     }
                             }
                         });
                     }
@@ -483,29 +223,53 @@
         if(editArea) {
             var specialCharsContainer = $("<div id='specialCharsContainer'><a href='#' id='specialCharsClose'>Zamknij</a><table id='tableSpecialChars' style='width: 600px;'></table></div>");
 
         if(editArea) {
             var specialCharsContainer = $("<div id='specialCharsContainer'><a href='#' id='specialCharsClose'>Zamknij</a><table id='tableSpecialChars' style='width: 600px;'></table></div>");
 
-            var specialChars = [' ', 'Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à',
-            'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã',
-            'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è',
-            'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
-            'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
-            'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',
-            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú','Ù','ù',
-            'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
-            'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
-            'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',
-            'ж','З','з','И','и','Й','й','К','к','Л','л','М',
-            'м','Н','н','О','о','П','п','Р','р','С','с',
-            'Т','т','У','у','Ф','ф','Х','х','Ц','ц','Ч',
-            'ч','Ш','ш','Щ','щ','Ъ','ъ','Ы','ы','Ь','ь','Э',
-            'э','Ю','ю','Я','я','ѓ','є','і','ї','ј','љ','њ',
-            'Ґ','ґ','Α','α','Β','β','Γ','γ','Δ','δ','Ε','ε',
-            'Ζ','ζ','Η','η','Θ','θ','Ι','ι','Κ','κ','Λ','λ','Μ',
-            'μ','Ν','ν','Ξ','ξ','Ο','ο','Π','π','Ρ','ρ','Σ','ς','σ',
-            'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–',
-            '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³',
-            '¼','½','¾','†','§','‰','•','←','↑','→','↓',
-            '„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·',
-            '×','÷','≈','≠','±','≤','≥','∈'];
+            var specialChars = [
+                ' ', 'Ą','ą','Ć','ć','Ę','ę','Ł','ł','Ń','ń','Ó','ó','Ś','ś','Ż','ż','Ź','ź','Á','á','À','à',
+                'Â','â','Ä','ä','Å','å','Ā','ā','Ă','ă','Ã','ã',
+                'Æ','æ','Ç','ç','Č','č','Ċ','ċ','Ď','ď','É','é','È','è',
+                'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
+                'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
+                'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',
+                'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú','Ù','ù',
+                'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
+                'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
+                'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',
+                'ж','З','з','И','и','Й','й','К','к','Л','л','М',
+                'м','Н','н','О','о','П','п','Р','р','С','с',
+                'Т','т','У','у','Ф','ф','Х','х','Ц','ц','Ч',
+                'ч','Ш','ш','Щ','щ','Ъ','ъ','Ы','ы','Ь','ь','Э',
+                'э','Ю','ю','Я','я','ѓ','є','і','ї','ј','љ','њ',
+                'Ґ','ґ','Α','α','Β','β','Γ','γ','Δ','δ','Ε','ε',
+                'Ζ','ζ','Η','η','Θ','θ','Ι','ι','Κ','κ','Λ','λ','Μ',
+                'μ','Ν','ν','Ξ','ξ','Ο','ο','Π','π','Ρ','ρ','Σ','ς','σ',
+                'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–',
+                '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³',
+                '¼','½','¾','†','§','‰','•','←','↑','→','↓',
+                '„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·',
+                '×','÷','≈','≠','±','≤','≥','∈',
+
+                // Hebrew
+                '\u05d0', '\u05d1', '\u05d2', '\u05d3', '\u05d4', '\u05d5', '\u05d6', '\u05d7',
+                '\u05d8', '\u05d9', '\u05da', '\u05db', '\u05dc', '\u05dd', '\u05de', '\u05df', 
+                '\u05e0', '\u05e1', '\u05e2', '\u05e3', '\u05e4', '\u05e5', '\u05e6', '\u05e7', 
+                '\u05e8', '\u05e9', '\u05e0', '\u05ea',
+
+                '\u0591', '\u0592', '\u0593', '\u0594', '\u0595', '\u0596', '\u0597',
+                '\u0598', '\u0599', '\u059a', '\u059b', '\u059c', '\u059d', '\u059e', '\u059f', 
+                '\u05a0', '\u05a1', '\u05a2', '\u05a3', '\u05a4', '\u05a5', '\u05a6', '\u05a7',
+                '\u05a8', '\u05a9', '\u05aa', '\u05ab', '\u05ac', '\u05ad', '\u05ae', '\u05af', 
+                '\u05b0', '\u05b1', '\u05b2', '\u05b3', '\u05b4', '\u05b5', '\u05b6', '\u05b7',
+                '\u05b8', '\u05b9', '\u05ba', '\u05bb', '\u05bc', '\u05bd', '\u05be', '\u05bf', 
+                '\u05c0', '\u05c1', '\u05c2', '\u05c3', '\u05c4', '\u05c5', '\u05c6', '\u05c7',
+
+                '\ufb1d', '\ufb1e', '\ufb1f',
+                '\ufb20', '\ufb21', '\ufb22', '\ufb23', '\ufb24', '\ufb25', '\ufb26', '\ufb27',
+                '\ufb28', '\ufb29', '\ufb2a', '\ufb2b', '\ufb2c', '\ufb2d', '\ufb2e', '\ufb2f',
+                '\ufb30', '\ufb31', '\ufb32', '\ufb33', '\ufb34', '\ufb35', '\ufb36',
+                '\ufb38', '\ufb39', '\ufb3a', '\ufb3b', '\ufb3c',           '\ufb3e',
+                '\ufb40', '\ufb41',           '\ufb43', '\ufb44',           '\ufb46', '\ufb47',
+                '\ufb48', '\ufb49', '\ufb4a', '\ufb4b', '\ufb4c', '\ufb4d', '\ufb4e', '\ufb4f', 
+            ]
             var tableContent = "<tr>";
 
             for(var i in specialChars) {
             var tableContent = "<tr>";
 
             for(var i in specialChars) {
@@ -549,20 +313,20 @@
                     if (insertVal.length == 2) {
                         var startTag = insertVal[0];
                         var endTag = insertVal[1];
                     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);
                     }
                     } else {
                         insertAtCaret(editArea, insertVal);
                     }
@@ -687,14 +451,14 @@
 
 
         if ($origin.is('*[x-edit-no-format]')) {
 
 
         if ($origin.is('*[x-edit-no-format]')) {
-           $('.akap-edit-button').remove();
+            $('.akap-edit-button').remove();
         }
 
         }
 
-        if ($origin.is('.motyw')) {
+        if ($origin.is('[x-node="motyw"]')) {
             $.themes.autocomplete($('textarea', $overlay));
         }
 
             $.themes.autocomplete($('textarea', $overlay));
         }
 
-        if ($origin.is('.motyw')){
+        if ($origin.is('[x-node="motyw"]')){
             $('.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();
@@ -704,9 +468,20 @@
                 };
             });
         }
                 };
             });
         }
-        else if($box.is('*[x-annotation-box]') || $origin.is('*[x-edit-attribute]')) {
+        else if($box.is('*[x-annotation-box]') || $origin.is('*[x-edit-attribute]') || $origin.is('*[x-node="uwaga"]')) {
+            let q;
+            switch ($origin.attr('x-node')) {
+            case 'uwaga':
+                q = 'tę uwagę';
+                break;
+            case 'ref':
+                q = 'tę referencję';
+                break
+            default:
+                q = 'ten przypis';
+            }
             $('.delete-button', $overlay).click(function(){
             $('.delete-button', $overlay).click(function(){
-                if (window.confirm("Czy jesteś pewien, że chcesz usunąć ten przypis?")) {
+                if (window.confirm("Czy jesteś pewien, że chcesz usunąć " + q + "?")) {
                     $origin.remove();
                     $overlay.remove();
                     $(document).unbind('click.blur-overlay');
                     $origin.remove();
                     $overlay.remove();
                     $(document).unbind('click.blur-overlay');
@@ -730,7 +505,7 @@
 
         if($box.attr("x-edit-attribute")) {
             source = $('<span x-pass-thru="true"/>');
 
         if($box.attr("x-edit-attribute")) {
             source = $('<span x-pass-thru="true"/>');
-            source.text($box.attr("data-wlf-" + $box.attr("x-edit-attribute")));
+            source.text($box.attr("x-a-wl-" + $box.attr("x-edit-attribute")));
             source = source[0];
         } else {
             source = $box[0];
             source = source[0];
         } else {
             source = $box[0];
@@ -750,7 +525,7 @@
                     var nodeName = $box.attr('x-node') || 'pe';
                     var insertedText = $('textarea', $overlay).val();
 
                     var nodeName = $box.attr('x-node') || 'pe';
                     var insertedText = $('textarea', $overlay).val();
 
-                    if ($origin.is('.motyw')) {
+                    if ($origin.is('[x-node="motyw"]')) {
                         insertedText = insertedText.replace(/,\s*$/, '');
                     }
 
                         insertedText = insertedText.replace(/,\s*$/, '');
                     }
 
@@ -760,7 +535,6 @@
                         xml = '<' + nodeName + '>' + insertedText + '</' + nodeName + '>';
                     }
 
                         xml = '<' + nodeName + '>' + insertedText + '</' + nodeName + '>';
                     }
 
-
                     xml2html({
                         xml: xml,
                         success: function(element){
                     xml2html({
                         xml: xml,
                         success: function(element){
@@ -776,6 +550,7 @@
                                 $origin.html($(element).html());
                             }
                             $overlay.remove();
                                 $origin.html($(element).html());
                             }
                             $overlay.remove();
+                            $.wiki.activePerspective().flush();
                         },
                         error: function(text){
                             alert('Błąd! ' + text);
                         },
                         error: function(text){
                             alert('Błąd! ' + text);
@@ -789,42 +564,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 = "<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);
+                    }
+                });
 
                 $('.accept-button', $overlay).click(function(){
                     save();
 
                 $('.accept-button', $overlay).click(function(){
                     save();
@@ -846,230 +621,308 @@
         });
     }
 
         });
     }
 
+    function createUwagaBefore(before) {
+        xml2html({
+            xml: '<uwaga/>',
+            success: function(element){
+                let $element = $(element);
+                $element.insertBefore(before);
+                openForEdit($element);
+            }
+        });
+    }
 
 
-    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 element = $("#html-view");
-            var button = $('<button class="edit-button">Edytuj</button>');
+            var button = $('<button class="edit-button active-block-button">Edytuj</button>');
+            var uwagaButton = $('<button class="uwaga-button active-block-button">Uwaga</button>');
 
             if (!CurrentDocument.readonly) {
 
                 $('#html-view').bind('mousemove', function(event){
                     var editable = $(event.target).closest('*[x-editable]');
 
             if (!CurrentDocument.readonly) {
 
                 $('#html-view').bind('mousemove', function(event){
                     var editable = $(event.target).closest('*[x-editable]');
-                    $('.active', element).not(editable).removeClass('active').children('.edit-button').remove();
+                    $('.active', element).not(editable).removeClass('active').children('.active-block-button').remove();
 
                     if (!editable.hasClass('active')) {
                         editable.addClass('active').append(button);
 
                     if (!editable.hasClass('active')) {
                         editable.addClass('active').append(button);
+                        if (!editable.is('[x-edit-attribute]') &&
+                            !editable.is('.annotation-inline-box') &&
+                            !editable.is('[x-edit-no-format]')
+                           ) {
+                            editable.append(uwagaButton);
+                        }
                     }
                     if (editable.is('.annotation-inline-box')) {
                         $('*[x-annotation-box]', editable).css({
                     }
                     if (editable.is('.annotation-inline-box')) {
                         $('*[x-annotation-box]', editable).css({
-                            position: 'absolute',
-                            left: event.clientX - editable.offset().left + 5,
-                            top: event.clientY - editable.offset().top + 5
                         }).show();
                     }
                         }).show();
                     }
-                    else {
-                        $('*[x-annotation-box]').hide();
-                    }
                 });
 
                 });
 
+                self.caret = new Caret(element);
+
                 $('#insert-reference-button').click(function(){
                 $('#insert-reference-button').click(function(){
-                    addReference();
+                    self.flush();
+                    self.addReference();
                     return false;
                 });
 
                 $('#insert-annotation-button').click(function(){
                     return false;
                 });
 
                 $('#insert-annotation-button').click(function(){
+                    self.flush();
                     addAnnotation();
                     return false;
                 });
 
                 $('#insert-theme-button').click(function(){
                     addAnnotation();
                     return false;
                 });
 
                 $('#insert-theme-button').click(function(){
+                    self.flush();
                     addTheme();
                     return false;
                 });
 
                     addTheme();
                     return false;
                 });
 
-
                 $(".insert-inline-tag").click(function() {
                 $(".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() {
                     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){
                     return false;
                 });
 
                 $(document).on('click', '.edit-button', function(event){
+                    self.flush();
                     event.preventDefault();
                     openForEdit($(this).parent());
                 });
 
                     event.preventDefault();
                     openForEdit($(this).parent());
                 });
 
+                $(document).on('click', '.uwaga-button', function(event){
+                    self.flush();
+                    event.preventDefault();
+                    createUwagaBefore($(this).parent());
+                });
             }
 
             }
 
-            $(document).on('click', '.motyw', function(){
+            $(document).on('click', '[x-node="motyw"]', function(){
                 selectTheme($(this).attr('theme-class'));
             });
 
                 selectTheme($(this).attr('theme-class'));
             });
 
-            old_callback.call(this);
-        };
-
-        $.wiki.Perspective.call(this, options);
-    };
-
-    VisualPerspective.prototype = new $.wiki.Perspective();
+            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();
+            });
+        }
 
 
-    VisualPerspective.prototype.freezeState = function(){
+        onEnter(success, failure) {
+            super.onEnter();
 
 
-    };
+            $.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 = '<p class="error">Wystąpił błąd:</p><p>'+text+'</p>';
+                    if (source)
+                        err += '<pre>'+source.replace(/&/g, '&amp;').replace(/</g, '&lt;')+'</pre>'
+                    $('#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('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
+                        }
+                    });
+                }
+            });
         }
 
         }
 
-        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();
 
 
-                perspective.caret = new Caret(htmlView);
+            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;
 
 
-                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, '&amp;').replace(/</g, '&lt;')+'</pre>'
-                $('#html-view').html(err);
-                _finalize(failure);
+            let selection = window.getSelection();
+            var n = selection.rangeCount;
+            if (n != 1 || selection.isCollapsed) {
+                window.alert("Nie zaznaczono obszaru");
+                return false
             }
             }
-        });
-    };
-
-    VisualPerspective.prototype.onExit = function(success, failure){
-        var self = this;
+            let range = selection.getRangeAt(0);
 
 
-        $.blockUI({
-            message: 'Zapisywanie widoku...'
-        });
+            // 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;
 
 
-        function _finalize(callback){
-            $.unblockUI();
-            if (callback)
-                callback();
-        }
+            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;
+            }
 
 
-        if ($('#html-view .error').length > 0)
-            return _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);
+                }
+            }
 
 
-        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);
+            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);
+                }
             }
             }
-        });
-    };
 
 
-    VisualPerspective.prototype.insertInlineTag = function(tag) {
-        this.caret.detach();
+            // 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;
+            }
 
 
-        let selection = window.getSelection();
-        var n = selection.rangeCount;
-        if (n != 1) {
-            window.alert("Nie zaznaczono obszaru");
-            return false
+            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);
+                }
+            });
         }
         }
-        let range = selection.getRangeAt(0);
 
 
-        // 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;
-        }
-        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 = $("<span x-pass-thru='true'>");
+        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 + '</' + tag + '>',
-                    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 = $('<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);
+                }
+            })
+        }
+    }
 
 
-    
     $.wiki.VisualPerspective = VisualPerspective;
 
 })(jQuery);
     $.wiki.VisualPerspective = VisualPerspective;
 
 })(jQuery);