Custom names for wlxml tags/classes - first approach

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 2b42a22..cfdac5d 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -3,8 +3,9 @@ define([
 'libs/underscore-min',
 'modules/documentCanvas/classAttributes',
 'modules/documentCanvas/canvas/utils',
 'libs/underscore-min',
 'modules/documentCanvas/classAttributes',
 'modules/documentCanvas/canvas/utils',

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

     
 'use strict';
 
     
 'use strict';
 


@@ -45,6 +46,9 @@ $.extend(DocumentElement.prototype, {
     _setupDOMHandler: function(htmlElement) {
         this.$element = $(htmlElement);
     },
     _setupDOMHandler: function(htmlElement) {
         this.$element = $(htmlElement);
     },

+    bound: function() {
+        return this.canvas !== undefined;
+    },

     dom: function() {
         return this.$element;
     },
     dom: function() {
         return this.$element;
     },


@@ -79,6 +83,7 @@ $.extend(DocumentElement.prototype, {
     detach: function() {
         this.dom().detach();
         this.canvas = null;
     detach: function() {
         this.dom().detach();
         this.canvas = null;

+        return this;

     },
 
     markAsCurrent: function() {
     },
 
     markAsCurrent: function() {


@@ -113,16 +118,8 @@ var DocumentNodeElement = function(htmlElement, canvas) {
     DocumentElement.call(this, htmlElement, canvas);
 };
 
     DocumentElement.call(this, htmlElement, canvas);
 };
 

-var getDisplayStyle = function(tag, klass) {
-    if(tag === 'metadata')
-        return 'none';
-    if(tag === 'span')
-        return 'inline';
-    return 'block';
-}
-

 $.extend(DocumentNodeElement, {
 $.extend(DocumentNodeElement, {

-    createDOM: function(params) {
+    createDOM: function(params, canvas) {

         var dom = $('<div>')
                 .attr('document-node-element', ''),
             widgetsContainer = $('<div>')
         var dom = $('<div>')
                 .attr('document-node-element', ''),
             widgetsContainer = $('<div>')


@@ -135,7 +132,7 @@ $.extend(DocumentNodeElement, {
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
 
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
 

-        var element = this.fromHTMLElement(dom[0]);
+        var element = this.fromHTMLElement(dom[0], canvas);

 
         element.setWlxmlTag(params.tag);
         if(params.klass)
 
         element.setWlxmlTag(params.tag);
         if(params.klass)


@@ -146,7 +143,7 @@ $.extend(DocumentNodeElement, {
             });
         }
         element.data('other-attrs', params.others);
             });
         }
         element.data('other-attrs', params.others);

-        widgetsContainer.append(widgets.labelWidget(params.tag, params.klass));
+

         if(params.rawChildren) {
             container.append(params.rawChildren);
         }
         if(params.rawChildren) {
             container.append(params.rawChildren);
         }


@@ -154,7 +151,7 @@ $.extend(DocumentNodeElement, {
     },
 
     create: function(params, canvas) {
     },
 
     create: function(params, canvas) {

-        return this.fromHTMLElement(this.createDOM(params)[0]);
+        return this.fromHTMLElement(this.createDOM(params, canvas)[0], canvas);

     },
 
     fromHTMLElement: function(htmlElement, canvas) {
     },
 
     fromHTMLElement: function(htmlElement, canvas) {


@@ -169,7 +166,7 @@ var manipulate = function(e, params, action) {
     } else {
         element = DocumentElement.create(params);
     }
     } else {
         element = DocumentElement.create(params);
     }

-    var target = action === 'append' ? e._container() : e.dom();
+    var target = (action === 'append' || action === 'prepend') ? e._container() : e.dom();

     target[action](element.dom());
     return element;
 };
     target[action](element.dom());
     return element;
 };


@@ -261,6 +258,9 @@ $.extend(DocumentNodeElement.prototype, {
             this.data('orig-end', undefined);
         return manipulate(this, params, 'append');
     },
             this.data('orig-end', undefined);
         return manipulate(this, params, 'append');
     },

+    prepend: function(params) {
+        return manipulate(this, params, 'prepend');
+    },

     before: function(params) {
         return manipulate(this, params, 'before');
 
     before: function(params) {
         return manipulate(this, params, 'before');
 


@@ -305,8 +305,11 @@ $.extend(DocumentNodeElement.prototype, {
         return this._container().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {
         return this._container().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {

+        if(tag === this.getWlxmlTag())
+            return;
+

         this._container().attr('wlxml-tag', tag);
         this._container().attr('wlxml-tag', tag);

-        this._updateDisplayStyle();
+        this._updateWlxmlManager();

     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');


@@ -315,6 +318,9 @@ $.extend(DocumentNodeElement.prototype, {
         return undefined;
     },
     setWlxmlClass: function(klass) {
         return undefined;
     },
     setWlxmlClass: function(klass) {

+        if(klass === this.getWlxmlClass())
+            return;
+

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


@@ -324,12 +330,12 @@ $.extend(DocumentNodeElement.prototype, {
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
             this._container().removeAttr('wlxml-class');
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
             this._container().removeAttr('wlxml-class');

-        this._updateDisplayStyle();
+        this._updateWlxmlManager();

     },
     },

-    _updateDisplayStyle: function() {
-        var displayStyle = getDisplayStyle(this.getWlxmlTag(), this.getWlxmlClass());
-        this.dom().css('display', displayStyle);
-        this._container().css('display', displayStyle);
+    _updateWlxmlManager: function() {
+        var manager = wlxmlManagers.getFor(this);
+        this.data('_wlxmlManager', manager);
+        manager.setup();

     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass()))
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass()))


@@ -363,6 +369,13 @@ $.extend(DocumentNodeElement.prototype, {
 
     toggleHighlight: function(toogle) {
         this._container().toggleClass('highlighted-element');
 
     toggleHighlight: function(toogle) {
         this._container().toggleClass('highlighted-element');

+    },
+
+    toggle: function(toggle) {
+        var mng = this.data('_wlxmlManager');
+        if(mng) {
+            mng.toggle(toggle);
+        }

     }
 });
 
     }
 });
 


@@ -421,7 +434,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {

-            element = DocumentNodeElement.create(params);
+            element = DocumentNodeElement.create(params, this.canvas);

         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());
         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());


@@ -435,7 +448,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {

-            element = DocumentNodeElement.create(params);
+            element = DocumentNodeElement.create(params, this.canvas);

         }
         this.dom().wrap('<div>');
         this.dom().parent().before(element.dom());
         }
         this.dom().wrap('<div>');
         this.dom().parent().before(element.dom());


@@ -466,6 +479,10 @@ $.extend(DocumentTextElement.prototype, {
                     idx = grandParent.childIndex(parent),
                     prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
                     next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
                     idx = grandParent.childIndex(parent),
                     prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
                     next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;

+                
+                prev = (prev instanceof DocumentTextElement) ? prev : null;
+                next = (next instanceof DocumentTextElement) ? next : null;
+

                 if(prev && next) {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();
                 if(prev && next) {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();