X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/f1709cec5b085835c7e5d36eaa2d2b35d0b13f22..2a0f7de048f49f0087caae5962f124dbbb06d69e:/src/editor/modules/documentCanvas/canvas/canvas.js diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index 3bf6b51..29edbe5 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -11,7 +11,8 @@ define([ 'modules/documentCanvas/canvas/genericElement', 'modules/documentCanvas/canvas/nullElement', 'modules/documentCanvas/canvas/gutter', -], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter) { +'libs/text!./canvas.html' +], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement, gutter, canvasTemplate) { 'use strict'; /* global document:false, window:false, Node:false, gettext */ @@ -59,7 +60,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 = [ @@ -75,13 +77,13 @@ var Canvas = function(wlxmlDocument, elements) { }.bind(this)); this.eventBus = _.extend({}, Backbone.Events); - this.wrapper = $('
'); + this.dom = $(canvasTemplate); + this.rootWrapper = this.dom.find('.root-wrapper'); this.gutter = gutter.create(); this.gutterView = new gutter.GutterView(this.gutter); - this.rootWrapper = $('
').addClass('canvas-wrapper').attr('contenteditable', true); - this.wrapper.find('.crow').append(this.rootWrapper, this.gutterView.dom); + this.dom.find('.view-row').append(this.gutterView.dom); this.wlxmlListener = wlxmlListener.create(this); this.loadWlxmlDocument(wlxmlDocument); @@ -92,7 +94,7 @@ var Canvas = function(wlxmlDocument, elements) { $.extend(Canvas.prototype, Backbone.Events, { getElementOffset: function(element) { - return element.dom.offset().top - this.wrapper.offset().top; + return element.dom.offset().top - this.dom.offset().top; }, loadWlxmlDocument: function(wlxmlDocument) { @@ -136,8 +138,10 @@ $.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); }, @@ -196,7 +200,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; @@ -205,7 +209,7 @@ $.extend(Canvas.prototype, Backbone.Events, { mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, ''); canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end'); } - observer.observe(canvas.wrapper[0], config); + observer.observe(canvas.dom[0], config); var textElement = canvas.getDocumentElement(mutation.target), toSet = mutation.target.data !== utils.unicode.ZWS ? mutation.target.data : ''; @@ -249,7 +253,7 @@ $.extend(Canvas.prototype, Backbone.Events, { }, view: function() { - return this.wrapper; + return this.dom; }, doc: function() { @@ -345,7 +349,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) { @@ -414,14 +418,6 @@ $.extend(Canvas.prototype, Backbone.Events, { 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'); } }); @@ -461,6 +457,9 @@ $.extend(Selection.prototype, { return doc.createFragment(doc.CaretFragment, {node: anchorNode, offset: this.nativeSelection.anchorOffset}); } if(this.type === 'textSelection') { + if(!anchorNode || !focusNode) { + return; + } if(anchorNode.isSiblingOf(focusNode)) { return doc.createFragment(doc.TextRangeFragment, { node1: anchorNode, @@ -613,8 +612,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); } };