X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/c031ffaa79a223a05a4a58de2854c9855e94cc18..24f82f204feceecca2d05e1b2c9a07f7146642cc:/src/editor/modules/documentCanvas/canvas/canvas.js?ds=inline
diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
index c6a7c82..a057e05 100644
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -6,8 +6,10 @@ define([
'modules/documentCanvas/canvas/documentElement',
'modules/documentCanvas/canvas/keyboard',
'modules/documentCanvas/canvas/utils',
-'modules/documentCanvas/canvas/wlxmlListener'
-], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener) {
+'modules/documentCanvas/canvas/wlxmlListener',
+'modules/documentCanvas/canvas/elementsRegister',
+'modules/documentCanvas/canvas/genericElement',
+], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement) {
'use strict';
/* global document:false, window:false, Node:false, gettext */
@@ -55,7 +57,20 @@ $.extend(TextHandler.prototype, {
});
-var Canvas = function(wlxmlDocument) {
+var Canvas = function(wlxmlDocument, elements) {
+ this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement);
+
+ elements = [
+ {tag: 'section', klass: null, prototype: genericElement},
+ {tag: 'div', klass: null, prototype: genericElement},
+ {tag: 'header', klass: null, prototype: genericElement},
+ {tag: 'span', klass: null, prototype: genericElement},
+ {tag: 'aside', klass: null, prototype: genericElement}
+ ].concat(elements || []);
+
+ (elements).forEach(function(elementDesc) {
+ this.elementsRegister.register(elementDesc);
+ }.bind(this));
this.eventBus = _.extend({}, Backbone.Events);
this.wrapper = $('
').addClass('canvas-wrapper').attr('contenteditable', true);
this.wlxmlListener = wlxmlListener.create(this);
@@ -77,7 +92,12 @@ $.extend(Canvas.prototype, Backbone.Events, {
},
createElement: function(wlxmlNode) {
- var Factory = wlxmlNode.nodeType === Node.TEXT_NODE ? documentElement.DocumentTextElement : documentElement.factoryForTag(wlxmlNode.getTagName());
+ var Factory;
+ if(wlxmlNode.nodeType === Node.TEXT_NODE) {
+ Factory = documentElement.DocumentTextElement;
+ } else {
+ Factory = this.elementsRegister.getElement({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});
+ }
return new Factory(wlxmlNode, this);
},
@@ -104,7 +124,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
reloadRoot: function() {
this.rootElement = this.createElement(this.wlxmlDocument.root);
this.wrapper.empty();
- this.wrapper.append(this.rootElement.dom());
+ this.wrapper.append(this.rootElement.dom);
},
setupEventHandling: function() {
@@ -213,7 +233,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
this.eventBus.on('elementToggled', function(toggle, element) {
if(!toggle) {
- canvas.setCurrentElement(element.getPreviousTextElement());
+ canvas.setCurrentElement(canvas.getPreviousTextElement(element));
}
});
},
@@ -227,7 +247,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
},
toggleElementHighlight: function(node, toggle) {
- var element = utils.findCanvasElement(node);
+ var element = utils.getElementForNode(node);
element.toggleHighlight(toggle);
},
@@ -250,18 +270,58 @@ $.extend(Canvas.prototype, Backbone.Events, {
}
},
+ getPreviousTextElement: function(relativeToElement, includeInvisible) {
+ return this.getNearestTextElement('above', relativeToElement, includeInvisible);
+ },
+
+ getNextTextElement: function(relativeToElement, includeInvisible) {
+ return this.getNearestTextElement('below', relativeToElement, includeInvisible);
+ },
+
+ getNearestTextElement: function(direction, relativeToElement, includeInvisible) {
+ includeInvisible = includeInvisible !== undefined ? includeInvisible : false;
+ var selector = '[document-text-element]' + (includeInvisible ? '' : ':visible');
+ return this.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, relativeToElement.dom[0]));
+ },
+
contains: function(element) {
- return element.dom().parents().index(this.wrapper) !== -1;
+ return element.dom.parents().index(this.wrapper) !== -1;
},
triggerSelectionChanged: function() {
this.trigger('selectionChanged', this.getSelection());
+ var s = this.getSelection(),
+ f = s.toDocumentFragment();
+ if(f && f instanceof f.RangeFragment) {
+ var $current = this.wrapper.find('.current-node-element');
+ var current = $current && this.getDocumentElement($current.parent()[0]);
+
+ if($current) {
+ $current.removeClass('current-node-element');
+ }
+ if(current) {
+ current.markAsCurrent(false);
+ }
+ }
},
getSelection: function() {
return new Selection(this);
},
+ select: function(fragment) {
+ if(fragment instanceof this.wlxmlDocument.RangeFragment) {
+ this.setCurrentElement(fragment.endNode, {caretTo: fragment.endOffset});
+ } else if(fragment instanceof this.wlxmlDocument.NodeFragment) {
+ var params = {
+ caretTo: fragment instanceof this.wlxmlDocument.CaretFragment ? fragment.offset : 'start'
+ };
+ this.setCurrentElement(fragment.node, params);
+ } else {
+ logger.debug('Fragment not supported');
+ }
+ },
+
setCurrentElement: function(element, params) {
if(!element) {
logger.debug('Invalid element passed to setCurrentElement: ' + element);
@@ -269,7 +329,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
}
if(!(element instanceof documentElement.DocumentElement)) {
- element = utils.findCanvasElement(element);
+ element = utils.getElementForNode(element);
}
if(!element || !this.contains(element)) {
@@ -283,21 +343,22 @@ $.extend(Canvas.prototype, Backbone.Events, {
if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) {
return byBrowser;
}
- var children = e.children();
- for(var i = 0; i < children.length; i++) {
- if(children[i] instanceof documentElement.DocumentTextElement) {
- return children[i];
- }
- }
- return null;
+ return e.getVerticallyFirstTextElement();
}.bind(this);
var _markAsCurrent = function(element) {
if(element instanceof documentElement.DocumentTextElement) {
this.wrapper.find('.current-text-element').removeClass('current-text-element');
- element.dom().addClass('current-text-element');
+ element.dom.addClass('current-text-element');
} else {
- this.wrapper.find('.current-node-element').removeClass('current-node-element');
+ var $current = this.wrapper.find('.current-node-element');
+ var current = this.getDocumentElement($current.parent()[0]);
+ $current.removeClass('current-node-element');
+
+ if(current) {
+ current.markAsCurrent(false);
+ }
element._container().addClass('current-node-element');
+ element.markAsCurrent(true);
}
}.bind(this);
@@ -329,7 +390,7 @@ $.extend(Canvas.prototype, Backbone.Events, {
_moveCaretToTextElement: function(element, where) {
var range = document.createRange(),
- node = element.dom().contents()[0];
+ node = element.dom.contents()[0];
if(typeof where !== 'number') {
range.selectNodeContents(node);
@@ -357,10 +418,6 @@ $.extend(Canvas.prototype, Backbone.Events, {
}
},
- findCanvasElement: function(node) {
- return utils.findCanvasElement(node);
- },
-
toggleGrid: function() {
this.wrapper.toggleClass('grid-on');
this.trigger('changed');
@@ -538,7 +595,7 @@ $.extend(Cursor.prototype, {
if(selection.anchorNode === selection.focusNode) {
anchorFirst = selection.anchorOffset <= selection.focusOffset;
} else {
- anchorFirst = parent.childIndex(anchorElement) < parent.childIndex(focusElement);
+ anchorFirst = (parent.getFirst(anchorElement, focusElement) === anchorElement);
}
placeData = getPlaceData(anchorFirst);
} else {
@@ -558,8 +615,8 @@ $.extend(Cursor.prototype, {
});
return {
- fromXMLDocument: function(wlxmlDocument) {
- return new Canvas(wlxmlDocument);
+ fromXMLDocument: function(wlxmlDocument, elements) {
+ return new Canvas(wlxmlDocument, elements);
}
};