X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/cf7c3b4fb3a419476a0d7f6118d3ba9a3fd0c809..3150d85bc20dd7e15a2aa20ff647d76a7aa6ece5:/modules/documentCanvas/canvas/canvas.js
diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 8882c1c..4b43c8c 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,12 +1,16 @@
define([
'libs/jquery-1.9.1.min',
'libs/underscore-min',
-'modules/documentCanvas/canvas/documentElement'
-], function($, _, documentElement) {
+'libs/backbone-min',
+'modules/documentCanvas/canvas/documentElement',
+'modules/documentCanvas/canvas/keyboard',
+'modules/documentCanvas/canvas/utils'
+], function($, _, Backbone, documentElement, keyboard, utils) {
'use strict';
var Canvas = function(wlxml, publisher) {
+ this.eventBus = _.extend({}, Backbone.Events);
this.loadWlxml(wlxml);
this.publisher = publisher ? publisher : function() {};
};
@@ -18,7 +22,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'))
@@ -37,38 +42,56 @@ $.extend(Canvas.prototype, {
tag: currentTag.prop('tagName').toLowerCase(),
klass: currentTag.attr('class'),
meta: meta,
- others: others
- });
+ others: others,
+ rawChildren: currentTag.contents(),
+ prepopulateOnEmpty: true
+ }, canvas);
- element.dom().append(currentTag.contents());
- ['orig-before', 'orig-append'].forEach(function(attr) {
- element.data(attr, ['']);
+ ['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') || elParent.attr('document-text-element') !== undefined)
+ return true; // continue
- var addInfo = function(toAdd) {
+ var addInfo = function(toAdd, where) {
var parentContents = elParent.contents(),
idx = parentContents.index(el[0]),
- next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
- if(next) {
- $(next).data('orig-before', toAdd);
- } else {
- elParent.data('orig-append', toAdd);
- }
+ 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.parent();
+ key = prev ? 'orig-after' : 'orig-begin';
+ } else if(where === 'below') {
+ target = next ? $(next) : elParent.parent();
+ key = next ? 'orig-before' : 'orig-end';
+ } else { throw new Object;}
+
+ target.data(key, toAdd);
}
text.transformed = text.trimmed;
@@ -85,15 +108,14 @@ $.extend(Canvas.prototype, {
}
if(!text.transformed) {
- addInfo([text.original]);
+ addInfo(text.original, 'below');
el.remove();
return true; // continue
}
if(text.transformed !== text.original) {
- var toAdd = [];
if(!text.trimmed) {
- toAdd.push(text.original);
+ addInfo(text.original, 'below');
} else {
var startingMatch = text.original.match(/^\s+/g),
endingMatch = text.original.match(/\s+$/g),
@@ -103,16 +125,15 @@ $.extend(Canvas.prototype, {
if(endingWhiteSpace) {
if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ')
endingWhiteSpace = endingWhiteSpace.substr(1);
- toAdd.push(endingWhiteSpace);
+ addInfo(endingWhiteSpace, 'below');
}
if(startingWhiteSpace) {
if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ')
startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1);
- toAdd.push(startingWhiteSpace);
+ addInfo(startingWhiteSpace, 'above');
}
}
- addInfo(toAdd);
}
var element = documentElement.DocumentTextElement.create({text: text.transformed});
@@ -121,39 +142,60 @@ $.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}),
- 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);
+ this.wrapper.on('keyup keydown keypress', function(e) {
+ keyboard.handleKey(e, this);
+ }.bind(this));
+
+ this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) {
+ e.stopPropagation();
+ canvas.setCurrentElement(canvas.getDocumentElement(e.currentTarget), {caretTo: false});
+ });
+
+ var observer = new MutationObserver(function(mutations) {
+ mutations.forEach(function(mutation) {
+ if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) {
+ observer.disconnect();
+ if(mutation.target.data === '')
+ mutation.target.data = utils.unicode.ZWS;
+ else if(mutation.oldValue === utils.unicode.ZWS) {
+ mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, '');
+ canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end');
}
+ observer.observe(canvas.d[0], config);
+ canvas.publisher('contentChanged');
}
- }
+ });
});
+ var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true};
+ observer.observe(this.d[0], config);
- this.wrapper.on('keyup', function(e) {
- if(e.which >= 37 && e.which <= 40)
- canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false})
- });
- this.wrapper.on('click', '[wlxml-tag], [wlxml-text]', function(e) {
+ 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();
- canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false});
+ if(el instanceof documentElement.DocumentTextElement)
+ el = el.parent();
+ 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;
}
@@ -209,6 +251,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);
@@ -220,19 +315,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() {
@@ -260,7 +345,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);
@@ -320,8 +405,9 @@ $.extend(Canvas.prototype, {
},
toXML: function() {
- var parent = $('
');
- this.doc().toXML(parent, 0)
+ var parent = $('
'),
+ parts = this.doc().toXML(0);
+ parent.append(parts);
return parent.html();
}
});
@@ -364,7 +450,8 @@ $.extend(Canvas.prototype.list, {
var toret;
if(parent.is('list')) {
- listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+ var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'});
+ item.exec('toggleBullet', false);
toret = listElement.parent();
} else {
toret = listElement;
@@ -492,7 +579,7 @@ $.extend(Cursor.prototype, {
anchorElement = this.canvas.getDocumentElement(selection.anchorNode),
focusElement = this.canvas.getDocumentElement(selection.focusNode);
- if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement)
+ if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement)
return {};
if(which === 'anchor') {
@@ -500,7 +587,7 @@ $.extend(Cursor.prototype, {
element: anchorElement,
offset: selection.anchorOffset,
offsetAtBeginning: selection.anchorOffset === 0,
- offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset
+ offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset
};
}
if(which === 'focus') {
@@ -508,7 +595,7 @@ $.extend(Cursor.prototype, {
element: focusElement,
offset: selection.focusOffset,
offsetAtBeginning: selection.focusOffset === 0,
- offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset
+ offsetAtEnd: selection.focusNode.data.length === selection.focusOffset
};
}
@@ -521,11 +608,11 @@ $.extend(Cursor.prototype, {
if(anchorFirst) {
if(which === 'start') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = selection.anchorOffset
}
else if(which === 'end') {
element = focusElement,
- offset = selection.focusOffset;
+ offset = selection.focusOffset
}
} else {
if(which === 'start') {
@@ -534,7 +621,7 @@ $.extend(Cursor.prototype, {
}
else if(which === 'end') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = selection.anchorOffset
}
}
} else {
@@ -548,11 +635,12 @@ $.extend(Cursor.prototype, {
}
}
+ 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
}
}
})