FIX: white-space: pre-wrap prevents collapsing spaces in document-text-element

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 425978f..4a236df 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -2,8 +2,10 @@ define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 'modules/documentCanvas/classAttributes',
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 'modules/documentCanvas/classAttributes',

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

     
 'use strict';
 
     
 'use strict';
 


@@ -32,9 +34,9 @@ $.extend(DocumentElement, {
 
     fromHTMLElement: function(htmlElement, canvas) {
         var $element = $(htmlElement);
 
     fromHTMLElement: function(htmlElement, canvas) {
         var $element = $(htmlElement);

-        if(htmlElement.nodeType === Node.ELEMENT_NODE && $element.attr('wlxml-tag'))
+        if(htmlElement.nodeType === Node.ELEMENT_NODE && $element.attr('document-node-element') !== undefined)

             return DocumentNodeElement.fromHTMLElement(htmlElement, canvas);
             return DocumentNodeElement.fromHTMLElement(htmlElement, canvas);

-        if($element.attr('wlxml-text') !== undefined || (htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('wlxml-text') !== undefined))
+        if($element.attr('document-text-element') !== undefined || (htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('document-text-element') !== undefined))

             return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
         return undefined;
     }
             return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
         return undefined;
     }


@@ -44,11 +46,14 @@ $.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;
     },
     parent: function() {
     dom: function() {
         return this.$element;
     },
     parent: function() {

-        var parents = this.$element.parents('[wlxml-tag]');
+        var parents = this.$element.parents('[document-node-element]');

         if(parents.length)
             return DocumentElement.fromHTMLElement(parents[0], this.canvas);
         return null;
         if(parents.length)
             return DocumentElement.fromHTMLElement(parents[0], this.canvas);
         return null;


@@ -75,11 +80,6 @@ $.extend(DocumentElement.prototype, {
         return wrapper;
     },
 
         return wrapper;
     },
 

-    detach: function() {
-        this.dom().detach();
-        this.canvas = null;
-    },
-

     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },


@@ -113,30 +113,39 @@ var DocumentNodeElement = function(htmlElement, canvas) {
 };
 
 $.extend(DocumentNodeElement, {
 };
 
 $.extend(DocumentNodeElement, {

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

         var dom = $('<div>')
         var dom = $('<div>')

-            .attr('wlxml-tag', params.tag);
+                .attr('document-node-element', ''),
+            widgetsContainer = $('<div>')
+                .addClass('canvas-widgets')
+                .attr('contenteditable', false),
+            container = $('<div>')
+                .attr('document-element-content', '');
+        
+        dom.append(widgetsContainer, container);
+        // Make sure widgets aren't navigable with arrow keys
+        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
+
+        var element = this.fromHTMLElement(dom[0], canvas);
+
+        element.setWlxmlTag(params.tag);

         if(params.klass)
         if(params.klass)

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

         if(params.meta) {
             _.keys(params.meta).forEach(function(key) {
         if(params.meta) {
             _.keys(params.meta).forEach(function(key) {

-                dom.attr('wlxml-meta-'+key, params.meta[key]);
+                element.setWlxmlMetaAttr(key, params.meta[key]);

             });
         }
             });
         }

-        dom.data('other-attrs', params.others);
+        element.data('other-attrs', params.others);

 
 

-        var widgets = $('<div class="canvas-widgets" contenteditable="false">');
-        widgets.append($('<span class="canvas-widget canvas-widget-label">').text(params.tag + (params.klass ? ' / ' + params.klass : '')));
-        dom.append(widgets);
-
-        // Make sure widgets aren't navigable with arrow keys
-        widgets.find('*').add(widgets).attr('tabindex', -1);
-        
+        if(params.rawChildren) {
+            container.append(params.rawChildren);
+        }

         return dom;
     },
 
     create: function(params, canvas) {
         return dom;
     },
 
     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) {


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

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

     return element;
 };
 
     return element;
 };
 


@@ -159,6 +169,27 @@ DocumentNodeElement.prototype = new DocumentElement();
 
 
 $.extend(DocumentNodeElement.prototype, {
 
 
 $.extend(DocumentNodeElement.prototype, {

+    _container: function() {
+        return this.dom().children('[document-element-content]');
+    },
+    detach: function() {
+        var parent = this.parent();
+        if(!parent)
+            return;
+
+        var parentChildren = parent.children(),
+            myIdx = parent.childIndex(this);
+
+        if(myIdx > 0 && myIdx < parentChildren.length) {
+            if((parentChildren[myIdx-1] instanceof DocumentTextElement) && (parentChildren[myIdx+1] instanceof DocumentTextElement)) {
+                parentChildren[myIdx-1].appendText(parentChildren[myIdx+1].getText());
+                parentChildren[myIdx+1].detach();
+            }
+        }
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },

     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);
     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);


@@ -239,6 +270,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');
 


@@ -252,13 +286,13 @@ $.extend(DocumentNodeElement.prototype, {
             return toret;
 
 
             return toret;
 
 

-        var elementContent = this.dom().contents();
+        var elementContent = this._container().contents();

         var element = this;
         elementContent.each(function(idx) {
             var childElement = DocumentElement.fromHTMLElement(this, element.canvas);
             if(childElement === undefined)
                 return true;
         var element = this;
         elementContent.each(function(idx) {
             var childElement = DocumentElement.fromHTMLElement(this, element.canvas);
             if(childElement === undefined)
                 return true;

-            if(idx === 1 && elementContent.length > 2 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
+            if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')

                 return true;
             if(idx > 0 && childElement instanceof DocumentTextElement) {
                 if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')
                 return true;
             if(idx > 0 && childElement instanceof DocumentTextElement) {
                 if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')


@@ -280,27 +314,40 @@ $.extend(DocumentNodeElement.prototype, {
         return toret;
     },
     getWlxmlTag: function() {
         return toret;
     },
     getWlxmlTag: function() {

-        return this.dom().attr('wlxml-tag');
+        return this._container().attr('wlxml-tag');

     },
     setWlxmlTag: function(tag) {
     },
     setWlxmlTag: function(tag) {

-        this.dom().attr('wlxml-tag', tag);
+        if(tag === this.getWlxmlTag())
+            return;
+
+        this._container().attr('wlxml-tag', tag);
+        this._updateWlxmlManager();

     },
     getWlxmlClass: function() {
     },
     getWlxmlClass: function() {

-        var klass = this.dom().attr('wlxml-class');
+        var klass = this._container().attr('wlxml-class');

         if(klass)
             return klass.replace(/-/g, '.');
         return undefined;
     },
     setWlxmlClass: function(klass) {
         if(klass)
             return klass.replace(/-/g, '.');
         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);
 
         if(klass)
         this.getWlxmlMetaAttrs().forEach(function(attr) {
             if(!classAttributes.hasMetaAttr(klass, attr.name))
                 this.dom().removeAttr('wlxml-meta-' + attr.name);
         }, this);
 
         if(klass)

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

         else
         else

-            this.dom().removeAttr('wlxml-class');
+            this._container().removeAttr('wlxml-class');
+        this._updateWlxmlManager();
+    },
+    _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()))


@@ -329,7 +376,18 @@ $.extend(DocumentNodeElement.prototype, {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
         label.css('display', displayCss);
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
         label.css('display', displayCss);

-        this.dom().toggleClass('highlighted-element');
+        this.toggleHighlight(toggle);
+    },
+
+    toggleHighlight: function(toggle) {
+        this._container().toggleClass('highlighted-element', toggle);
+    },
+
+    toggle: function(toggle) {
+        var mng = this.data('_wlxmlManager');
+        if(mng) {
+            mng.toggle(toggle);
+        }

     }
 });
 
     }
 });
 


@@ -342,7 +400,7 @@ var DocumentTextElement = function(htmlElement, canvas) {
 $.extend(DocumentTextElement, {
     createDOM: function(params) {
         return $('<div>')
 $.extend(DocumentTextElement, {
     createDOM: function(params) {
         return $('<div>')

-            .attr('wlxml-text', '')
+            .attr('document-text-element', '')

             .text(params.text || utils.unicode.ZWS);
     },
 
             .text(params.text || utils.unicode.ZWS);
     },
 


@@ -354,7 +412,7 @@ $.extend(DocumentTextElement, {
         return new this(htmlElement, canvas);
     },
     isContentContainer: function(htmlElement) {
         return new this(htmlElement, canvas);
     },
     isContentContainer: function(htmlElement) {

-        return htmlElement.nodeType === Node.TEXT_NODE && $(htmlElement).parent().is('[wlxml-text]');
+        return htmlElement.nodeType === Node.TEXT_NODE && $(htmlElement).parent().is('[document-text-element]');

     }
 });
 
     }
 });
 


@@ -371,9 +429,17 @@ $.extend(DocumentTextElement.prototype, {
         else
             this.$element = $element;
     },
         else
             this.$element = $element;
     },

+    detach: function() {
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },

     setText: function(text) {
         this.dom().contents()[0].data = text;
     },
     setText: function(text) {
         this.dom().contents()[0].data = text;
     },

+    appendText: function(text) {
+        this.dom().contents()[0].data += text;
+    },

     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },
     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },


@@ -388,7 +454,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());


@@ -402,7 +468,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());


@@ -433,6 +499,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();


@@ -499,6 +569,10 @@ $.extend(DocumentTextElement.prototype, {
         this.after(newElement);
         newElement.after(rhsTextElement);
         return newElement;
         this.after(newElement);
         newElement.after(rhsTextElement);
         return newElement;

+    },
+
+    toggleHighlight: function() {
+        // do nothing for now

     }
 });
 
     }
 });