self.view = view;
self.singleClick = false;
- let caret = this.element = $('<span id="caret"><textarea></textarea></span>');
+ let caret = this.element = $('<nobr><span id="caret"><textarea></textarea></span></nobr>');
// When user writes into caret, add it to the document.
$('textarea', caret).on('input', function() {
// On click on x-node element, set caret position.
self.view.on('click', '*[x-node]', function(e) {
- if (e.redakcja_caret_inserted) return;
- e.redakcja_caret_inserted = true;
+ if (e.redakcja_caret_ignore) return;
+ e.redakcja_caret_ignore = true;
if (self.singleClick) {
self.singleClick = false;
var selection = window.getSelection();
if (!selection.isCollapsed) return;
var anchorNode = selection.anchorNode;
+ if (anchorNode.nodeType != Node.TEXT_NODE) return;
// Is selection still inside a node?
if (!$(anchorNode).closest('[x-node]').length) return;
+ if ($(anchorNode).parents('[x-annotation-box]').not('.editing').length) return;
self.singleClick = true;
setTimeout(function() {
});
self.element.on('keydown', function(e) {
- console.log('KEY');
-
// TODO:
// delete selection?
}
detach() {
- console.log(this.view);
-
let p;
if (this.attached) {
p = this.element.parent()[0]
this.element.parent()[0].normalize();
}
+ insert(elem) {
+ elem.insertBefore(this.element);
+ }
+
insertChar(ch) {
- $(document.createTextNode(ch)).insertBefore(this.element);
+ this.insert(
+ $(document.createTextNode(ch))
+ );
this.normalize();
}
-
+
deleteBefore() {
let contents = this.element.parent().contents();
// Find the text before caret.
--index;
}
while (index >= 0) {
- console.log(newParent, index);
parent.contents()[index].remove();
-- index;
}
newParent.insertBefore(parent);
- console.log('split', parent);
splitter = parent;
}
}
let target, moved, oldparent;
let parent = this.element.parent()[0];
-
+
if (opts.edge(index, contents.length)) {
// We're at the end -- what to do?
// can we go up?
target = contents[index];
moved = false;
- while (target.nodeType == 1) {
+ while (target !== undefined && target.nodeType == Node.ELEMENT_NODE) {
// we've encountered a node.
// can we go inside?
}
- if (target.nodeType == 3) {
+ if (target !== undefined && target.nodeType == Node.TEXT_NODE ) {
if (!moved) {
target = opts.splitTarget(target);
} else {
/* Verify insertion port for annotation or theme */
function verifyTagInsertPoint(node){
- if (node.nodeType == 3) { // Text Node
+ if (node.nodeType == Node.TEXT_NODE) {
node = node.parentNode;
}
- if (node.nodeType != 1) {
+ if (node.nodeType != Node.ELEMENT_NODE) {
return false;
}
node = $(node);
+ if (node.attr('id') == 'caret') {
+ node = node.parent();
+ }
+ while (node.attr('x-pass-thru')) {
+ node = node.parent();
+ }
var xtype = node.attr('x-node');
if (!xtype || (xtype.search(':') >= 0) ||
return false;
}
+ return true;
+ }
+
+ function verifyThemeBoundaryPoint(node) {
+ if (!verifyTagInsertPoint(node)) return false;
+ node = $(node);
// don't allow themes inside annotations
if (node.closest('[x-node="pe"]').length > 0)
return false;
var text = "";
$(fragment.childNodes).each(function(){
- if (this.nodeType == 3) // textNode
+ if (this.nodeType == Node.TEXT_NODE)
text += this.nodeValue;
else {
- if (this.nodeType == 1 &&
+ if (this.nodeType == Node.ELEMENT_NODE &&
$.inArray($(this).attr('x-node'), ANNOT_FORBIDDEN) == -1) {
text += html2plainText(this);
}
var selection = window.getSelection();
var n = selection.rangeCount;
- if (n == 0) {
+ if (selection.isCollapsed) {
window.alert("Nie zaznaczono żadnego obszaru");
return false;
}
- // for now allow only 1 range
- if (n > 1) {
- window.alert("Zaznacz jeden obszar");
- return false;
- }
-
- // remember the selected range
- var range = selection.getRangeAt(0);
+ var range = selection.getRangeAt(n - 1);
if (!verifyTagInsertPoint(range.endContainer)) {
window.alert("Nie można wstawić w to miejsce przypisu.");
return false;
}
- // BUG #273 - selected text can contain themes, which should be omitted from
- // defining term
- var text = html2plainText(range.cloneContents());
+ text = '';
+ for (let i = 0; i < n; ++ i) {
+ let rangeI = selection.getRangeAt(i);
+ if (verifyTagInsertPoint(rangeI.startContainer) &&
+ verifyTagInsertPoint(rangeI.endContainer)) {
+ text += html2plainText(rangeI.cloneContents());
+ }
+ }
var tag = $('<span></span>');
range.collapse(false);
range.insertNode(tag[0]);
}
- function addReference(){
- var selection = window.getSelection();
- var n = selection.rangeCount;
-
- if (n == 0) {
- window.alert("Nie zaznaczono żadnego obszaru");
- return false;
- }
-
- // for now allow only 1 range
- if (n > 1) {
- window.alert("Zaznacz jeden obszar");
- return false;
- }
-
- // remember the selected range
- var range = selection.getRangeAt(0);
-
- if (!verifyTagInsertPoint(range.endContainer)) {
- window.alert("Nie można wstawić w to miejsce przypisu.");
- return false;
- }
-
- var tag = $('<span></span>');
- range.collapse(false);
- range.insertNode(tag[0]);
-
- xml2html({
- xml: '<ref href=""/>',
- success: function(text){
- var t = $(text);
- tag.replaceWith(t);
- openForEdit(t);
- },
- error: function(){
- tag.remove();
- alert('Błąd przy dodawaniu referncji:' + errors);
- }
- })
- }
// verify if the start/end points make even sense -
// they must be inside a x-node (otherwise they will be discarded)
// and the x-node must be a main text
- if (!verifyTagInsertPoint(range.startContainer)) {
+ if (!verifyThemeBoundaryPoint(range.startContainer)) {
window.alert("Motyw nie może się zaczynać w tym miejscu.");
return false;
}
- if (!verifyTagInsertPoint(range.endContainer)) {
+ if (!verifyThemeBoundaryPoint(range.endContainer)) {
window.alert("Motyw nie może się kończyć w tym miejscu.");
return false;
}
}
function VisualPerspective(options){
- perspective = this;
+ perspective = self = this;
var old_callback = options.callback;
perspective.caret = new Caret(element);
$('#insert-reference-button').click(function(){
- addReference();
+ self.addReference();
return false;
});
});
$(".insert-char").click(function() {
- console.log('perspective', perspective);
addSymbol(caret=perspective.caret);
return false;
});
element.on('click', '.annotation', function(event) {
event.preventDefault();
+ event.redakcja_caret_ignore = true;
$('[x-annotation-box]', $(this).parent()).toggleClass('editing');
-
+ perspective.caret.detach();
});
old_callback.call(this);
});
};
+ VisualPerspective.prototype.insertAtRange = function(range, elem) {
+ let self = this;
+ let $end = $(range.endContainer);
+ if ($end.attr('id') == 'caret') {
+ self.caret.insert(elem);
+ } else {
+ range.insertNode(elem[0]);
+ }
+ }
+
+ VisualPerspective.prototype.addReference = function() {
+ let self = this;
+ var selection = window.getSelection();
+ var n = selection.rangeCount;
+
+ // TODO: if no selection, take caret position..
+ if (n == 0) {
+ window.alert("Nie zaznaczono żadnego obszaru");
+ return false;
+ }
+
+ var range = selection.getRangeAt(n - 1);
+ if (!verifyTagInsertPoint(range.endContainer)) {
+ window.alert("Nie można wstawić w to miejsce referencji.");
+ return false;
+ }
+
+ var tag = $('<span></span>');
+
+ range.collapse(false);
+ self.insertAtRange(range, tag);
+
+ xml2html({
+ xml: '<ref href=""/>',
+ success: function(text){
+ var t = $(text);
+ tag.replaceWith(t);
+ openForEdit(t);
+ },
+ error: function(){
+ tag.remove();
+ alert('Błąd przy dodawaniu referncji:' + errors);
+ }
+ })
+ }
+
$.wiki.VisualPerspective = VisualPerspective;
})(jQuery);
fnp / redakcja.git / commitdiff