X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/22a990585c518e18de8fd2b023145d6ac305a6fa..804d77fa4cea068e90b6461f1a5f151fe6f67fbc:/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 476a95b..a43799c 100644
--- a/src/editor/modules/documentCanvas/canvas/canvas.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.js
@@ -6,11 +6,13 @@ 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 */
+/* global document:false, window:false, Node:false, gettext */
var logger = logging.getLogger('canvas');
@@ -42,24 +44,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, genericElement);
+
+ 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,7 +92,12 @@ $.extend(Canvas.prototype, {
},
createElement: function(wlxmlNode) {
- var Factory = wlxmlNode.nodeType === Node.TEXT_NODE ? documentElement.DocumentTextElement : documentElement.DocumentNodeElement;
+ 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);
},
@@ -97,25 +122,21 @@ $.extend(Canvas.prototype, {
},
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 = new documentElement.DocumentNodeElement(wlxmlNode, this);
- //return element.dom();
- return this.createElement(wlxmlNode).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) {
@@ -212,7 +233,7 @@ $.extend(Canvas.prototype, {
this.eventBus.on('elementToggled', function(toggle, element) {
if(!toggle) {
- canvas.setCurrentElement(element.getPreviousTextElement());
+ canvas.setCurrentElement(canvas.getPreviousTextElement(element));
}
});
},
@@ -222,10 +243,7 @@ $.extend(Canvas.prototype, {
},
doc: function() {
- if(this.d === null) {
- return null;
- }
- return this.getDocumentElement(this.d[0]);
+ return this.rootElement;
},
toggleElementHighlight: function(node, toggle) {
@@ -252,11 +270,38 @@ $.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;
},
+ triggerSelectionChanged: function() {
+ this.trigger('selectionChanged', this.getSelection());
+ },
+
+ getSelection: function() {
+ return new Selection(this);
+ },
+
setCurrentElement: function(element, params) {
+ if(!element) {
+ logger.debug('Invalid element passed to setCurrentElement: ' + element);
+ return;
+ }
+
if(!(element instanceof documentElement.DocumentElement)) {
element = utils.findCanvasElement(element);
}
@@ -306,18 +351,14 @@ $.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.wlxmlNode);
- }
} else {
document.getSelection().removeAllRanges();
}
if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
_markAsCurrent(nodeElementToLand);
-
- this.publisher('currentNodeElementSet', nodeElementToLand.wlxmlNode);
}
+ this.triggerSelectionChanged();
},
_moveCaretToTextElement: function(element, where) {
@@ -327,7 +368,7 @@ $.extend(Canvas.prototype, {
if(typeof where !== 'number') {
range.selectNodeContents(node);
} else {
- range.setStart(node, where);
+ range.setStart(node, Math.min(node.data.length, where));
}
if(where !== 'whole') {
@@ -348,15 +389,103 @@ $.extend(Canvas.prototype, {
if(position.element) {
this._moveCaretToTextElement(position.element, position.offset);
}
+ },
+
+ findCanvasElement: function(node) {
+ return utils.findCanvasElement(node);
+ },
+
+ 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;
@@ -463,8 +592,8 @@ $.extend(Cursor.prototype, {
});
return {
- fromXMLDocument: function(wlxmlDocument, publisher) {
- return new Canvas(wlxmlDocument, publisher);
+ fromXMLDocument: function(wlxmlDocument, elements) {
+ return new Canvas(wlxmlDocument, elements);
}
};