projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix word filter on html editor
[roojs1]
/
roojs-ui-debug.js
diff --git
a/roojs-ui-debug.js
b/roojs-ui-debug.js
index
4f5f9ac
..
4a9967c
100644
(file)
--- a/
roojs-ui-debug.js
+++ b/
roojs-ui-debug.js
@@
-21752,7
+21752,6
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
var lvl = 0;
var stack = [ ul ];
var last_li = false;
var lvl = 0;
var stack = [ ul ];
var last_li = false;
- var base_lvl = 0;
items.forEach(function(n) {
//Roo.log("got innertHMLT=" + n.innerHTML);
items.forEach(function(n) {
//Roo.log("got innertHMLT=" + n.innerHTML);
@@
-21786,20
+21785,18
@@
Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
return;
}
return;
}
- var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1;
+ var nlvl = Math.min(
+ stack.length-1,
+ (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1
+ );
if (nlvl > lvl) {
//new indent
if (nlvl > lvl) {
//new indent
- if (last_li) {
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
var nul = doc.createElement('ul'); // what about number lists...
last_li.appendChild(nul);
stack[nlvl] = nul;
- } else {
- // occurs when we get a level (1) but no parent - just put all the children on the top most..
- stack[nlvl] = stack[stack.length-1];
- }
}
lvl = nlvl;
}
lvl = nlvl;