refactorization

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 8905d3e..6f4e089 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,8 +1,9 @@
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',

-'modules/documentCanvas/canvas/documentElement'
-], function($, _, documentElement) {
+'modules/documentCanvas/canvas/documentElement',
+'modules/documentCanvas/canvas/utils'
+], function($, _, documentElement, utils) {

     
 'use strict';
 
     
 'use strict';
 


@@ -24,78 +25,114 @@ $.extend(Canvas.prototype, {
                 if(currentTag.attr('wlxml-tag'))
                     return;
 
                 if(currentTag.attr('wlxml-tag'))
                     return;
 

-                var meta = {};
+                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;
                 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(),
                     klass: currentTag.attr('class'),
                 }
 
                 var element = documentElement.DocumentNodeElement.create({
                     tag: currentTag.prop('tagName').toLowerCase(),
                     klass: currentTag.attr('class'),

-                    meta: meta
+                    meta: meta,
+                    others: others,
+                    rawChildren: currentTag.contents()

                 });
 
                 });
 

-                element.dom().append(currentTag.contents());
-                ['orig-before', 'orig-append'].forEach(function(attr) {
+                ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {

                     element.data(attr, '');
                 });
                 return element.dom();
             });
 
                     element.data(attr, '');
                 });
                 return element.dom();
             });
 

+            var FIRST_CONTENT_INDEX = 0;
+
+            // @@ TODO - refactor!
+            var getNode = function(element) {
+                return element.children('[document-element-content]');
+            }
+

             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';
-                        
-                    var oldText = this.data,
-                        oldLength = this.data.length;
-                    var parent = el.parent(),
-                        parentContents = parent.contents(),
-                        idx = parentContents.index(this),
-                        next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
-
-                    var addInfo = function() {
-                        if(next) {
-                            $(next).data('orig-before', oldText);
-                        } else {
-                            parent.data('orig-append', oldText);
-                        }
+
+                    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  && getNode($(el.prev()[0])).attr('wlxml-tag') === 'span',
+                        hasSpanAfter = el.next().length > 0 && getNode($(el.next()[0])).attr('wlxml-tag') === 'span';
+
+                    if(el.parent().hasClass('canvas-widget'))
+                        return true; // continue
+
+                    var addInfo = function(toAdd, where) {
+                        var parentContents = elParent.contents(),
+                            idx = parentContents.index(el[0]),
+                            prev = idx > FIRST_CONTENT_INDEX ? parentContents[idx-1] : null,
+                            next = idx < parentContents.length - 1 ? parentContents[idx+1] : null,
+                            target, key;
+
+                        if(where === 'above') {
+                            target = prev ? $(prev) : elParent.parent();
+                            key = prev ? 'orig-after' : 'orig-begin';
+                        } else if(where === 'below') {
+                            target = next ? $(next) : elParent.parent();
+                            key = next ? 'orig-before' : 'orig-end';
+                        } else { throw new Object;}
+
+                        target.data(key, toAdd);

                     }
 
                     }
 

-                    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);
-                        var newText = (startSpace && (spanParent || spanBefore) ? ' ' : '')
-                                    + trimmed
-                                    + (endSpace && (spanParent || spanAfter) ? ' ' : '');
-                        if(newText !== oldText) {
-                            this.data = newText;
-                            addInfo();
-                        }
+                    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 {

+                        if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1)
+                            text.transformed = ' ';
+                    }

 
 

-                        this.data = $.trim(this.data);
-                        if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
-                            this.data = ' ';
-                        if(this.data.length === 0) {
-                            addInfo();
-                            el.remove();
+                    if(!text.transformed) {
+                        addInfo(text.original, 'below');
+                        el.remove();
+                        return true; // continue
+                    }

 
 

-                            return true; // continue
+                    if(text.transformed !== text.original) {
+                        if(!text.trimmed) {
+                            addInfo(text.original, 'below');
+                        } 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);
+                                addInfo(endingWhiteSpace, 'below');
+                            }
+
+                            if(startingWhiteSpace) {
+                                if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ')
+                                    startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1);
+                                addInfo(startingWhiteSpace, 'above');
+                            }

                         }
                     }
 
                         }
                     }
 

-                    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);


@@ -116,21 +153,106 @@ $.extend(Canvas.prototype, {
                         else if(position.offsetAtEnd)
                             newEmpty = elements.second;
                         if(newEmpty) {
                         else if(position.offsetAtEnd)
                             newEmpty = elements.second;
                         if(newEmpty) {

-                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: '\u200B'}, this));
+                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this));

                             canvas.setCurrentElement(goto);
                         }
                     }
                 }
             });
 
                             canvas.setCurrentElement(goto);
                         }
                     }
                 }
             });
 

+
+            var KEYS = {
+                ARROW_LEFT: 37,
+                ARROW_UP: 38,
+                ARROW_RIGHT: 39,
+                ARROW_DOWN: 40
+            }
+

             this.wrapper.on('keyup', function(e) {
             this.wrapper.on('keyup', function(e) {

-                if(e.which >= 37 && e.which <= 40)
-                    canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false})
+                if(e.which >= 37 && e.which <= 40) {
+                    var element = canvas.getCursor().getPosition().element,
+                        caretTo = false;
+                    if(!element) {
+                        // Chrome hack
+                        var direction;
+                        if(e.which === (KEYS.ARROW_LEFT  || KEYS.ARROW_DOWN)) {
+                            direction = 'above';
+                            caretTo = 'end';
+                        } else {
+                            direction = 'below';
+                            caretTo = 'start';
+                        }
+                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
+                    }
+                    canvas.setCurrentElement(element, {caretTo: caretTo});
+                }
+            });
+         
+            this.wrapper.on('keydown', function(e) {
+                if(e.which >= 37 && e.which <= 40) {
+                    var position = canvas.getCursor().getPosition(),
+                        element = position.element;
+                    if(element && (element instanceof documentElement.DocumentTextElement)) {
+                        if(element.isEmpty()) {
+                            var direction, caretTo;
+                            if(e.which === KEYS.ARROW_LEFT  || e.which === KEYS.ARROW_UP) {
+                                direction = 'above';
+                                caretTo = 'end';
+                            } else {
+                                direction = 'below';
+                                caretTo = 'start';
+                            }
+                            var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode))
+                            canvas.setCurrentElement(element, {caretTo: caretTo});
+                        } else {
+                            var txt = element.dom().contents()[0].data;
+                            if(e.which === KEYS.ARROW_LEFT && position.offset > 1 && txt.charAt(position.offset-2) === utils.unicode.ZWS) {
+                                e.preventDefault();
+                                canvas._moveCaretToTextElement(element, position.offset-2);
+                            }
+                            if(e.which === KEYS.ARROW_RIGHT && position.offset < txt.length - 1 && txt.charAt(position.offset+1) === utils.unicode.ZWS) {
+                                e.preventDefault();
+                                canvas._moveCaretToTextElement(element, position.offset+2);
+                            }
+                        }
+                    }
+
+
+                }

             });
 
             });
 

-            this.wrapper.on('click', '[wlxml-tag], [wlxml-text]', function(e) {
+            this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {

                 e.stopPropagation();
                 e.stopPropagation();

-                canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false});
+                canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+            });
+
+            var observer = new MutationObserver(function(mutations) {
+                mutations.forEach(function(mutation) {
+                    if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
+                        mutation.target.data = utils.unicode.ZWS;
+                });
+            });
+            var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
+            observer.observe(this.d[0], config);
+
+
+            this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
+                var el = canvas.getDocumentElement(e.currentTarget);
+                if(!el)
+                    return;
+                e.stopPropagation();
+                if(el instanceof documentElement.DocumentTextElement)
+                    el = el.parent();
+                el.toggleLabel(true);
+            });
+            this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
+                var el = canvas.getDocumentElement(e.currentTarget);
+                if(!el)
+                    return;
+                e.stopPropagation();
+                if(el instanceof documentElement.DocumentTextElement)
+                    el = el.parent();
+                el.toggleLabel(false);

             });
 
         } else {
             });
 
         } else {


@@ -199,19 +321,9 @@ $.extend(Canvas.prototype, {
 
     list: {},
 
 
     list: {},
 

-
-
-    highlightElement: function(element) {
-        this.wrapper.find('.highlighted-element').removeClass('highlighted-element');
-        element.dom().addClass('highlighted-element');
-    },
-
-    dimElement: function(element) {
-        element.dom().removeClass('highlighted-element');
-    },

     
     getCurrentNodeElement: function() {
     
     getCurrentNodeElement: function() {

-        return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+        return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);

     },
 
     getCurrentTextElement: function() {
     },
 
     getCurrentTextElement: function() {


@@ -239,7 +351,7 @@ $.extend(Canvas.prototype, {
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-node-element').removeClass('current-node-element')
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-node-element').removeClass('current-node-element')

-                element.dom().addClass('current-node-element');
+                element._container().addClass('current-node-element');

                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);
                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);


@@ -299,20 +411,9 @@ $.extend(Canvas.prototype, {
     },
 
     toXML: function() {
     },
 
     toXML: function() {

-        var d = function(element, parent, level) {
-            console.log(element.getText ? 'text: ' + element.getText() : 'node: ' + element.getWlxmlTag());
-            var isElementNode = element instanceof documentElement.DocumentNodeElement;
-            parent.prepend(element.toXML(level));
-            if(isElementNode) {
-                var dom = $(parent.children()[0]),
-                    elementChildren = element.children();
-                for(var i = elementChildren.length - 1; i >= 0; i--) {
-                    d(elementChildren[i], dom, level + 1);
-                }
-            }
-        }
-        var parent = $('<div>');
-        d(this.doc(), parent, 0);
+        var parent = $('<div>'),
+            parts = this.doc().toXML(0);
+        parent.append(parts);

         return parent.html();
     }
 });
         return parent.html();
     }
 });