Fix: escaping html in familyTree properly

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

diff --git a/modules/documentCanvas/canvasNode.js b/modules/documentCanvas/canvasNode.js
index a57c10a..72343a4 100644 (file)
--- a/modules/documentCanvas/canvasNode.js
+++ b/modules/documentCanvas/canvasNode.js
@@ -1,8 +1,14 @@
-define(['libs/jquery-1.9.1.min', 'libs/underscore-min'], function($, _) {
+define([
+'libs/jquery-1.9.1.min',
+'libs/underscore-min',
+'modules/documentCanvas/classAttributes'
+], function($, _, classAttributes) {

 
 'use strict';
 
 
 
 'use strict';
 
 

+
+

 var tagSelector = '[wlxml-tag]';
 
 var CanvasNode = function(desc) {
 var tagSelector = '[wlxml-tag]';
 
 var CanvasNode = function(desc) {


@@ -22,7 +28,9 @@ var CanvasNode = function(desc) {
             this.dom.text(desc.content);
         if(desc.meta) {
             var c = this;
             this.dom.text(desc.content);
         if(desc.meta) {
             var c = this;

-            _.keys(desc.meta).forEach(function(key) {
+            _.keys(desc.meta)
+            .filter(function(key) {return classAttributes.hasMetaAttr(c.getClass(), key);})
+            .forEach(function(key) {

                 c.dom.attr('wlxml-meta-'+key, desc.meta[key]);
             });
         }
                 c.dom.attr('wlxml-meta-'+key, desc.meta[key]);
             });
         }


@@ -38,6 +46,17 @@ CanvasNode.prototype.getClass = function() {
     return this.dom.attr('wlxml-class');
 };
 
     return this.dom.attr('wlxml-class');
 };
 

+CanvasNode.prototype.setClass = function(klass) {
+    if(klass != this.getClass()) {
+        var c = this;
+        this.getMetaAttrs().forEach(function(attr) {
+            if(!classAttributes.hasMetaAttr(klass, attr.name))
+                c.dom.removeAttr('wlxml-meta-' + attr.name);
+        });
+        this.dom.attr('wlxml-class', klass);
+    }
+};
+

 CanvasNode.prototype.getId = function() {
     return this.dom.attr('id');
 };
 CanvasNode.prototype.getId = function() {
     return this.dom.attr('id');
 };


@@ -91,13 +110,13 @@ CanvasNode.prototype.getMetaAttrs = function() {
     var toret = [];
     var metaAttrPrefix = 'wlxml-meta-';
 
     var toret = [];
     var metaAttrPrefix = 'wlxml-meta-';
 

-    var attrs = this.dom.get(0).attributes;
-    for(var i = 0; i < attrs.length; i++) {
-        var attr = attrs[i];
-        if(attr.name.substr(0, metaAttrPrefix.length) === metaAttrPrefix) {
-            toret.push({name: attr.name.substr(metaAttrPrefix.length), value: attr.value});    
-        }
-    }
+    var attrList = classAttributes.getMetaAttrsList(this.getClass());
+    var c = this;
+    attrList.all.forEach(function(attr) {
+        toret.push({name: attr.name, value: c.getMetaAttr(attr.name) || ''});  
+    });
+
+

     return toret;
 };
 
     return toret;
 };