X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/3d5a3556cac5639b18e41ad5c96d4d4573101e00..739242f6208f3e58570194fb1000086bafd527ef:/modules/documentCanvas/canvas/canvas.js?ds=sidebyside
diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index f96e62e..318a22f 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,13 +1,15 @@
define([
'libs/jquery-1.9.1.min',
'libs/underscore-min',
+'libs/backbone-min',
'modules/documentCanvas/canvas/documentElement',
'modules/documentCanvas/canvas/utils'
-], function($, _, documentElement, utils) {
+], function($, _, Backbone, documentElement, utils) {
'use strict';
var Canvas = function(wlxml, publisher) {
+ this.eventBus = _.extend({}, Backbone.Events);
this.loadWlxml(wlxml);
this.publisher = publisher ? publisher : function() {};
};
@@ -19,7 +21,8 @@ $.extend(Canvas.prototype, {
if(d) {
this.wrapper = $('
').addClass('canvas-wrapper').attr('contenteditable', true);
this.wrapper.append(d);
-
+ var canvas = this;
+
this.wrapper.find('*').replaceWith(function() {
var currentTag = $(this);
if(currentTag.attr('wlxml-tag'))
@@ -40,7 +43,7 @@ $.extend(Canvas.prototype, {
meta: meta,
others: others,
rawChildren: currentTag.contents()
- });
+ }, canvas);
['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
element.data(attr, '');
@@ -137,14 +140,19 @@ $.extend(Canvas.prototype, {
this.d = this.wrapper.children(0);
- var canvas = this;
this.wrapper.on('keydown', function(e) {
if(e.which === 13) {
e.preventDefault();
var cursor = canvas.getCursor();
if(!cursor.isSelecting()) {
var position = cursor.getPosition(),
- elements = position.element.split({offset: position.offset}),
+ element = position.element;
+
+ if(!(element.parent().parent())) {
+ return false; // top level element is unsplittable
+ }
+
+ var elements = position.element.split({offset: position.offset}),
newEmpty,
goto;
@@ -169,8 +177,23 @@ $.extend(Canvas.prototype, {
}
this.wrapper.on('keyup', function(e) {
- if(e.which >= 37 && e.which <= 40)
- canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false})
+ if(e.which >= 37 && e.which <= 40) {
+ var element = canvas.getCursor().getPosition().element,
+ caretTo = false;
+ if(!element) {
+ // Chrome hack
+ var direction;
+ if(e.which === KEYS.ARROW_LEFT || e.which === KEYS.ARROW_UP) {
+ direction = 'above';
+ caretTo = 'end';
+ } else {
+ direction = 'below';
+ caretTo = 'start';
+ }
+ element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', direction, window.getSelection().focusNode));
+ }
+ canvas.setCurrentElement(element, {caretTo: caretTo});
+ }
});
this.wrapper.on('keydown', function(e) {
@@ -206,9 +229,9 @@ $.extend(Canvas.prototype, {
}
});
- this.wrapper.on('click', '[wlxml-tag], [document-text-element]', function(e) {
+ this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
e.stopPropagation();
- canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false});
+ canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
});
var observer = new MutationObserver(function(mutations) {
@@ -221,8 +244,8 @@ $.extend(Canvas.prototype, {
observer.observe(this.d[0], config);
- this.wrapper.on('mouseover', '[wlxml-tag], [document-text-element]', function(e) {
- var el = canvas.getDocumentElement(e.target);
+ this.wrapper.on('mouseover', '[document-node-element], [document-text-element]', function(e) {
+ var el = canvas.getDocumentElement(e.currentTarget);
if(!el)
return;
e.stopPropagation();
@@ -230,8 +253,8 @@ $.extend(Canvas.prototype, {
el = el.parent();
el.toggleLabel(true);
});
- this.wrapper.on('mouseout', '[wlxml-tag], [document-text-element]', function(e) {
- var el = canvas.getDocumentElement(e.target);
+ this.wrapper.on('mouseout', '[document-node-element], [document-text-element]', function(e) {
+ var el = canvas.getDocumentElement(e.currentTarget);
if(!el)
return;
e.stopPropagation();
@@ -240,6 +263,13 @@ $.extend(Canvas.prototype, {
el.toggleLabel(false);
});
+ this.eventBus.on('elementToggled', function(toggle, element) {
+ if(!toggle) {
+ element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]:visible', 'above', element.dom()[0]));
+ canvas.setCurrentElement(element);
+ }
+ })
+
} else {
this.d = null;
}
@@ -295,6 +325,59 @@ $.extend(Canvas.prototype, {
wrapperElement.after({text: suffixOutside});
return wrapperElement;
},
+
+ wrapElements: function(params) {
+ if(!(params.element1.parent().sameNode(params.element2.parent())))
+ return;
+
+ var parent = params.element1.parent(),
+ parentChildren = parent.children(),
+ wrapper = documentElement.DocumentNodeElement.create({
+ tag: params._with.tag,
+ klass: params._with.klass}),
+ idx1 = parent.childIndex(params.element1),
+ idx2 = parent.childIndex(params.element2);
+
+ if(idx1 > idx2) {
+ var tmp = idx1;
+ idx1 = idx2;
+ idx2 = tmp;
+ }
+
+ var insertingMethod, insertingTarget;
+ if(idx1 === 0) {
+ insertingMethod = 'prepend';
+ insertingTarget = parent;
+ } else {
+ insertingMethod = 'after';
+ insertingTarget = parentChildren[idx1-1];
+ }
+
+ for(var i = idx1; i <= idx2; i++) {
+ wrapper.append(parentChildren[i].detach());
+ }
+
+ insertingTarget[insertingMethod](wrapper);
+ return wrapper;
+ },
+
+ getSiblingParents: function(params) {
+ var parents1 = [params.element1].concat(params.element1.parents()).reverse(),
+ parents2 = [params.element2].concat(params.element2.parents()).reverse(),
+ noSiblingParents = null;
+
+ if(parents1.length === 0 || parents2.length === 0 || !(parents1[0].sameNode(parents2[0])))
+ return noSiblingParents;
+
+ var i;
+ for(i = 0; i < Math.min(parents1.length, parents2.length); i++) {
+ if(parents1[i].sameNode(parents2[i]))
+ continue;
+ break;
+ }
+ return {element1: parents1[i], element2: parents2[i]};
+ },
+
getDocumentElement: function(from) {
if(from instanceof HTMLElement || from instanceof Text) {
return documentElement.DocumentElement.fromHTMLElement(from, this);
@@ -306,19 +389,9 @@ $.extend(Canvas.prototype, {
list: {},
-
-
- highlightElement: function(element) {
- this.wrapper.find('.highlighted-element').removeClass('highlighted-element');
- element.dom().addClass('highlighted-element');
- },
-
- dimElement: function(element) {
- element.dom().removeClass('highlighted-element');
- },
getCurrentNodeElement: function() {
- return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]);
+ return this.getDocumentElement(this.wrapper.find('.current-node-element').parent()[0]);
},
getCurrentTextElement: function() {
@@ -346,7 +419,7 @@ $.extend(Canvas.prototype, {
element.dom().addClass('current-text-element');
} else {
this.wrapper.find('.current-node-element').removeClass('current-node-element')
- element.dom().addClass('current-node-element');
+ element._container().addClass('current-node-element');
this.publisher('currentElementChanged', element);
}
}.bind(this);
@@ -579,23 +652,40 @@ $.extend(Cursor.prototype, {
anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
focusElement = this.canvas.getDocumentElement(selection.focusNode);
- if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+ var getOffset = function(where) {
+ var toret, node;
+ if(where === 'anchor') {
+ node = selection.anchorNode;
+ toret = selection.anchorOffset;
+ } else {
+ node = selection.focusNode;
+ toret = selection.focusOffset;
+ }
+
+ if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS)
+ toret = 0;
+ else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS))
+ toret++;
+ return toret;
+ }
+
+ if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
return {};
if(which === 'anchor') {
return {
element: anchorElement,
- offset: selection.anchorOffset,
- offsetAtBeginning: selection.anchorOffset === 0,
- offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+ offset: getOffset('anchor'),
+ offsetAtBeginning: getOffset('anchor') === 0,
+ offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor')
};
}
if(which === 'focus') {
return {
element: focusElement,
- offset: selection.focusOffset,
- offsetAtBeginning: selection.focusOffset === 0,
- offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+ offset: getOffset('focus'),
+ offsetAtBeginning: getOffset('focus') === 0,
+ offsetAtEnd: selection.focusNode.data.length === getOffset('focus')
};
}
@@ -608,38 +698,39 @@ $.extend(Cursor.prototype, {
if(anchorFirst) {
if(which === 'start') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = getOffset('anchor')
}
else if(which === 'end') {
element = focusElement,
- offset = selection.focusOffset;
+ offset = getOffset('focus')
}
} else {
if(which === 'start') {
element = focusElement,
- offset = selection.focusOffset
+ offset = getOffset('focus')
}
else if(which === 'end') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = getOffset('anchor')
}
}
} else {
// TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
if(which === 'start') {
element = anchorElement;
- offset = selection.anchorOffset
+ offset = getOffset('anchor')
} else {
element = focusElement;
- offset = selection.focusOffset
+ offset = getOffset('focus')
}
}
+ var nodeLen = (element.sameNode(focusElement) ? selection.focusNode : selection.anchorNode).length;
return {
element: element,
offset: offset,
offsetAtBeginning: offset === 0,
- offsetAtEnd: element.getText().length === offset
+ offsetAtEnd: nodeLen === offset
}
}
})