Merge branch 'master' into wip_alan_T6962_html_editor_update_to_new

[roojs1] / docs / json / roodata.json

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 2f1075e..179499e 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -239343,8 +239343,8 @@
   "Roo.form.HtmlEditor.ToolbarStandard" : {
     "props" : [
       {
-        "name" : "btns",
-        "type" : "Array",
+        "name" : "btns[]",
+        "type" : "Roo.Toolbar.Item|Roo.Toolbar.Button|Roo.Toolbar.SplitButton|Roo.form.Field",
         "desc" : "List of additional buttons.\n\n\nNEEDS Extra CSS? \n.x-html-editor-tb .x-edit-none .x-btn-text { background: none; }",
         "memberOf" : ""
       },