Reacting to wlxml class change in helper modules properly

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index f80e961..a5d4825 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -23,9 +23,18 @@ $.extend(Canvas.prototype, {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
                     return;

+
+                var meta = {};
+                for(var i = 0; i < this.attributes.length; i++) {
+                    var attr = this.attributes[i];
+                    if(attr.name.substr(0, 5) === 'meta-')
+                        meta[attr.name.substr(5)] = attr.value;
+                }
+

                 var element = documentElement.DocumentNodeElement.createDOM({
                     tag: currentTag.prop('tagName').toLowerCase(),
                 var element = documentElement.DocumentNodeElement.createDOM({
                     tag: currentTag.prop('tagName').toLowerCase(),

-                    klass: currentTag.attr('class')
+                    klass: currentTag.attr('class'),
+                    meta: meta

                 });
 
                 element.append(currentTag.contents());
                 });
 
                 element.append(currentTag.contents());


@@ -74,8 +83,19 @@ $.extend(Canvas.prototype, {
                     e.preventDefault();
                     var cursor = canvas.getCursor();
                     if(!cursor.isSelecting()) {
                     e.preventDefault();
                     var cursor = canvas.getCursor();
                     if(!cursor.isSelecting()) {

-                        var position = cursor.getPosition();
-                        position.element.split({offset: position.offset});
+                        var position = cursor.getPosition(),
+                            elements = position.element.split({offset: position.offset}),
+                            newEmpty,
+                            goto;
+
+                        if(position.offsetAtBeginning)
+                            newEmpty = elements.first;
+                        else if(position.offsetAtEnd)
+                            newEmpty = elements.second;
+                        if(newEmpty) {
+                            goto = newEmpty.append(documentElement.DocumentTextElement.create({text: '\u200B'}, this));
+                            canvas.setCurrentElement(goto);
+                        }

                     }
                 }
             });
                     }
                 }
             });


@@ -425,7 +445,9 @@ $.extend(Cursor.prototype, {
         if(which === 'anchor') {
             return {
                 element: anchorElement,
         if(which === 'anchor') {
             return {
                 element: anchorElement,

-                offset: selection.anchorOffset
+                offset: selection.anchorOffset,
+                offsetAtBeginning: selection.anchorOffset === 0,
+                offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset

             };
         }
         
             };
         }
         


@@ -467,7 +489,9 @@ $.extend(Cursor.prototype, {
 
         return {
             element: element,
 
         return {
             element: element,

-            offset: offset
+            offset: offset,
+            offsetAtBeginning: offset === 0,
+            offsetAtEnd: element.getText().length === offset

         }
     }
 })
         }
     }
 })