diff --git a/admin/templates/default/mainscreen_message.xet b/admin/templates/default/mainscreen_message.xet index 1c05f0c3ae..c7fdd57f6b 100644 --- a/admin/templates/default/mainscreen_message.xet +++ b/admin/templates/default/mainscreen_message.xet @@ -4,13 +4,13 @@ diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js index 2320b643da..1a1a58e6b7 100644 --- a/api/js/etemplate/et2_widget_htmlarea.js +++ b/api/js/etemplate/et2_widget_htmlarea.js @@ -70,9 +70,15 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([ }, statusbar: { name: "Status bar", - description: "Enable/disable status bar on the bottom of ediotr", + description: "Enable/disable status bar on the bottom of editor", type: "boolean", default: true + }, + valid_children: { + name: "Valid children", + description: "Enables to control what child tag is allowed or not allowed of the present tag. For instance: +body[style], makes style tag allowed inside body", + type: "string", + default: "" } }, @@ -143,6 +149,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([ images_upload_handler: this.options.images_upload_handler, init_instance_callback : jQuery.proxy(this._instanceIsReady, this), auto_focus: false, + valid_children : this.options.valid_children, plugins: [ "print searchreplace autolink directionality ", "visualblocks visualchars image link media template ",