X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a737843b7f2278e38f02b00f8cb791446c2b99e1..78b9dd3287f4a6e2859837bb8e978e8884d19e76:/modules/documentCanvas/canvas/canvas.js
diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js
index 6f4e089..51af41b 100644
--- a/modules/documentCanvas/canvas/canvas.js
+++ b/modules/documentCanvas/canvas/canvas.js
@@ -1,13 +1,16 @@
define([
'libs/jquery-1.9.1.min',
'libs/underscore-min',
+'libs/backbone-min',
'modules/documentCanvas/canvas/documentElement',
+'modules/documentCanvas/canvas/keyboard',
'modules/documentCanvas/canvas/utils'
-], function($, _, documentElement, 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() {};
};
@@ -19,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'))
@@ -34,12 +38,13 @@ $.extend(Canvas.prototype, {
others[attr.name] = attr.value;
}
- var element = documentElement.DocumentNodeElement.create({
+ var element = canvas.createNodeElement({
tag: currentTag.prop('tagName').toLowerCase(),
klass: currentTag.attr('class'),
meta: meta,
others: others,
- rawChildren: currentTag.contents()
+ rawChildren: currentTag.contents(),
+ prepopulateOnEmpty: true
});
['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
@@ -68,7 +73,7 @@ $.extend(Canvas.prototype, {
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'))
+ if(el.parent().hasClass('canvas-widget') || elParent.attr('document-text-element') !== undefined)
return true; // continue
var addInfo = function(toAdd, where) {
@@ -137,89 +142,9 @@ $.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: ''}, this));
- canvas.setCurrentElement(goto);
- }
- }
- }
- });
-
-
- var KEYS = {
- ARROW_LEFT: 37,
- ARROW_UP: 38,
- ARROW_RIGHT: 39,
- ARROW_DOWN: 40
- }
-
- this.wrapper.on('keyup', function(e) {
- 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 || KEYS.ARROW_DOWN)) {
- direction = 'above';
- caretTo = 'end';
- } else {
- direction = 'below';
- caretTo = 'start';
- }
- element = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode));
- }
- canvas.setCurrentElement(element, {caretTo: caretTo});
- }
- });
-
- this.wrapper.on('keydown', function(e) {
- if(e.which >= 37 && e.which <= 40) {
- var position = canvas.getCursor().getPosition(),
- element = position.element;
- if(element && (element instanceof documentElement.DocumentTextElement)) {
- if(element.isEmpty()) {
- var direction, caretTo;
- if(e.which === KEYS.ARROW_LEFT || e.which === KEYS.ARROW_UP) {
- direction = 'above';
- caretTo = 'end';
- } else {
- direction = 'below';
- caretTo = 'start';
- }
- var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode))
- canvas.setCurrentElement(element, {caretTo: caretTo});
- } else {
- var txt = element.dom().contents()[0].data;
- if(e.which === KEYS.ARROW_LEFT && position.offset > 1 && txt.charAt(position.offset-2) === utils.unicode.ZWS) {
- e.preventDefault();
- canvas._moveCaretToTextElement(element, position.offset-2);
- }
- if(e.which === KEYS.ARROW_RIGHT && position.offset < txt.length - 1 && txt.charAt(position.offset+1) === utils.unicode.ZWS) {
- e.preventDefault();
- canvas._moveCaretToTextElement(element, position.offset+2);
- }
- }
- }
-
-
- }
- });
+ 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();
@@ -228,8 +153,17 @@ $.extend(Canvas.prototype, {
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
- if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '')
- mutation.target.data = utils.unicode.ZWS;
+ 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};
@@ -255,6 +189,12 @@ $.extend(Canvas.prototype, {
el.toggleLabel(false);
});
+ this.eventBus.on('elementToggled', function(toggle, element) {
+ if(!toggle) {
+ canvas.setCurrentElement(element.getPreviousTextElement());
+ }
+ })
+
} else {
this.d = null;
}
@@ -270,6 +210,10 @@ $.extend(Canvas.prototype, {
return documentElement.DocumentNodeElement.fromHTMLElement(this.d.get(0), this); //{wlxmlTag: this.d.prop('tagName')};
},
+ createNodeElement: function(params) {
+ return documentElement.DocumentNodeElement.create(params, this);
+ },
+
wrapText: function(params) {
params = _.extend({textNodeIdx: 0}, params);
if(typeof params.textNodeIdx === 'number')
@@ -287,7 +231,7 @@ $.extend(Canvas.prototype, {
suffixOutside = textNode2.getText().substr(params.offsetEnd)
;
- var wrapperElement = documentElement.DocumentNodeElement.create({tag: params._with.tag, klass: params._with.klass});
+ var wrapperElement = this.createNodeElement({tag: params._with.tag, klass: params._with.klass});
textNode1.after(wrapperElement);
textNode1.detach();
@@ -310,6 +254,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 = this.createNodeElement({
+ 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);
@@ -423,7 +420,8 @@ $.extend(Canvas.prototype.list, {
if(!(params.element1.parent().sameNode(params.element2.parent())))
return false;
- var parent = params.element1.parent();
+ var parent = params.element1.parent(),
+ canvas = params.element1.canvas;
if(parent.childIndex(params.element1) > parent.childIndex(params.element2)) {
var tmp = params.element1;
@@ -434,7 +432,6 @@ $.extend(Canvas.prototype.list, {
var elementsToWrap = [];
var place = 'before';
- var canvas = this;
parent.children().some(function(element) {
var _e = element;
if(element.sameNode(params.element1))
@@ -452,11 +449,11 @@ $.extend(Canvas.prototype.list, {
return true;
});
- var listElement = documentElement.DocumentNodeElement.create({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
-
+ var listElement = canvas.createNodeElement({tag: 'div', klass: 'list-items' + (params.type === 'enum' ? '-enum' : '')});
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;
@@ -482,6 +479,7 @@ $.extend(Canvas.prototype.list, {
succeedingItems = [],
items = list.children(),
listIsNested = list.parent().getWlxmlClass() === 'item',
+ canvas = params.element1.canvas,
i;
if(idx1 > idx2) {
@@ -523,7 +521,7 @@ $.extend(Canvas.prototype.list, {
item.setWlxmlClass(null);
reference = item;
});
- var secondList = documentElement.DocumentNodeElement.create({tag: 'div', klass:'list-items'}, this),
+ var secondList = canvas.createNodeElement({tag: 'div', klass:'list-items'}),
toAdd = secondList;
if(listIsNested) {
@@ -584,7 +582,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') {
@@ -592,7 +590,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') {
@@ -600,7 +598,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
};
}
@@ -613,11 +611,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') {
@@ -626,7 +624,7 @@ $.extend(Cursor.prototype, {
}
else if(which === 'end') {
element = anchorElement;
- offset = selection.anchorOffset;
+ offset = selection.anchorOffset
}
}
} else {
@@ -640,11 +638,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
}
}
})