projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ea10fd
)
Roo/form/HtmlEditor.js
author
Alan Knowles
<alan@roojs.com>
Tue, 20 Aug 2013 04:54:06 +0000
(12:54 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 20 Aug 2013 04:54:06 +0000
(12:54 +0800)
Roo/form/HtmlEditor.js
patch
|
blob
|
history
diff --git
a/Roo/form/HtmlEditor.js
b/Roo/form/HtmlEditor.js
index
2985c20
..
5509bcb
100644
(file)
--- a/
Roo/form/HtmlEditor.js
+++ b/
Roo/form/HtmlEditor.js
@@
-163,7
+163,10
@@
Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
}
for (var i =0 ; i < editor.toolbars.length;i++) {
- editor.toolbars[i] = Roo.factory(editor.toolbars[i], Roo.form.HtmlEditor);
+ editor.toolbars[i] = Roo.factory(
+ typeof(editor.toolbars[i]) == 'string' ?
+ { xtype: editor.toolbars[i]} : editor.toolbars[i],
+ Roo.form.HtmlEditor);
editor.toolbars[i].init(editor);
}