fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hide icon for enumerated lists
[fnpeditor.git]
/
modules
/
documentCanvas
/
canvas
/
documentElement.js
diff --git
a/modules/documentCanvas/canvas/documentElement.js
b/modules/documentCanvas/canvas/documentElement.js
index
11e3471
..
7dd1f7d
100644
(file)
--- a/
modules/documentCanvas/canvas/documentElement.js
+++ b/
modules/documentCanvas/canvas/documentElement.js
@@
-109,6
+109,12
@@
$.extend(DocumentElement.prototype, {
return this.parents().some(function(parent) {
return parent.is('list');
});
return this.parents().some(function(parent) {
return parent.is('list');
});
+ },
+
+ exec: function(method) {
+ var manager = this.data('_wlxmlManager');
+ if(manager[method])
+ return manager[method].apply(manager, Array.prototype.slice.call(arguments, 1));
}
});
}
});
@@
-522,8
+528,9
@@
$.extend(DocumentTextElement.prototype, {
prev.setText(prev.getText() + this.getText() + next.getText());
next.detach();
} else if (prev || next) {
prev.setText(prev.getText() + this.getText() + next.getText());
next.detach();
} else if (prev || next) {
- var target = prev ? prev : next;
- target.setText(target.getText() + this.getText());
+ var target = prev ? prev : next,
+ newText = prev ? target.getText() + this.getText() : this.getText() + target.getText();
+ target.setText(newText);
} else {
parent.after(this);
}
} else {
parent.after(this);
}