Refactorization

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

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index f96e62e..6f4e089 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -169,8 +169,23 @@ $.extend(Canvas.prototype, {
             }
 
             this.wrapper.on('keyup', function(e) {
             }
 
             this.wrapper.on('keyup', function(e) {

-                if(e.which >= 37 && e.which <= 40)
-                    canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false})
+                if(e.which >= 37 && e.which <= 40) {
+                    var element = canvas.getCursor().getPosition().element,
+                        caretTo = false;
+                    if(!element) {
+                        // Chrome hack
+                        var direction;
+                        if(e.which === (KEYS.ARROW_LEFT  || KEYS.ARROW_DOWN)) {
+                            direction = 'above';
+                            caretTo = 'end';
+                        } else {
+                            direction = 'below';
+                            caretTo = 'start';
+                        }
+                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
+                    }
+                    canvas.setCurrentElement(element, {caretTo: caretTo});
+                }

             });
          
             this.wrapper.on('keydown', function(e) {
             });
          
             this.wrapper.on('keydown', function(e) {


@@ -206,9 +221,9 @@ $.extend(Canvas.prototype, {
                 }
             });
 
                 }
             });
 

-            this.wrapper.on('click', '[wlxml-tag], [document-text-element]', function(e) {
+            this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {

                 e.stopPropagation();
                 e.stopPropagation();

-                canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false});
+                canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});

             });
 
             var observer = new MutationObserver(function(mutations) {
             });
 
             var observer = new MutationObserver(function(mutations) {


@@ -221,8 +236,8 @@ $.extend(Canvas.prototype, {
             observer.observe(this.d[0], config);
 
 
             observer.observe(this.d[0], config);
 
 

-            this.wrapper.on('mouseover', '[wlxml-tag], [document-text-element]', function(e) {
-                var el = canvas.getDocumentElement(e.target);
+            this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
+                var el = canvas.getDocumentElement(e.currentTarget);

                 if(!el)
                     return;
                 e.stopPropagation();
                 if(!el)
                     return;
                 e.stopPropagation();


@@ -230,8 +245,8 @@ $.extend(Canvas.prototype, {
                     el = el.parent();
                 el.toggleLabel(true);
             });
                     el = el.parent();
                 el.toggleLabel(true);
             });

-            this.wrapper.on('mouseout', '[wlxml-tag], [document-text-element]', function(e) {
-                var el = canvas.getDocumentElement(e.target);
+            this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
+                var el = canvas.getDocumentElement(e.currentTarget);

                 if(!el)
                     return;
                 e.stopPropagation();
                 if(!el)
                     return;
                 e.stopPropagation();


@@ -306,19 +321,9 @@ $.extend(Canvas.prototype, {
 
     list: {},
 
 
     list: {},
 

-
-
-    highlightElement: function(element) {
-        this.wrapper.find('.highlighted-element').removeClass('highlighted-element');
-        element.dom().addClass('highlighted-element');
-    },
-
-    dimElement: function(element) {
-        element.dom().removeClass('highlighted-element');
-    },

     
     getCurrentNodeElement: function() {
     
     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() {
     },
 
     getCurrentTextElement: function() {


@@ -346,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-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);
                 this.publisher('currentElementChanged', element);
             }
         }.bind(this);