Fix: escaping html in familyTree properly

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index d2d3a64..0309136 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -52,6 +52,16 @@ $.extend(DocumentElement.prototype, {
         return null;
     },
 
+    parents: function() {
+        var parents = [],
+            parent = this.parent();
+        while(parent) {
+            parents.push(parent);
+            parent = parent.parent();
+        }
+        return parents;
+    },
+
     sameNode: function(other) {
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
@@ -66,6 +76,31 @@ $.extend(DocumentElement.prototype, {
     detach: function() {
         this.dom().detach();
         this.canvas = null;
+    },
+
+    markAsCurrent: function() {
+        this.canvas.markAsCurrent(this);
+    },
+
+    getVerticallyFirstTextElement: function() {
+        var toret;
+        this.children().some(function(child) {
+            if(!child.isVisible())
+                return false; // continue
+            if(child instanceof DocumentTextElement) {
+                toret = child;
+                return true; // break
+            } else {
+                toret = child.getVerticallyFirstTextElement();
+                if(toret)
+                    return true; // break
+            }
+        });
+        return toret;
+    },
+
+    isVisible: function() {
+        return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';
     }
 });
 
@@ -77,9 +112,10 @@ var DocumentNodeElement = function(htmlElement, canvas) {
 
 $.extend(DocumentNodeElement, {
     createDOM: function(params) {
-        var dom = $('<div>').attr('wlxml-tag', params.tag);
+        var dom = $('<div>')
+            .attr('wlxml-tag', params.tag);
         if(params.klass)
-            dom.attr('wlxml-class', params.klass);
+            dom.attr('wlxml-class', params.klass.replace(/\./g, '-'));
         return dom;
     },
 
@@ -107,14 +143,14 @@ DocumentNodeElement.prototype = new DocumentElement();
 
 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {
-        manipulate(this, params, 'append');
+        return manipulate(this, params, 'append');
     },
     before: function(params) {
-        manipulate(this, params, 'before');
+        return manipulate(this, params, 'before');
 
     },
     after: function(params) {
-        manipulate(this, params, 'after');
+        return manipulate(this, params, 'after');
     },
     children: function() {
         var toret = [];
@@ -305,7 +341,9 @@ $.extend(DocumentTextElement.prototype, {
         succeedingChildren.forEach(function(child) {
             newElement.append(child);
         });
-    }
+
+        return {first: parentElement, second: newElement};
+    },
 });
 
 return {