projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-ui.js
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
2a1b23d
..
6aadce8
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-23025,6
+23025,17
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
var remove_keep_children= Roo.HtmlEditorCore.remove.indexOf(node.tagName.toLowerCase()) > -1;
var remove_keep_children= Roo.HtmlEditorCore.remove.indexOf(node.tagName.toLowerCase()) > -1;
+
+ if (!node.attributes || !node.attributes.length) {
+
+ if (lcname == 'span' &&
+ node.childNodes.length == 1 &&
+ node.childNodes[0].nodeName.toLowerCase() = 'span'
+ ) {
+ remove_keep_children = true;
+ }
+ }
+
// remove <a name=....> as rendering on yahoo mailer is borked with this.
// this will have to be flaged elsewhere - perhaps ablack=name... on the mailer..
// remove <a name=....> as rendering on yahoo mailer is borked with this.
// this will have to be flaged elsewhere - perhaps ablack=name... on the mailer..
@@
-23045,6
+23056,10
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
}
if (!node.attributes || !node.attributes.length) {
}
if (!node.attributes || !node.attributes.length) {
+
+
+
+
this.cleanUpChildren(node);
return;
}
this.cleanUpChildren(node);
return;
}