X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/4f68cdcc12eb61a0061fc1a3b143ea5fa4f77310..ecf3b34e969acfeeb5d09b7287b233ce4bffed83:/modules/documentCanvas/canvas/canvas.js

diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 6179b83..9ce8a72 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,13 +1,15 @@
 define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
+'libs/backbone-min',
 'modules/documentCanvas/canvas/documentElement',
 'modules/documentCanvas/canvas/utils'
-], function($, _, documentElement, utils) {
+], function($, _, Backbone, documentElement, utils) {
     
 'use strict';
 
 var Canvas = function(wlxml, publisher) {
+    this.eventBus = _.extend({}, Backbone.Events);
     this.loadWlxml(wlxml);
     this.publisher = publisher ? publisher : function() {};
 };
@@ -19,7 +21,8 @@ $.extend(Canvas.prototype, {
         if(d) {
             this.wrapper = $('<div>').addClass('canvas-wrapper').attr('contenteditable', true);
             this.wrapper.append(d);
-            
+            var canvas = this;
+
             this.wrapper.find('*').replaceWith(function() {
                 var currentTag = $(this);
                 if(currentTag.attr('wlxml-tag'))
@@ -40,7 +43,7 @@ $.extend(Canvas.prototype, {
                     meta: meta,
                     others: others,
                     rawChildren: currentTag.contents()
-                });
+                }, canvas);
 
                 ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
                     element.data(attr, '');
@@ -137,7 +140,6 @@ $.extend(Canvas.prototype, {
             
             this.d = this.wrapper.children(0);
 
-            var canvas = this;
             this.wrapper.on('keydown', function(e) {
                 if(e.which === 13) { 
                     e.preventDefault();
@@ -175,14 +177,14 @@ $.extend(Canvas.prototype, {
                     if(!element) {
                         // Chrome hack
                         var direction;
-                        if(e.which === (KEYS.ARROW_LEFT  || KEYS.ARROW_DOWN)) {
+                        if(e.which === KEYS.ARROW_LEFT  || e.which === KEYS.ARROW_UP) {
                             direction = 'above';
                             caretTo = 'end';
                         } else {
                             direction = 'below';
                             caretTo = 'start';
                         }
-                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
+                        element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode));
                     }
                     canvas.setCurrentElement(element, {caretTo: caretTo});
                 }
@@ -255,6 +257,13 @@ $.extend(Canvas.prototype, {
                 el.toggleLabel(false);
             });
 
+            this.eventBus.on('elementToggled', function(toggle, element) {
+                if(!toggle) {
+                    element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', 'above', element.dom()[0]));
+                    canvas.setCurrentElement(element);
+                }
+            })
+
         } else {
             this.d = null;
         }
@@ -321,19 +330,9 @@ $.extend(Canvas.prototype, {
 
     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() {
-        return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+        return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
     },
 
     getCurrentTextElement: function() {
@@ -361,7 +360,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);
@@ -594,23 +593,40 @@ $.extend(Cursor.prototype, {
             anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
             focusElement = this.canvas.getDocumentElement(selection.focusNode);
         
-        if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+        var getOffset = function(where) {
+            var toret, node;
+            if(where === 'anchor') {
+                node = selection.anchorNode;
+                toret = selection.anchorOffset;
+            } else {
+                node = selection.focusNode;
+                toret = selection.focusOffset;
+            }
+                        
+            if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS)
+                toret = 0;
+            else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS))
+                toret++;
+            return toret;
+        }
+
+        if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
             return {};
 
         if(which === 'anchor') {
             return {
                 element: anchorElement,
-                offset: selection.anchorOffset,
-                offsetAtBeginning: selection.anchorOffset === 0,
-                offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+                offset: getOffset('anchor'),
+                offsetAtBeginning: getOffset('anchor') === 0,
+                offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor')
             };
         }
         if(which === 'focus') {
             return {
                 element: focusElement,
-                offset: selection.focusOffset,
-                offsetAtBeginning: selection.focusOffset === 0,
-                offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+                offset: getOffset('focus'),
+                offsetAtBeginning: getOffset('focus') === 0,
+                offsetAtEnd: selection.focusNode.data.length === getOffset('focus')
             };
         }
         
@@ -623,38 +639,39 @@ $.extend(Cursor.prototype, {
             if(anchorFirst) {
                 if(which === 'start') {
                     element = anchorElement;
-                    offset = selection.anchorOffset;
+                    offset = getOffset('anchor')
                 }
                 else if(which === 'end') {
                     element = focusElement,
-                    offset = selection.focusOffset;
+                    offset = getOffset('focus')
                 }
             } else {
                 if(which === 'start') {
                     element = focusElement,
-                    offset = selection.focusOffset
+                    offset = getOffset('focus')
                 }
                 else if(which === 'end') {
                     element = anchorElement;
-                    offset = selection.anchorOffset;
+                    offset = getOffset('anchor')
                 }
             }
         } else {
             // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
             if(which === 'start') {
                 element = anchorElement;
-                offset = selection.anchorOffset
+                offset = getOffset('anchor')
             } else {
                 element = focusElement;
-                offset = selection.focusOffset
+                offset = getOffset('focus')
             }
         }
 
+        var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
         return {
             element: element,
             offset: offset,
             offsetAtBeginning: offset === 0,
-            offsetAtEnd: element.getText().length === offset
+            offsetAtEnd: nodeLen === offset
         }
     }
 })