X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a1337ec35d99fc246d98bc67b80d5bfad44282d4..6cd9ff4975ba90953d3c6b3918e4c7a76af6d348:/src/editor/modules/documentCanvas/canvas/canvas.js?ds=sidebyside diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index ab31ee1..0259452 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -11,8 +11,10 @@ define([ 'modules/documentCanvas/canvas/genericElement', 'modules/documentCanvas/canvas/nullElement', 'modules/documentCanvas/canvas/gutter', +'modules/documentCanvas/canvas/selection', +'modules/documentCanvas/canvas/keyEvent', 'libs/text!./canvas.html' -], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, canvasTemplate) { +], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, selection, keyEvent, canvasTemplate) { 'use strict'; /* global document:false, window:false, Node:false, gettext */ @@ -60,7 +62,8 @@ $.extend(TextHandler.prototype, { }); -var Canvas = function(wlxmlDocument, elements) { +var Canvas = function(wlxmlDocument, elements, metadata) { + this.metadata = metadata || {}; this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement, nullElement); elements = [ @@ -137,16 +140,27 @@ $.extend(Canvas.prototype, Backbone.Events, { }, reloadRoot: function() { + if(this.rootElement) { + this.rootElement.detach(); + } this.rootElement = this.createElement(this.wlxmlDocument.root); - this.rootWrapper.empty(); this.rootWrapper.append(this.rootElement.dom); }, + + triggerKeyEvent: function(keyEvent, selection) { + selection = selection || this.getSelection(); + if(selection && (selection.type === 'caret' || selection.type === 'textSelection') && selection.toDocumentFragment().isValid()) { + keyboard.handleKeyEvent(keyEvent, selection); + } + }, + setupEventHandling: function() { var canvas = this; - this.rootWrapper.on('keyup keydown keypress', function(e) { - keyboard.handleKey(e, canvas); + /* globals document */ + $(document.body).on('keydown', function(e) { + canvas.triggerKeyEvent(keyEvent.fromNativeEvent(e)); }); this.rootWrapper.on('mouseup', function() { @@ -156,16 +170,28 @@ $.extend(Canvas.prototype, Backbone.Events, { var mouseDown; this.rootWrapper.on('mousedown', '[document-node-element], [document-text-element]', function(e) { mouseDown = e.target; + canvas.rootWrapper.find('[contenteditable]').attr('contenteditable', null); }); this.rootWrapper.on('click', '[document-node-element], [document-text-element]', function(e) { + var position, element; e.stopPropagation(); if(e.originalEvent.detail === 3) { e.preventDefault(); canvas._moveCaretToTextElement(canvas.getDocumentElement(e.currentTarget), 'whole'); } else { if(mouseDown === e.target) { - canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false}); + 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}); + } } } }); @@ -197,7 +223,7 @@ $.extend(Canvas.prototype, Backbone.Events, { /* globals MutationObserver */ var observer = new MutationObserver(function(mutations) { mutations.forEach(function(mutation) { - if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) { + if(canvas.dom[0].contains(mutation.target) && documentElement.DocumentTextElement.isContentContainer(mutation.target)) { observer.disconnect(); if(mutation.target.data === '') { mutation.target.data = utils.unicode.ZWS; @@ -297,9 +323,14 @@ $.extend(Canvas.prototype, Backbone.Events, { }, triggerSelectionChanged: function() { - this.trigger('selectionChanged', this.getSelection()); var s = this.getSelection(), - f = s.toDocumentFragment(); + f; + if(!s) { + return; + } + this.trigger('selectionChanged', s); + f = s.toDocumentFragment(); + if(f && f instanceof f.RangeFragment) { if(this.currentNodeElement) { this.currentNodeElement.updateState({active: false}); @@ -309,7 +340,7 @@ $.extend(Canvas.prototype, Backbone.Events, { }, getSelection: function() { - return new Selection(this); + return selection.fromNativeSelection(this); }, select: function(fragment) { @@ -325,6 +356,13 @@ $.extend(Canvas.prototype, Backbone.Events, { } }, + setSelection: function(selection) { + this.select(this, selection.toDocumentFragment()); + }, + + createSelection: function(params) { + return selection.fromParams(this, params); + }, setCurrentElement: function(element, params) { if(!element) { logger.debug('Invalid element passed to setCurrentElement: ' + element); @@ -346,7 +384,7 @@ $.extend(Canvas.prototype, Backbone.Events, { if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) { return byBrowser; } - return e.getVerticallyFirstTextElement(); + return _.isFunction(e.getVerticallyFirstTextElement) ? e.getVerticallyFirstTextElement({considerChildren: false}) : null; }.bind(this); var _markAsCurrent = function(element) { if(element instanceof documentElement.DocumentTextElement) { @@ -374,7 +412,7 @@ $.extend(Canvas.prototype, Backbone.Events, { if(textElementToLand) { _markAsCurrent(textElementToLand); - if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) { + if((params.caretTo || params.caretTo === 0) || !textElementToLand.sameNode(this.getCursor().getPosition().element)) { this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element? } } else { @@ -406,87 +444,20 @@ $.extend(Canvas.prototype, Backbone.Events, { } var selection = document.getSelection(); + $(node).parent().attr('contenteditable', true); selection.removeAllRanges(); selection.addRange(range); - this.rootWrapper.focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't. + $(node).parent().focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't. }, setCursorPosition: function(position) { if(position.element) { this._moveCaretToTextElement(position.element, position.offset); } - }, - - toggleGrid: function() { - this.rootWrapper.toggleClass('grid-on'); - this.trigger('changed'); - }, - isGridToggled: function() { - return this.rootWrapper.hasClass('grid-on'); } }); -var isText = function(node) { - return node && node.nodeType === Node.TEXT_NODE && $(node.parentNode).is('[document-text-element]'); -}; - -var Selection = function(canvas) { - this.canvas = canvas; - var nativeSelection = this.nativeSelection = window.getSelection(); - Object.defineProperty(this, 'type', { - get: function() { - if(nativeSelection.focusNode) { - if(nativeSelection.isCollapsed && isText(nativeSelection.focusNode)) { - return 'caret'; - } - if(isText(nativeSelection.focusNode) && isText(nativeSelection.anchorNode)) { - return 'textSelection'; - } - } - if(canvas.getCurrentNodeElement()) { - return 'node'; - } - } - }); -}; - -$.extend(Selection.prototype, { - toDocumentFragment: function() { - var doc = this.canvas.wlxmlDocument, - anchorElement = this.canvas.getDocumentElement(this.nativeSelection.anchorNode), - focusElement = this.canvas.getDocumentElement(this.nativeSelection.focusNode), - anchorNode = anchorElement ? anchorElement.wlxmlNode : null, - focusNode = focusElement ? focusElement.wlxmlNode : null; - if(this.type === 'caret') { - return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset}); - } - if(this.type === 'textSelection') { - if(anchorNode.isSiblingOf(focusNode)) { - return doc.createFragment(doc.TextRangeFragment, { - node1: anchorNode, - offset1: this.nativeSelection.anchorOffset, - node2: focusNode, - offset2: this.nativeSelection.focusOffset, - }); - } - else { - var siblingParents = doc.getSiblingParents({node1: anchorNode, node2: focusNode}); - return doc.createFragment(doc.RangeFragment, { - node1: siblingParents.node1, - node2: siblingParents.node2 - }); - } - } - if(this.type === 'node') { - return doc.createFragment(doc.NodeFragment, {node: this.canvas.getCurrentNodeElement().wlxmlNode}); - } - }, - sameAs: function(other) { - void(other); - } -}); - var Cursor = function(canvas) { this.canvas = canvas; this.selection = window.getSelection(); @@ -614,8 +585,8 @@ $.extend(Cursor.prototype, { }); return { - fromXMLDocument: function(wlxmlDocument, elements) { - return new Canvas(wlxmlDocument, elements); + fromXMLDocument: function(wlxmlDocument, elements, metadata) { + return new Canvas(wlxmlDocument, elements, metadata); } };