tag: currentTag.prop('tagName').toLowerCase(),
klass: currentTag.attr('class'),
meta: meta,
- others: others
+ others: others,
+ rawChildren: currentTag.contents()
});
- element.dom().append(currentTag.contents());
['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
element.data(attr, '');
});
return element.dom();
});
+ var FIRST_CONTENT_INDEX = 0;
+
+ // @@ TODO - refactor!
+ var getNode = function(element) {
+ return element.children('[document-element-content]');
+ }
+
this.wrapper.find(':not(iframe)').addBack().contents()
.filter(function() {return this.nodeType === Node.TEXT_NODE})
.each(function() {
+
// TODO: use DocumentElement API
var el = $(this),
text = {original: el.text(), trimmed: $.trim(el.text())},
elParent = el.parent(),
hasSpanParent = elParent.attr('wlxml-tag') === 'span',
- hasSpanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span',
- hasSpanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
+ hasSpanBefore = el.prev().length > 0 && getNode($(el.prev()[0])).attr('wlxml-tag') === 'span',
+ hasSpanAfter = el.next().length > 0 && getNode($(el.next()[0])).attr('wlxml-tag') === 'span';
+ if(el.parent().hasClass('canvas-widget'))
+ return true; // continue
var addInfo = function(toAdd, where) {
var parentContents = elParent.contents(),
idx = parentContents.index(el[0]),
- prev = idx > 0 ? parentContents[idx-1] : null,
+ prev = idx > FIRST_CONTENT_INDEX ? parentContents[idx-1] : null,
next = idx < parentContents.length - 1 ? parentContents[idx+1] : null,
target, key;
if(where === 'above') {
- target = prev ? $(prev) : elParent;
+ target = prev ? $(prev) : elParent.parent();
key = prev ? 'orig-after' : 'orig-begin';
} else if(where === 'below') {
- target = next ? $(next) : elParent;
+ target = next ? $(next) : elParent.parent();
key = next ? 'orig-before' : 'orig-end';
} else { throw new Object;}
}
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) {
}
});
- this.wrapper.on('click', '[wlxml-tag], [wlxml-text]', 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) {
mutations.forEach(function(mutation) {
if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
observer.observe(this.d[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);
+ if(!el)
+ return;
+ e.stopPropagation();
+ if(el instanceof documentElement.DocumentTextElement)
+ el = el.parent();
+ el.toggleLabel(false);
+ });
+
} else {
this.d = null;
}
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() {
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);
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')
};
}
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
}
}
})
fnp / fnpeditor.git / blobdiff