fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Represent empty wlxml nodes as DocumentNodeElement with empty DocumentTextElement
[fnpeditor.git]
/
modules
/
documentCanvas
/
canvas
/
canvas.js
diff --git
a/modules/documentCanvas/canvas/canvas.js
b/modules/documentCanvas/canvas/canvas.js
index
0041f6c
..
a65375e
100644
(file)
--- a/
modules/documentCanvas/canvas/canvas.js
+++ b/
modules/documentCanvas/canvas/canvas.js
@@
-42,7
+42,8
@@
$.extend(Canvas.prototype, {
klass: currentTag.attr('class'),
meta: meta,
others: others,
klass: currentTag.attr('class'),
meta: meta,
others: others,
- rawChildren: currentTag.contents()
+ rawChildren: currentTag.contents(),
+ prepopulateOnEmpty: true
}, canvas);
['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
}, canvas);
['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) {
@@
-71,7
+72,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';
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) {
return true; // continue
var addInfo = function(toAdd, where) {
@@
-245,7
+246,7
@@
$.extend(Canvas.prototype, {
var parent = element.parent(),
grandParent = parent ? parent.parent() : null,
goto;
var parent = element.parent(),
grandParent = parent ? parent.parent() : null,
goto;
- if(parent.children().length === 1) {
+ if(parent.children().length === 1
&& parent.children()[0].sameNode(element)
) {
if(grandParent && grandParent.children().length === 1) {
goto = grandParent.append({text: ''});
} else {
if(grandParent && grandParent.children().length === 1) {
goto = grandParent.append({text: ''});
} else {
@@
-257,6
+258,7
@@
$.extend(Canvas.prototype, {
element.detach();
}
canvas.setCurrentElement(goto, {caretTo: caretTo});
element.detach();
}
canvas.setCurrentElement(goto, {caretTo: caretTo});
+ canvas.publisher('contentChanged');
}
else if(cursorAtOperationEdge) {
// todo
}
else if(cursorAtOperationEdge) {
// todo
@@
-604,7
+606,8
@@
$.extend(Canvas.prototype.list, {
var toret;
if(parent.is('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;
toret = listElement.parent();
} else {
toret = listElement;