Refactoring

[fnpeditor.git] / modules / documentCanvas / canvas / canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 3f6599a..19c2a3f 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -23,47 +23,100 @@ $.extend(Canvas.prototype, {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;

-                var element = documentElement.DocumentNodeElement.createDOM({
+
+                var meta = {}, others = {};
+                for(var i = 0; i < this.attributes.length; i++) {
+                    var attr = this.attributes[i];
+                    if(attr.name.substr(0, 5) === 'meta-')
+                        meta[attr.name.substr(5)] = attr.value;
+                    else if(attr.name !== 'class')
+                        others[attr.name] = attr.value;
+                }
+
+                var element = documentElement.DocumentNodeElement.create({

                     tag: currentTag.prop('tagName').toLowerCase(),
                     tag: currentTag.prop('tagName').toLowerCase(),

-                    klass: currentTag.attr('class')
+                    klass: currentTag.attr('class'),
+                    meta: meta,
+                    others: others

                 });
 
                 });
 

-                element.append(currentTag.contents());
-                return element;
+                element.dom().append(currentTag.contents());
+                ['orig-before', 'orig-append'].forEach(function(attr) {
+                    element.data(attr, ['']);
+                });
+                return element.dom();

             });
 
             this.wrapper.find(':not(iframe)').addBack().contents()
                 .filter(function() {return this.nodeType === Node.TEXT_NODE})
                 .each(function() {
             });
 
             this.wrapper.find(':not(iframe)').addBack().contents()
                 .filter(function() {return this.nodeType === Node.TEXT_NODE})
                 .each(function() {

-
-                    var el = $(this);
-                    

                     // TODO: use DocumentElement API
                     // TODO: use DocumentElement API

-                    var spanParent = el.parent().attr('wlxml-tag') === 'span',
-                        spanBefore = el.prev().length > 0  && $(el.prev()[0]).attr('wlxml-tag') === 'span',
-                        spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
-                        
-                    if(spanParent || spanBefore || spanAfter) {
-                        var startSpace = /\s/g.test(this.data.substr(0,1));
-                        var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1;
-                        var trimmed = $.trim(this.data);
-                        this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '')
-                                    + trimmed
-                                    + (endSpace && (spanParent || spanAfter) ? ' ' : '');

 
 

+                    var el = $(this),
+                        text = {original: el.text(), trimmed: $.trim(el.text())},
+                        elParent = el.parent(),
+                        hasSpanParent = elParent.attr('wlxml-tag') === 'span',
+                        hasSpanBefore = el.prev().length > 0  && $(el.prev()[0]).attr('wlxml-tag') === 'span',
+                        hasSpanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
+
+
+                    var addInfo = function(toAdd) {
+                        var parentContents = elParent.contents(),
+                            idx = parentContents.index(el[0]),
+                            next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
+                        if(next) {
+                            $(next).data('orig-before', toAdd);
+                        } else {
+                            elParent.data('orig-append', toAdd);
+                        }
+                    }
+
+                    text.transformed = text.trimmed;
+                    
+                    if(hasSpanParent || hasSpanBefore || hasSpanAfter) {
+                        var startSpace = /\s/g.test(text.original.substr(0,1)),
+                            endSpace = /\s/g.test(text.original.substr(-1)) && text.original.length > 1;
+                        text.transformed = (startSpace && (hasSpanParent || hasSpanBefore) ? ' ' : '')
+                                    + text.trimmed
+                                    + (endSpace && (hasSpanParent || hasSpanAfter) ? ' ' : '');

                     } else {
                     } else {

-                        var oldLength = this.data.length;
-                        this.data = $.trim(this.data);
-                        if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
-                            this.data = ' ';
-                        if(this.data.length === 0) {
-                            $(this).remove();
-                            return true; // continue
+                        if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1)
+                            text.transformed = ' ';
+                    }
+
+                    if(!text.transformed) {
+                        addInfo([text.original]);
+                        el.remove();
+                        return true; // continue
+                    }
+
+                    if(text.transformed !== text.original) {
+                        var toAdd = [];
+                        if(!text.trimmed) {
+                            toAdd.push(text.original);
+                        } else {
+                            var startingMatch = text.original.match(/^\s+/g),
+                                endingMatch = text.original.match(/\s+$/g),
+                                startingWhiteSpace = startingMatch ? startingMatch[0] : null,
+                                endingWhiteSpace = endingMatch ? endingMatch[0] : null;
+
+                            if(endingWhiteSpace) {
+                                if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ')
+                                    endingWhiteSpace = endingWhiteSpace.substr(1);
+                                toAdd.push(endingWhiteSpace);
+                            }
+
+                            if(startingWhiteSpace) {
+                                if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ')
+                                    startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1);
+                                toAdd.push(startingWhiteSpace);
+                            }

                         }
                         }

+                        addInfo(toAdd);

                     }
 
                     }
 

-                    var element = documentElement.DocumentTextElement.create({text: this.data});
-                    $(this).replaceWith(element.dom());
+                    var element = documentElement.DocumentTextElement.create({text: text.transformed});
+                    el.replaceWith(element.dom());

                 });
             
             this.d = this.wrapper.children(0);
                 });
             
             this.d = this.wrapper.children(0);


@@ -74,8 +127,19 @@ $.extend(Canvas.prototype, {
                     e.preventDefault();
                     var cursor = canvas.getCursor();
                     if(!cursor.isSelecting()) {
                     e.preventDefault();
                     var cursor = canvas.getCursor();
                     if(!cursor.isSelecting()) {

-                        var position = cursor.getPosition();
-                        position.element.split({offset: position.offset});
+                        var position = cursor.getPosition(),
+                            elements = position.element.split({offset: position.offset}),
+                            newEmpty,
+                            goto;
+
+                        if(position.offsetAtBeginning)
+                            newEmpty = elements.first;
+                        else if(position.offsetAtEnd)
+                            newEmpty = elements.second;
+                        if(newEmpty) {
+                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: '\u200B'}, this));
+                            canvas.setCurrentElement(goto);
+                        }

                     }
                 }
             });
                     }
                 }
             });


@@ -216,7 +280,7 @@ $.extend(Canvas.prototype, {
             if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element))
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             if(!(textElementToLand.sameNode(currentTextElement)))
             if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element))
                 this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
             if(!(textElementToLand.sameNode(currentTextElement)))

-                this.publisher('currentTextElementSet', element);
+                this.publisher('currentTextElementSet', textElementToLand);

         } else {
             document.getSelection().removeAllRanges();
         }
         } else {
             document.getSelection().removeAllRanges();
         }


@@ -253,6 +317,13 @@ $.extend(Canvas.prototype, {
     setCursorPosition: function(position) {
         if(position.element)
             this._moveCaretToTextElement(position.element, position.offset);
     setCursorPosition: function(position) {
         if(position.element)
             this._moveCaretToTextElement(position.element, position.offset);

+    },
+
+    toXML: function() {
+        var parent = $('<div>'),
+            parts = this.doc().toXML(0);
+        parent.append(parts);
+        return parent.html();

     }
 });
 
     }
 });
 


@@ -414,6 +485,9 @@ $.extend(Cursor.prototype, {
     getSelectionAnchor: function() {
         return this.getSelectionBoundry('anchor');
     },
     getSelectionAnchor: function() {
         return this.getSelectionBoundry('anchor');
     },

+    getSelectionFocus: function() {
+        return this.getSelectionBoundry('focus');
+    },

     getSelectionBoundry: function(which) {
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
     getSelectionBoundry: function(which) {
         var selection = window.getSelection(),
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),


@@ -425,7 +499,17 @@ $.extend(Cursor.prototype, {
         if(which === 'anchor') {
             return {
                 element: anchorElement,
         if(which === 'anchor') {
             return {
                 element: anchorElement,

-                offset: selection.anchorOffset
+                offset: selection.anchorOffset,
+                offsetAtBeginning: selection.anchorOffset === 0,
+                offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+            };
+        }
+        if(which === 'focus') {
+            return {
+                element: focusElement,
+                offset: selection.focusOffset,
+                offsetAtBeginning: selection.focusOffset === 0,
+                offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset

             };
         }
         
             };
         }
         


@@ -455,7 +539,7 @@ $.extend(Cursor.prototype, {
                 }
             }
         } else {
                 }
             }
         } else {

-            // TODO: Handle order
+            // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition

             if(which === 'start') {
                 element = anchorElement;
                 offset = selection.anchorOffset
             if(which === 'start') {
                 element = anchorElement;
                 offset = selection.anchorOffset


@@ -467,7 +551,9 @@ $.extend(Cursor.prototype, {
 
         return {
             element: element,
 
         return {
             element: element,

-            offset: offset
+            offset: offset,
+            offsetAtBeginning: offset === 0,
+            offsetAtEnd: element.getText().length === offset

         }
     }
 })
         }
     }
 })