From fe31e3a7385bf539772d927a1dd3d9cc8ef47f0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 17 Dec 2013 11:51:29 +0100 Subject: [PATCH] editor: fixing canvas.cursor getSelectionStart/getSelectionEnd Cursor now correctly recognizes when: - selection is contained within same text node (fix) - selection spans text elements with different parents (adding missing implementation) --- .../modules/documentCanvas/canvas/canvas.js | 42 ++++---- .../documentCanvas/canvas/canvas.test.js | 102 ++++++++++++++++++ 2 files changed, 125 insertions(+), 19 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index e83029a..744ec48 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -9,7 +9,7 @@ define([ ], function($, _, Backbone, documentElement, keyboard, utils, wlxmlListener) { 'use strict'; -/* global document:false, window:false */ +/* global document:false, window:false, Node:false */ var TextHandler = function(canvas) {this.canvas = canvas; this.buffer = null;}; @@ -344,12 +344,8 @@ $.extend(Cursor.prototype, { }; } - var element, - offset; - - if(anchorElement.parent().sameNode(focusElement.parent())) { - var parent = anchorElement.parent(), - anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement); + var getPlaceData = function(anchorFirst) { + var element, offset; if(anchorFirst) { if(which === 'start') { element = anchorElement; @@ -369,23 +365,31 @@ $.extend(Cursor.prototype, { offset = selection.anchorOffset; } } - } else { - // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition - if(which === 'start') { - element = anchorElement; - offset = selection.anchorOffset; + return {element: element, offset: offset}; + }; + + var anchorFirst, placeData, parent; + + if(anchorElement.parent().sameNode(focusElement.parent())) { + parent = anchorElement.parent(); + if(selection.anchorNode === selection.focusNode) { + anchorFirst = selection.anchorOffset <= selection.focusOffset; } else { - element = focusElement; - offset = selection.focusOffset; + anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement); } + placeData = getPlaceData(anchorFirst); + } else { + /*jshint bitwise: false*/ + anchorFirst = selection.anchorNode.compareDocumentPosition(selection.focusNode) & Node.DOCUMENT_POSITION_FOLLOWING; + placeData = getPlaceData(anchorFirst); } - var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length; + var nodeLen = (placeData.element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length; return { - element: element, - offset: offset, - offsetAtBeginning: offset === 0, - offsetAtEnd: nodeLen === offset + element: placeData.element, + offset: placeData.offset, + offsetAtBeginning: placeData.offset === 0, + offsetAtEnd: nodeLen === placeData.offset }; } }); diff --git a/src/editor/modules/documentCanvas/canvas/canvas.test.js b/src/editor/modules/documentCanvas/canvas/canvas.test.js index 6343d23..0f01486 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.test.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.test.js @@ -185,6 +185,108 @@ describe('Cursor', function() { expect(cursor.getPosition().offsetAtEnd).to.equal(true, 'offset at end'); }); + it('recognizes selection start and end on document order', function() { + var c = getCanvasFromXML('
Alicehas a cat
abc...cde
'), + dom = c.doc().dom(), + textFirst = findTextNode(dom, 'Alice'), + textSecond = findTextNode(dom, 'has a cat'), + textAbc = findTextNode(dom, 'abc'), + textCde = findTextNode(dom, 'cde'), + cursor, label; + + var check = function(label, expected) { + var cursor = c.getCursor(); + label = label + ': '; + expect(cursor.getSelectionStart().element.getText()).to.equal(expected.start.text, label + 'start element ok'); + expect(cursor.getSelectionStart().offset).to.equal(expected.start.offset, label + 'start offset ok'); + expect(cursor.getSelectionEnd().element.getText()).to.equal(expected.end.text, label + 'end element ok'); + expect(cursor.getSelectionEnd().offset).to.equal(expected.end.offset, label + 'end offset ok'); + } + + getSelection.returns({ + anchorNode: textFirst, + focusNode: textFirst, + anchorOffset: 1, + focusOffset: 3, + isCollapsed: false + }); + + check('same element, anchor first', { + start: {text: 'Alice', offset: 1}, + end: {text: 'Alice', offset:3} + }); + + + getSelection.returns({ + anchorNode: textFirst, + focusNode: textFirst, + anchorOffset: 3, + focusOffset: 1, + isCollapsed: false + }); + + check('same element, anchor second', { + start: {text: 'Alice', offset: 1}, + end: {text: 'Alice', offset:3} + }); + + + getSelection.returns({ + anchorNode: textAbc, + focusNode: textCde, + anchorOffset: 3, + focusOffset: 1, + isCollapsed: false + }); + + check('same parent, anchor first', { + start: {text: 'abc', offset: 3}, + end: {text: 'cde', offset:1} + }); + + + getSelection.returns({ + anchorNode: textCde, + focusNode: textAbc, + anchorOffset: 1, + focusOffset: 3, + isCollapsed: false + }); + + check('same parent, anchor second', { + start: {text: 'abc', offset: 3}, + end: {text: 'cde', offset:1} + }); + + + getSelection.returns({ + anchorNode: textFirst, + focusNode: textSecond, + anchorOffset: 1, + focusOffset: 3, + isCollapsed: false + }); + + check('different parents, anchor first', { + start: {text: 'Alice', offset: 1}, + end: {text: 'has a cat', offset:3} + }); + + + getSelection.returns({ + anchorNode: textSecond, + focusNode: textFirst, + anchorOffset: 3, + focusOffset: 1, + isCollapsed: false + }); + + check('different parents, anchor second', { + start: {text: 'Alice', offset: 1}, + end: {text: 'has a cat', offset:3} + }); + }); + it('returns boundries of selection when browser selection not collapsed', function() { var c = getCanvasFromXML('
Alice has a big cat
'), dom = c.doc().dom(), -- 2.20.1