fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smartxml: fix for Document.deleteText
[fnpeditor.git]
/
src
/
editor
/
modules
/
documentCanvas
/
canvas
/
keyboard.js
diff --git
a/src/editor/modules/documentCanvas/canvas/keyboard.js
b/src/editor/modules/documentCanvas/canvas/keyboard.js
index
f0439d6
..
71a50b0
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/keyboard.js
+++ b/
src/editor/modules/documentCanvas/canvas/keyboard.js
@@
-48,10
+48,10
@@
handlers.push({key: KEYS.ENTER,
if(Object.keys(cursor.getPosition()).length === 0) {
var currentElement = canvas.getCurrentNodeElement();
if(Object.keys(cursor.getPosition()).length === 0) {
var currentElement = canvas.getCurrentNodeElement();
- if(currentElement) {
+ if(currentElement
&& !currentElement.wlxmlNode.isRoot()
) {
canvas.wlxmlDocument.transaction(function() {
var added = currentElement.wlxmlNode.after({
canvas.wlxmlDocument.transaction(function() {
var added = currentElement.wlxmlNode.after({
- tagName: currentElement.
getWlxmlTag
() || 'div',
+ tagName: currentElement.
wlxmlNode.getTagName
() || 'div',
attrs: {'class': currentElement.getWlxmlClass() || 'p'}
});
added.append({text:''});
attrs: {'class': currentElement.getWlxmlClass() || 'p'}
});
added.append({text:''});
@@
-61,7
+61,7
@@
handlers.push({key: KEYS.ENTER,
description: gettext('Splitting text')
},
success: function(ret) {
description: gettext('Splitting text')
},
success: function(ret) {
- canvas.setCurrentElement(utils.
findCanvasElement
(ret), {caretTo: 'start'});
+ canvas.setCurrentElement(utils.
getElementForNode
(ret), {caretTo: 'start'});
}
});
}
});
@@
-77,7
+77,7
@@
handlers.push({key: KEYS.ENTER,
canvas.wlxmlDocument.transaction(function() {
var added = element.wlxmlNode.after(
canvas.wlxmlDocument.transaction(function() {
var added = element.wlxmlNode.after(
- {tagName: element.
getWlxmlTag
() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
+ {tagName: element.
wlxmlNode.getTagName
() || 'div', attrs: {'class': element.getWlxmlClass() || 'p'}}
);
added.append({text: ''});
return added;
);
added.append({text: ''});
return added;
@@
-86,7
+86,7
@@
handlers.push({key: KEYS.ENTER,
description: gettext('Splitting text')
},
success: function(ret) {
description: gettext('Splitting text')
},
success: function(ret) {
- canvas.setCurrentElement(utils.
findCanvasElement
(ret), {caretTo: 'start'});
+ canvas.setCurrentElement(utils.
getElementForNode
(ret), {caretTo: 'start'});
}
});
}
});
@@
-133,7
+133,7
@@
handlers.push({key: KEYS.ENTER,
gotoOptions = {caretTo: 'start'};
}
gotoOptions = {caretTo: 'start'};
}
- canvas.setCurrentElement(utils.
findCanvasElement
(goto), gotoOptions);
+ canvas.setCurrentElement(utils.
getElementForNode
(goto), gotoOptions);
}
}
}
}
}
}
@@
-152,7
+152,7
@@
handlers.push({keys: [KEYS.ARROW_UP, KEYS.ARROW_DOWN, KEYS.ARROW_LEFT, KEYS.ARRO
direction = 'below';
caretTo = 'start';
}
direction = 'below';
caretTo = 'start';
}
- var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom
()
[0]));
+ var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom[0]));
if(el) {
canvas.setCurrentElement(el, {caretTo: caretTo});
}
if(el) {
canvas.setCurrentElement(el, {caretTo: caretTo});
}