Refactoring: Moving commands out of canvasManager

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index aa3fd9b..230e987 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -1,7 +1,8 @@
 define([
 'libs/jquery-1.9.1.min',
 define([
 'libs/jquery-1.9.1.min',

-'libs/underscore-min'
-], function($, _) {
+'libs/underscore-min',
+'modules/documentCanvas/classAttributes'
+], function($, _, classAttributes) {

     
 'use strict';
 
     
 'use strict';
 


@@ -116,6 +117,11 @@ $.extend(DocumentNodeElement, {
             .attr('wlxml-tag', params.tag);
         if(params.klass)
             dom.attr('wlxml-class', params.klass.replace(/\./g, '-'));
             .attr('wlxml-tag', params.tag);
         if(params.klass)
             dom.attr('wlxml-class', params.klass.replace(/\./g, '-'));

+        if(params.meta) {
+            _.keys(params.meta).forEach(function(key) {
+                dom.attr('wlxml-meta-'+key, params.meta[key]);
+            });
+        }

         return dom;
     },
 
         return dom;
     },
 


@@ -143,14 +149,14 @@ DocumentNodeElement.prototype = new DocumentElement();
 
 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {
 
 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {

-        manipulate(this, params, 'append');
+        return manipulate(this, params, 'append');

     },
     before: function(params) {
     },
     before: function(params) {

-        manipulate(this, params, 'before');
+        return manipulate(this, params, 'before');

 
     },
     after: function(params) {
 
     },
     after: function(params) {

-        manipulate(this, params, 'after');
+        return manipulate(this, params, 'after');

     },
     children: function() {
         var toret = [];
     },
     children: function() {
         var toret = [];


@@ -192,12 +198,17 @@ $.extend(DocumentNodeElement.prototype, {
     getWlxmlClass: function() {
         var klass = this.dom().attr('wlxml-class');
         if(klass)
     getWlxmlClass: function() {
         var klass = this.dom().attr('wlxml-class');
         if(klass)

-            return klass.replace('-', '.');
+            return klass.replace(/-/g, '.');

         return undefined;
     },
     setWlxmlClass: function(klass) {
         return undefined;
     },
     setWlxmlClass: function(klass) {

+        this.getWlxmlMetaAttrs().forEach(function(attr) {
+            if(!classAttributes.hasMetaAttr(klass, attr.name))
+                this.dom().removeAttr('wlxml-meta-' + attr.name);
+        }, this);
+

         if(klass)
         if(klass)

-            this.dom().attr('wlxml-class', klass);
+            this.dom().attr('wlxml-class', klass.replace(/\./g, '-'));

         else
             this.dom().removeAttr('wlxml-class');
     },
         else
             this.dom().removeAttr('wlxml-class');
     },


@@ -205,6 +216,22 @@ $.extend(DocumentNodeElement.prototype, {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class')))
             return true;
         return false;
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class')))
             return true;
         return false;

+    },
+
+
+    getWlxmlMetaAttr: function(attr) {
+        return this.dom().attr('wlxml-meta-'+attr);
+    },
+    getWlxmlMetaAttrs: function() {
+        var toret = [];
+        var attrList = classAttributes.getMetaAttrsList(this.getWlxmlClass());
+        attrList.all.forEach(function(attr) {
+            toret.push({name: attr.name, value: this.getWlxmlMetaAttr(attr.name) || ''});
+        }, this);
+        return toret;
+    },
+    setWlxmlMetaAttr: function(attr, value) {
+        this.dom().attr('wlxml-meta-'+attr, value);

     }
 });
 
     }
 });
 


@@ -288,8 +315,10 @@ $.extend(DocumentTextElement.prototype, {
         }
     },
     unwrap: function() {
         }
     },
     unwrap: function() {

-        var parent = this.parent();
+        var parent = this.parent(),
+            toret;

         if(parent.children().length === 1) {
         if(parent.children().length === 1) {

+            toret = parent.parent();

             var grandParent = parent.parent();
             if(grandParent) {
                 var grandParentChildren = grandParent.children(),
             var grandParent = parent.parent();
             if(grandParent) {
                 var grandParentChildren = grandParent.children(),


@@ -309,6 +338,7 @@ $.extend(DocumentTextElement.prototype, {
                 parent.after(this);
             }
             parent.detach();
                 parent.after(this);
             }
             parent.detach();

+            return toret;

         }
     },
     split: function(params) {
         }
     },
     split: function(params) {