From 2d38f23fb09c4928fee8319ba296a8ceeaaa9e96 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 4 Mar 2015 09:23:34 +0000 Subject: [PATCH] ensuring autosize fires. styling field --- .../static/wagtailadmin/scss/layouts/page-editor.scss | 3 ++- wagtail/wagtailadmin/widgets.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index 241932c84..1263cdb40 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -267,7 +267,8 @@ } .struct-block .widget-text_input > label, - .struct-block .widget-textarea > label{ + .struct-block .widget-textarea > label, + .struct-block .widget-admin_auto_height_text_input > label{ display:none; } diff --git a/wagtail/wagtailadmin/widgets.py b/wagtail/wagtailadmin/widgets.py index 69282378d..6a2f146b4 100644 --- a/wagtail/wagtailadmin/widgets.py +++ b/wagtail/wagtailadmin/widgets.py @@ -17,14 +17,15 @@ from taggit.forms import TagWidget class AdminAutoHeightTextInput(WidgetWithScript, widgets.Textarea): def __init__(self, attrs=None): - # Use slightly better defaults than HTML's 20x2 box + # Use more appropriate rows default, given autoheight will alter this anyway default_attrs = {'rows': '1'} if attrs: default_attrs.update(attrs) + super(AdminAutoHeightTextInput, self).__init__(default_attrs) def render_js_init(self, id_, name, value): - return '$("#{0}").autosize();'.format(json.dumps(id_)) + return '$("#{0}").autosize();'.format(id_) class AdminDateInput(WidgetWithScript, widgets.DateInput): def render_js_init(self, id_, name, value):