Fixing borders around inline document node elements which text starts at a new line

In case of inline document node elements whose context (text) starts
at the beginning of a new line, setting current-node-element on its
main node caused a border to start at the end of a previous line
and then wrap the next one where texts begins.

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index bd45273..6f4e089 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -323,7 +323,7 @@ $.extend(Canvas.prototype, {
 
     
     getCurrentNodeElement: function() {
-        return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+        return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
     },
 
     getCurrentTextElement: function() {
@@ -351,7 +351,7 @@ $.extend(Canvas.prototype, {
                 element.dom().addClass('current-text-element');
             } else {
                 this.wrapper.find('.current-node-element').removeClass('current-node-element')
-                element.dom().addClass('current-node-element');
+                element._container().addClass('current-node-element');
                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 3601732..384186f 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -364,7 +364,7 @@ $.extend(DocumentNodeElement.prototype, {
     },
 
     toggleHighlight: function(toogle) {
-        this.dom().toggleClass('highlighted-element');
+        this._container().toggleClass('highlighted-element');
     }
 });