var currentTag = $(this);
if(currentTag.attr('wlxml-tag'))
return;
- var element = documentElement.DocumentNodeElement.createDOM({
+
+ var meta = {};
+ for(var i = 0; i < this.attributes.length; i++) {
+ var attr = this.attributes[i];
+ if(attr.name.substr(0, 5) === 'meta-')
+ meta[attr.name.substr(5)] = attr.value;
+ }
+
+ var element = documentElement.DocumentNodeElement.create({
tag: currentTag.prop('tagName').toLowerCase(),
- klass: currentTag.attr('class')
+ klass: currentTag.attr('class'),
+ meta: meta
});
- element.append(currentTag.contents());
- return element;
+ element.dom().append(currentTag.contents());
+ ['orig-before', 'orig-append'].forEach(function(attr) {
+ element.data(attr, '');
+ });
+ return element.dom();
});
this.wrapper.find(':not(iframe)').addBack().contents()
spanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span',
spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
+ var oldText = this.data,
+ oldLength = this.data.length;
+ var parent = el.parent(),
+ parentContents = parent.contents(),
+ idx = parentContents.index(this),
+ next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
+
+ var addInfo = function() {
+ if(next) {
+ $(next).data('orig-before', oldText);
+ } else {
+ parent.data('orig-append', oldText);
+ }
+ }
+
if(spanParent || spanBefore || spanAfter) {
var startSpace = /\s/g.test(this.data.substr(0,1));
var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1;
var trimmed = $.trim(this.data);
- this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '')
+ var newText = (startSpace && (spanParent || spanBefore) ? ' ' : '')
+ trimmed
+ (endSpace && (spanParent || spanAfter) ? ' ' : '');
-
+ if(newText !== oldText) {
+ this.data = newText;
+ addInfo();
+ }
} else {
- var oldLength = this.data.length;
+
this.data = $.trim(this.data);
if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1)
this.data = ' ';
if(this.data.length === 0) {
- $(this).remove();
+ addInfo();
+ el.remove();
+
return true; // continue
}
}
e.preventDefault();
var cursor = canvas.getCursor();
if(!cursor.isSelecting()) {
- var position = cursor.getPosition();
- position.element.split({offset: position.offset});
+ var position = cursor.getPosition(),
+ elements = position.element.split({offset: position.offset}),
+ newEmpty,
+ goto;
+
+ if(position.offsetAtBeginning)
+ newEmpty = elements.first;
+ else if(position.offsetAtEnd)
+ newEmpty = elements.second;
+ if(newEmpty) {
+ goto = newEmpty.append(documentElement.DocumentTextElement.create({text: '\u200B'}, this));
+ canvas.setCurrentElement(goto);
+ }
}
}
});
params = _.extend({caretTo: 'end'}, params);
var findFirstDirectTextChild = function(e, nodeToLand) {
var byBrowser = this.getCursor().getPosition().element;
- if(byBrowser.parent().sameNode(nodeToLand))
+ if(byBrowser && byBrowser.parent().sameNode(nodeToLand))
return byBrowser;
var children = e.children();
for(var i = 0; i < children.length; i++) {
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', element);
+ this.publisher('currentTextElementSet', textElementToLand);
+ } else {
+ document.getSelection().removeAllRanges();
}
if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) {
_markAsCurrent(nodeElementToLand);
- if(!textElementToLand)
- document.getSelection().removeAllRanges();
+
this.publisher('currentNodeElementSet', nodeElementToLand);
}
},
setCursorPosition: function(position) {
if(position.element)
this._moveCaretToTextElement(position.element, position.offset);
+ },
+
+ toXML: function() {
+ var d = function(element, parent, level) {
+ console.log(element.getText ? 'text: ' + element.getText() : 'node: ' + element.getWlxmlTag());
+ var isElementNode = element instanceof documentElement.DocumentNodeElement;
+ parent.prepend(element.toXML(level));
+ if(isElementNode) {
+ var dom = $(parent.children()[0]),
+ elementChildren = element.children();
+ for(var i = elementChildren.length - 1; i >= 0; i--) {
+ d(elementChildren[i], dom, level + 1);
+ }
+ }
+ }
+ var parent = $('<div>');
+ d(this.doc(), parent, 0);
+ return parent.html();
}
});
getSelectionAnchor: function() {
return this.getSelectionBoundry('anchor');
},
+ getSelectionFocus: function() {
+ return this.getSelectionBoundry('focus');
+ },
getSelectionBoundry: function(which) {
var selection = window.getSelection(),
anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
focusElement = this.canvas.getDocumentElement(selection.focusNode);
+ if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+ return {};
+
if(which === 'anchor') {
return {
element: anchorElement,
- offset: selection.anchorOffset
+ offset: selection.anchorOffset,
+ offsetAtBeginning: selection.anchorOffset === 0,
+ offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+ };
+ }
+ if(which === 'focus') {
+ return {
+ element: focusElement,
+ offset: selection.focusOffset,
+ offsetAtBeginning: selection.focusOffset === 0,
+ offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
};
}
}
}
} else {
- // TODO: Handle order
+ // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition
if(which === 'start') {
element = anchorElement;
offset = selection.anchorOffset
return {
element: element,
- offset: offset
+ offset: offset,
+ offsetAtBeginning: offset === 0,
+ offsetAtEnd: element.getText().length === offset
}
}
})
fnp / fnpeditor.git / blobdiff