projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix msword paste
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
df50da3
..
e93cd47
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-26025,7
+26025,7
@@
Roo.htmleditor.Filter.prototype = {
Roo.each( Array.from(dom.childNodes), function( e ) {
switch(true) {
Roo.each( Array.from(dom.childNodes), function( e ) {
switch(true) {
- case e.nodeType == 8 &&
typeof(this.replaceComment) != 'undefined'
: // comment
+ case e.nodeType == 8 &&
this.replaceComment !== false
: // comment
this.replaceComment(e);
return;
this.replaceComment(e);
return;
@@
-26225,7
+26225,7
@@
Roo.extend(Roo.htmleditor.FilterBlack, Roo.htmleditor.Filter,
{
tag : true, // all elements.
{
tag : true, // all elements.
- replace : function(n)
+ replace
Tag
: function(n)
{
n.parentNode.removeChild(n);
}
{
n.parentNode.removeChild(n);
}
@@
-29207,7
+29207,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
// should be fonts..
});
new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
// should be fonts..
- new Roo.htmleditor.FilterKeepChildren({node : d, tag : [ 'FONT' ]} );
+ new Roo.htmleditor.FilterKeepChildren({node : d, tag : [ 'FONT'
, 'O:P'
]} );
new Roo.htmleditor.FilterParagraph({ node : d });
new Roo.htmleditor.FilterSpan({ node : d });
new Roo.htmleditor.FilterLongBr({ node : d });
new Roo.htmleditor.FilterParagraph({ node : d });
new Roo.htmleditor.FilterSpan({ node : d });
new Roo.htmleditor.FilterLongBr({ node : d });
@@
-30136,7
+30136,8
@@
Roo.HtmlEditorCore.black = [
'IFRAME', 'LAYER', 'LINK', 'META', 'OBJECT',
'SCRIPT', 'STYLE' ,'TITLE', 'XML',
//'FONT' // CLEAN LATER..
'IFRAME', 'LAYER', 'LINK', 'META', 'OBJECT',
'SCRIPT', 'STYLE' ,'TITLE', 'XML',
//'FONT' // CLEAN LATER..
- 'COLGROUP', 'COL' // messy tables.
+ 'COLGROUP', 'COL' // messy tables.
+
];
Roo.HtmlEditorCore.clean = [ // ?? needed???
];
Roo.HtmlEditorCore.clean = [ // ?? needed???