mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3415 from jjanssen/fix/1511

Browse Source 
Fixes hallotoolbar misplacement within StreamField StructBlock
This commit is contained in:
Bertrand Bordage 2017-04-08 21:06:51 +02:00 committed by GitHub
commit 49d804d831
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wagtail/wagtailadmin/static_src/wagtailadmin/js/hallo-bootstrap.js
View File

@ -27,10 +27,11 @@ function makeHalloRichTextEditable(id) {
}
var closestObj = input.closest('.object');
var isRoot = input.closest('.struct-block').length == 0;
richText.hallo({
toolbar: 'halloToolbarFixed',
toolbarCssClass: (closestObj.hasClass('full')) ? 'full' : (closestObj.hasClass('stream-field')) ? '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);