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
9ad7d68
..
9b5db1e
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-1400,9
+1400,10
@@
Roo.extend(Roo.data.DataProxy, Roo.util.Observable);
* @constructor
* @param {Object} config A config object containing the objects needed for the Store to access data,
*/
* @constructor
* @param {Object} config A config object containing the objects needed for the Store to access data,
*/
-Roo.data.MemoryProxy = function(data){
- if (typeof(data) != 'undefined' && typeof(data.data) != 'undefined') {
- data = data.data;
+Roo.data.MemoryProxy = function(config){
+ var data = config;
+ if (typeof(config) != 'undefined' && typeof(config.data) != 'undefined') {
+ data = config.data;
}
Roo.data.MemoryProxy.superclass.constructor.call(this);
this.data = data;
}
Roo.data.MemoryProxy.superclass.constructor.call(this);
this.data = data;
@@
-21159,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)) {
@@
-21586,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);
@@
-21706,7
+21710,7
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
var kv = s.split(":");
// what ever is left... we allow.
var kv = s.split(":");
// what ever is left... we allow.
- ret[kv[0]] = kv[1];
+ ret[kv[0]
.trim()
] = kv[1];
});
return ret;
},
});
return ret;
},
@@
-21733,7
+21737,9
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
var ns = p,
parent = p.parentNode,
doc = parent.ownerDocument,
var ns = p,
parent = p.parentNode,
doc = parent.ownerDocument,
- items = [];
+ items = [];
+
+
while (ns) {
if (ns.nodeType != 1) {
ns = ns.nextSibling;
while (ns) {
if (ns.nodeType != 1) {
ns = ns.nextSibling;
@@
-21744,14
+21750,16
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
}
items.push(ns);
ns = ns.nextSibling;
}
items.push(ns);
ns = ns.nextSibling;
-
}
}
+
+
var ul = parent.ownerDocument.createElement('ul'); // what about number lists...
parent.insertBefore(ul, p);
var lvl = 0;
var stack = [ ul ];
var last_li = false;
var ul = parent.ownerDocument.createElement('ul'); // what about number lists...
parent.insertBefore(ul, p);
var lvl = 0;
var stack = [ ul ];
var last_li = false;
- items.forEach(function(n) {
+
+ items.forEach(function(n, ipos) {
//Roo.log("got innertHMLT=" + n.innerHTML);
var spans = n.getElementsByTagName('span');
//Roo.log("got innertHMLT=" + n.innerHTML);
var spans = n.getElementsByTagName('span');
@@
-21783,12
+21791,16
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
return;
}
return;
}
- var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1;
+ var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1 ;
+
+
+
if (nlvl > lvl) {
//new indent
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
if (nlvl > lvl) {
//new indent
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
+
}
lvl = nlvl;
}
lvl = nlvl;
@@
-23307,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);
@@
-25782,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 });
@@
-26472,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', ':' ]} );
},
},
@@
-30800,7
+30822,7
@@
Roo.extend(Roo.form.Layout, Roo.Component, {
* a function which returns such a specification.
*/
/**
* a function which returns such a specification.
*/
/**
- * @cfg {String} labelAlign
+ * @cfg {String} labelAlign
(left|top|right)
* Valid values are "left," "top" and "right" (defaults to "left")
*/
/**
* Valid values are "left," "top" and "right" (defaults to "left")
*/
/**
@@
-30920,6
+30942,7
@@
Roo.extend(Roo.form.Layout, Roo.Component, {
}
});
}
});
+
/**
* @class Roo.form.Column
* @extends Roo.form.Layout
/**
* @class Roo.form.Column
* @extends Roo.form.Layout
@@
-30954,7
+30977,6
@@
Roo.extend(Roo.form.Column, Roo.form.Layout, {
}
});
}
});
-
/**
* @class Roo.form.Row
* @extends Roo.form.Layout
/**
* @class Roo.form.Row
* @extends Roo.form.Layout