X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/83989a968f6af8436bbb37f7a67b82b35a26a2ed..d8c1b8422ef879e737e05f60f7ac401af31b6049:/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 94ad763..f7edfa5 100644
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -6,11 +6,14 @@ 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',
+'modules/documentCanvas/canvas/nullElement',
+], function($, _, Backbone, logging, documentElement, keyboard, utils, wlxmlListener, ElementsRegister, genericElement, nullElement) {
'use strict';
-/* global document:false, window:false, Node:false */
+/* global document:false, window:false, Node:false, gettext */
var logger = logging.getLogger('canvas');
@@ -42,24 +45,42 @@ $.extend(TextHandler.prototype, {
},
setText: function(text, node) {
//this.canvas.wlxmlDocument.transform('setText', {node:node, text: text});
- node.setText(text);
+ node.document.transaction(function() {
+ node.setText(text);
+ }, {
+ metadata:{
+ description: gettext('Changing text')
+ }
+ });
}
});
-var Canvas = function(wlxmlDocument, publisher) {
+var Canvas = function(wlxmlDocument, elements) {
+ this.elementsRegister = new ElementsRegister(documentElement.DocumentNodeElement, nullElement);
+
+ 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);
this.loadWlxmlDocument(wlxmlDocument);
this.setupEventHandling();
- this.publisher = publisher ? publisher : function() {};
this.textHandler = new TextHandler(this);
};
-$.extend(Canvas.prototype, {
+$.extend(Canvas.prototype, Backbone.Events, {
loadWlxmlDocument: function(wlxmlDocument) {
if(!wlxmlDocument) {
@@ -72,8 +93,13 @@ $.extend(Canvas.prototype, {
},
createElement: function(wlxmlNode) {
- var Factory = wlxmlNode.nodeType === Node.TEXT_NODE ? documentElement.DocumentTextElement : documentElement.DocumentNodeElement;
- return Factory.create(wlxmlNode, this);
+ 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);
},
getDocumentElement: function(htmlElement) {
@@ -83,33 +109,35 @@ $.extend(Canvas.prototype, {
}
var $element = $(htmlElement);
if(htmlElement.nodeType === Node.ELEMENT_NODE && $element.attr('document-node-element') !== undefined) {
- return new documentElement.DocumentNodeElement(htmlElement, this);
+ return $element.data('canvas-element');
}
+
+ if(htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('document-text-element') !== undefined) {
+ $element = $element.parent();
+ }
+
if($element.attr('document-text-element') !== undefined || (htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('document-text-element') !== undefined)) {
//return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
- return new documentElement.DocumentTextElement(htmlElement, this);
+ return $element.data('canvas-element');
}
},
reloadRoot: function() {
- var canvasDOM = this.generateCanvasDOM(this.wlxmlDocument.root);
- //var canvasDOM = this.wlxmlDocument.root.getData('canvasElement') ? this.wlxmlDocument.root.getData('canvasElement').dom() : this.generateCanvasDOM(this.wlxmlDocument.root);
-
+ this.rootElement = this.createElement(this.wlxmlDocument.root);
this.wrapper.empty();
- this.wrapper.append(canvasDOM);
- this.d = this.wrapper.children(0);
- },
-
- generateCanvasDOM: function(wlxmlNode) {
- var element = documentElement.DocumentNodeElement.create(wlxmlNode, this);
- return element.dom();
+ this.wrapper.append(this.rootElement.dom);
},
setupEventHandling: function() {
var canvas = this;
+
this.wrapper.on('keyup keydown keypress', function(e) {
- keyboard.handleKey(e, this);
- }.bind(this));
+ keyboard.handleKey(e, canvas);
+ });
+
+ this.wrapper.on('mouseup', function() {
+ canvas.triggerSelectionChanged();
+ });
var mouseDown;
this.wrapper.on('mousedown', '[document-node-element], [document-text-element]', function(e) {
@@ -171,8 +199,8 @@ $.extend(Canvas.prototype, {
//textElement.data('wlxmlNode').setText(toSet);
//textElement.data('wlxmlNode').document.transform('setText', {node: textElement.data('wlxmlNode'), text: toSet});
- if(textElement.data('wlxmlNode').getText() !== toSet) {
- canvas.textHandler.handle(textElement.data('wlxmlNode'), toSet);
+ if(textElement.wlxmlNode.getText() !== toSet) {
+ canvas.textHandler.handle(textElement.wlxmlNode, toSet);
}
}
});
@@ -181,19 +209,12 @@ $.extend(Canvas.prototype, {
observer.observe(this.wrapper[0], config);
- this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
- var el = canvas.getDocumentElement(e.currentTarget);
- if(!el) {
- return;
- }
- e.stopPropagation();
- if(el instanceof documentElement.DocumentTextElement) {
- el = el.parent();
- }
- el.toggleLabel(true);
- });
- this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
- var el = canvas.getDocumentElement(e.currentTarget);
+ var hoverHandler = function(e) {
+ var el = canvas.getDocumentElement(e.currentTarget),
+ expose = {
+ mouseover: true,
+ mouseout: false
+ };
if(!el) {
return;
}
@@ -201,12 +222,15 @@ $.extend(Canvas.prototype, {
if(el instanceof documentElement.DocumentTextElement) {
el = el.parent();
}
- el.toggleLabel(false);
- });
+ el.updateState({exposed:expose[e.type]});
+ };
+
+ this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', hoverHandler);
+ this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', hoverHandler);
this.eventBus.on('elementToggled', function(toggle, element) {
if(!toggle) {
- canvas.setCurrentElement(element.getPreviousTextElement());
+ canvas.setCurrentElement(canvas.getPreviousTextElement(element));
}
});
},
@@ -216,15 +240,12 @@ $.extend(Canvas.prototype, {
},
doc: function() {
- if(this.d === null) {
- return null;
- }
- return this.getDocumentElement(this.d[0]);
+ return this.rootElement;
},
toggleElementHighlight: function(node, toggle) {
- var element = utils.findCanvasElement(node);
- element.toggleHighlight(toggle);
+ var element = utils.getElementForNode(node);
+ element.updateState({exposed: toggle});
},
getCursor: function() {
@@ -233,10 +254,7 @@ $.extend(Canvas.prototype, {
getCurrentNodeElement: function() {
- var htmlElement = this.wrapper.find('.current-node-element').parent()[0];
- if(htmlElement) {
- return this.getDocumentElement(htmlElement);
- }
+ return this.currentNodeElement;
},
getCurrentTextElement: function() {
@@ -246,13 +264,61 @@ $.extend(Canvas.prototype, {
}
},
+ 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 && element.dom && 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) {
+ if(this.currentNodeElement) {
+ this.currentNodeElement.updateState({active: false});
+ this.currentNodeElement = null;
+ }
+ }
+ },
+
+ 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);
+ return;
+ }
+
if(!(element instanceof documentElement.DocumentElement)) {
- element = utils.findCanvasElement(element);
+ element = utils.getElementForNode(element);
}
if(!element || !this.contains(element)) {
@@ -266,21 +332,18 @@ $.extend(Canvas.prototype, {
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');
- element._container().addClass('current-node-element');
+ if(this.currentNodeElement) {
+ this.currentNodeElement.updateState({active: false});
+ }
+ element.updateState({active: true});
+ this.currentNodeElement = element;
}
}.bind(this);
@@ -300,28 +363,24 @@ $.extend(Canvas.prototype, {
if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) {
this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element?
}
- if(!(textElementToLand.sameNode(currentTextElement))) {
- this.publisher('currentTextElementSet', textElementToLand.data('wlxmlNode'));
- }
} else {
document.getSelection().removeAllRanges();
}
if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
_markAsCurrent(nodeElementToLand);
-
- this.publisher('currentNodeElementSet', nodeElementToLand.data('wlxmlNode'));
}
+ this.triggerSelectionChanged();
},
_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);
} else {
- range.setStart(node, where);
+ range.setStart(node, Math.min(node.data.length, where));
}
if(where !== 'whole') {
@@ -342,15 +401,99 @@ $.extend(Canvas.prototype, {
if(position.element) {
this._moveCaretToTextElement(position.element, position.offset);
}
+ },
+
+ toggleGrid: function() {
+ this.wrapper.toggleClass('grid-on');
+ this.trigger('changed');
+ },
+ isGridToggled: function() {
+ return this.wrapper.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();
};
$.extend(Cursor.prototype, {
+ sameAs: function(other) {
+ var same = true;
+ if(!other) {
+ return false;
+ }
+
+ ['focusNode', 'focusOffset', 'anchorNode', 'anchorOffset'].some(function(prop) {
+ same = same && this.selection[prop] === other.selection[prop];
+ if(!same) {
+ return true; // break
+ }
+ }.bind(this));
+
+ return same;
+ },
isSelecting: function() {
var selection = window.getSelection();
return !selection.isCollapsed;
@@ -437,7 +580,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 {
@@ -457,8 +600,8 @@ $.extend(Cursor.prototype, {
});
return {
- fromXMLDocument: function(wlxmlDocument, publisher) {
- return new Canvas(wlxmlDocument, publisher);
+ fromXMLDocument: function(wlxmlDocument, elements) {
+ return new Canvas(wlxmlDocument, elements);
}
};