projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try and get ctrl-enter to add a clear all
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
4458d38
..
9b5db1e
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-21160,6
+21160,8
@@
Roo.htmleditor.Filter.prototype = {
return;
case this.tag === true: // everything
return;
case this.tag === true: // everything
+ case e.tagName.indexOf(":") > -1 && typeof(this.tag) == 'object' && this.tag.indexOf(":") > -1:
+ case e.tagName.indexOf(":") > -1 && typeof(this.tag) == 'string' && this.tag == ":":
case typeof(this.tag) == 'object' && this.tag.indexOf(e.tagName) > -1: // array and it matches.
case typeof(this.tag) == 'string' && this.tag == e.tagName: // array and it matches.
if (this.replaceTag && false === this.replaceTag(e)) {
case typeof(this.tag) == 'object' && this.tag.indexOf(e.tagName) > -1: // array and it matches.
case typeof(this.tag) == 'string' && this.tag == e.tagName: // array and it matches.
if (this.replaceTag && false === this.replaceTag(e)) {
@@
-21587,6
+21589,7
@@
Roo.htmleditor.FilterWord = function(cfg)
// no need to apply config.
this.replaceDocBullets(cfg.node);
// no need to apply config.
this.replaceDocBullets(cfg.node);
+ // this is disabled as the removal is done by other filters;
// this.walk(cfg.node);
// this.walk(cfg.node);
@@
-23316,7
+23319,16
@@
Roo.htmleditor.KeyEnter.prototype = {
var pc = range.closest([ 'ol', 'ul']);
var pli = range.closest('li');
if (!pc || e.ctrlKey) {
var pc = range.closest([ 'ol', 'ul']);
var pli = range.closest('li');
if (!pc || e.ctrlKey) {
- sel.insertNode('br', 'after');
+ // on it list, or ctrl pressed.
+ if (pc) {
+ sel.insertNode('br', 'after');
+ } else {
+ var br = doc.createElement('br');
+ br.className = 'clear';
+ br.setAttribute('style', 'clear:all');
+ sel.insertNode(br, 'after');
+ }
+
this.core.undoManager.addEvent();
this.core.fireEditorEvent(e);
this.core.undoManager.addEvent();
this.core.fireEditorEvent(e);
@@
-25791,7
+25803,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', '
O:P
' ]} );
+ new Roo.htmleditor.FilterKeepChildren({node : d, tag : [ 'FONT', '
:
' ]} );
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 });
@@
-26481,6
+26493,7
@@
Roo.extend(Roo.HtmlEditorCore, Roo.Component, {
cleanWord : function(node)
{
new Roo.htmleditor.FilterWord({ node : node ? node : this.doc.body });
cleanWord : function(node)
{
new Roo.htmleditor.FilterWord({ node : node ? node : this.doc.body });
+ new Roo.htmleditor.FilterKeepChildren({node : node ? node : this.doc.body, tag : [ 'FONT', ':' ]} );
},
},