X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5145fc38a6bf044367f4d96197dd3d47e05b6266..0bbec0dc1ee08f4855b030189a4025994150b38c:/src/editor/modules/documentCanvas/canvas/genericElement.js?ds=inline

diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index e769ee8..b4a4ce5 100644
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -5,7 +5,6 @@ define(function(require) {
 var $ = require('libs/jquery'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
-    utils = require('./utils'),
     CommentsView = require('./comments/comments');
 
 
@@ -20,12 +19,10 @@ $.extend(generic, {
             .attr('wlxml-tag', this.wlxmlNode.getTagName())
             .attr('wlxml-class', this.wlxmlNode.getClass().replace(/\./g, '-'));
 
-        this.wlxmlNode.contents().forEach(function(node) {
-            var el = this.canvas.createElement(node);
-            if(el.dom) {
-                this._container().append(el.dom);
-            }
-        }.bind(this));
+        this.container = this.createContainer(this.wlxmlNode.contents(), {
+            manages: function(node) { return !node.isInside('comment'); },
+            dom: this._container()
+        });
 
         this.commentsView = new CommentsView(this.wlxmlNode, this.canvas.metadata.user);
         this.addToGutter(this.commentsView);
@@ -40,7 +37,7 @@ $.extend(generic, {
     },
     
     refresh: function() {
-        if(this.wlxmlNode.getTagName() === 'span') {
+        if(this.wlxmlNode.getTagName() === 'span' || this.wlxmlNode.getTagName() === 'aside') {
             if(this.containsBlock()) {
                 this.displayAsBlock();
             } else {
@@ -52,176 +49,59 @@ $.extend(generic, {
     },
 
     getFirst: function(e1, e2) {
-        var idx1 = this.childIndex(e1),
-            idx2 = this.childIndex(e2);
-        if(e1 === null || e2 === null) {
-            return undefined;
-        }
-        return idx1 <= idx2 ? e1: e2;
+        return this.container.getFirst(e1, e2);
     },
 
-    children: function() {
-        var element = this,
-            toret = [];
-        this._container().contents().each(function() {
-            var childElement = element.canvas.getDocumentElement(this);
-            if(childElement === undefined) {
-                return true;
-            }
+    containsBlock: function() {
+        return this.container.containsBlock();
+    },
 
-            toret.push(childElement);
-        });
-        return toret;
+    children: function() {
+        return this.container.children();
     },
 
     getVerticallyFirstTextElement: function(params) {
-        var toret;
-        
-        params = _.extend({
-            considerChildren: true
-        }, params);
-        
-        this.children().some(function(child) {
-            if(child instanceof documentElement.DocumentTextElement) {
-                toret = child;
-                return true; // break
-            } else if(params.considerChildren) {
-                toret = child.getVerticallyFirstTextElement();
-                if(toret) {
-                    return true; // break
-                }
-            }
-        });
-        return toret;
+        return this.container.getVerticallyFirstTextElement(params);
     },
 
     onNodeAdded: function(event) {
-        if(event.meta.node.isRoot()) {
-            this.canvas.reloadRoot();
-            return;
-        }
-
-        var ptr = event.meta.node.prev(),
-            referenceElement, referenceAction, actionArg;
-            
-        while(ptr && !(referenceElement = utils.getElementForElementRootNode(ptr))) {
-            ptr = ptr.prev();
-        }
-
-        if(referenceElement) {
-            referenceAction = 'after';
-        } else {
-            referenceElement = this;
-            referenceAction = 'prepend';
-        }
-      
-        if(event.meta.move) {
-            /* Let's check if this node had its own canvas element and it's accessible. */
-            actionArg = utils.getElementForElementRootNode(event.meta.node);
-        }
-        if(!actionArg) {
-            actionArg = event.meta.node;
-        }
-
-        referenceElement[referenceAction](actionArg);
-
         if(event.meta.node.is('comment')) {
             this.commentTip.show();
             this.commentsView.render();
         }
     },
+
     onNodeDetached: function(event) {
         var isComment = event.meta.node.is('comment');
         if(event.meta.node.sameNode(this)) {
+            // defacto jestesmy rootem?
             this.detach();
         } else {
-            this.children().some(function(child) {
-                if(child.wlxmlNode.sameNode(event.meta.node)) {
-                    child.detach();
-                    return true;
-                }
-            });
             if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
                 this.commentTip.hide();
             }
             this.commentsView.render();
         }
     },
+
     onNodeTextChange: function(event) {
-        var node = event.meta.node,
-            toSet = node.getText(),
-            handled;
-        
-        handled = this.children().some(function(child) {
-            if(child.wlxmlNode.sameNode(node)) {
-                if(toSet === '') {
-                    toSet = utils.unicode.ZWS;
-                }
-                if(toSet !== child.getText()) {
-                    child.setText(toSet);
-                }
-                return true;
-            }
-        });
+        var node = event.meta.node;
 
-        if(!handled && node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
+        /* TODO: This handling of changes to the comments should probably be implemented via separate,
+        non-rendering comments element */
+        if(node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
             this.commentsView.render();
         }
     },
 
     onStateChange: function(changes) {
-        if(_.isBoolean(changes.exposed) && !this.isSpan()) {
+        var isSpan = this.wlxmlNode.getTagName() === 'span';
+        if(_.isBoolean(changes.exposed) && !isSpan) {
             this._container().toggleClass('highlighted-element', changes.exposed);
         }
-        if(_.isBoolean(changes.active) && !this.isSpan()) {
+        if(_.isBoolean(changes.active) && !isSpan) {
             this._container().toggleClass('current-node-element', changes.active);
         }
-    },
-
-    ///
-
-    isSpan: function() {
-        return this.wlxmlNode.getTagName() === 'span';
-    },
-    
-    containsBlock: function() {
-        return this.children()
-            .filter(function(child) {
-                return child instanceof documentElement.DocumentNodeElement;
-            })
-            .some(function(child) {
-                if(child.isBlock()) {
-                    return true;
-                } else {
-                    return child.containsBlock();
-                }
-            });
-    },
-
-    prepend: function(param) {
-        var element;
-        if(param instanceof documentElement.DocumentElement) {
-            element = param;
-        } else {
-            element = this.canvas.createElement(param);
-        }
-        if(element.dom) {
-            this._container().prepend(element.dom);
-            this.refreshPath();
-        }
-        return element;
-    },
-
-    childIndex: function(child) {
-        var children = this.children(),
-            toret = null;
-        children.forEach(function(c, idx) {
-            if(c.sameNode(child)) {
-                toret = idx;
-                return false;
-            }
-        });
-        return toret;
     }
 });