editor: fix - bring back ability to select elements without text

diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index 08df11f..2f25cb3 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -163,13 +163,20 @@ $.extend(Canvas.prototype, Backbone.Events, {
         });
 
         this.rootWrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
         });
 
         this.rootWrapper.on('click', '[document-node-element], [document-text-element]', function(e) {

-            var position;
+            var position, element;

             e.stopPropagation();
             if(e.originalEvent.detail === 3) {
                 e.preventDefault();
                 canvas._moveCaretToTextElement(canvas.getDocumentElement(e.currentTarget), 'whole');
             } else {
                 if(mouseDown === e.target) {
             e.stopPropagation();
             if(e.originalEvent.detail === 3) {
                 e.preventDefault();
                 canvas._moveCaretToTextElement(canvas.getDocumentElement(e.currentTarget), 'whole');
             } else {
                 if(mouseDown === e.target) {

+                    element = canvas.getDocumentElement(e.target);
+                    if(element && element.wlxmlNode.nodeType === Node.ELEMENT_NODE) {
+                        if(element.getVerticallyFirstTextElement && !element.getVerticallyFirstTextElement({considerChildren: false})) {
+                            canvas.setCurrentElement(element);
+                            return;
+                        }
+                    }

                     if(window.getSelection().isCollapsed) {
                         position = utils.caretPositionFromPoint(e.clientX, e.clientY);
                         canvas.setCurrentElement(canvas.getDocumentElement(position.textNode), {caretTo: position.offset});
                     if(window.getSelection().isCollapsed) {
                         position = utils.caretPositionFromPoint(e.clientX, e.clientY);
                         canvas.setCurrentElement(canvas.getDocumentElement(position.textNode), {caretTo: position.offset});