From 0f39001e46e94ab01fb8cbb4a537648d530d6942 Mon Sep 17 00:00:00 2001 From: Janneke Janssen Date: Tue, 28 Feb 2017 21:15:06 +0100 Subject: [PATCH 1/2] Fixes hallotoolbar misplacement within StreamField StructBlock --- .../wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js index a3e94ef4cf..7af2774031 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js @@ -27,10 +27,11 @@ function makeHalloRichTextEditable(id) { } var closestObj = input.closest('.object'); + var isDeepNested = input.closest('.struct-block').length; richText.hallo({ toolbar: 'halloToolbarFixed', - toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field')) ? 'stream-field' : '', + toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field') && !isDeepNested) ? 'stream-field' : '', plugins: halloPlugins }).bind('hallomodified', function(event, data) { input.val(data.content); From b4beb864dd7642dc0b662db4c519ff4b03f8ba66 Mon Sep 17 00:00:00 2001 From: Janneke Janssen Date: Sat, 8 Apr 2017 15:44:58 +0200 Subject: [PATCH 2/2] Update PR with feedback --- .../static_src/wagtailadmin/js/hallo-bootstrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js index 7af2774031..0bbe7852d8 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js @@ -27,11 +27,11 @@ function makeHalloRichTextEditable(id) { } var closestObj = input.closest('.object'); - var isDeepNested = input.closest('.struct-block').length; + var isRoot = input.closest('.struct-block').length == 0; richText.hallo({ toolbar: 'halloToolbarFixed', - toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field') && !isDeepNested) ? 'stream-field' : '', + toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field') && isRoot) ? 'stream-field' : '', plugins: halloPlugins }).bind('hallomodified', function(event, data) { input.val(data.content);