word/edit: image container only needed for source

diff --git a/word/edit.plp b/word/edit.plp
index 40bf8afbb97547b3b3639261d4db4d3ded4fd2af..f41b0ab787a387c1f5fd33d904edc4bc08fa5c2a 100644 (file)
--- a/word/edit.plp
+++ b/word/edit.plp
@@ -260,9 +260,12 @@ for my $col (@wordcols) {
                printf '<span class=inline>';
                print $row->input($col => $attr);
                if (my $imgsrc = $attr->{-src}) {
-                       printf('<span id="%spreview"><img src="/%s" alt="%s"%s /></span>',
-                               $col, $_, $row->{form}, $col eq 'source' && ' hidden'
+                       my $hide = $col eq 'source';
+                       printf '<span id="%spreview">', $col unless $hide;
+                       printf('<img src="/%s" alt="%s"%s />',
+                               $_, $row->{form}, $hide && qq( id="${col}preview" hidden)
                        ) for grep { -e } $imgsrc->($row);
+                       printf '</span>' unless $hide;
                }
                print $row->input($_ => delete $wordcol{$_}) for @span;
                print '</span>';

diff --git a/word/editor.js b/word/editor.js
index c71faa50b1929153f419e69e7b9144fea69a32e9..a4b8d8edab037f4923eef8bfc6d1338cb8c38cb3 100644 (file)
--- a/word/editor.js
+++ b/word/editor.js
@@ -184,7 +184,7 @@ document.addEventListener('DOMContentLoaded', () => {
                                recrop();
                        }
 
-                       imgselect.src = imgpreview.children[0].src;
+                       imgselect.src = imgpreview.src;
                        imgselect.style.cursor = 'grab';
                        imgselect.style.position = 'absolute';
                        recrop();