From: Mischa POSLAWSKY Date: Sun, 15 Aug 2021 02:38:21 +0000 (+0200) Subject: word/edit: hide unset story or keep existing X-Git-Tag: v1.13~163 X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/e41485bf89a7d29b3732f49596ec8b460f51c2ef word/edit: hide unset story or keep existing --- diff --git a/writer.js b/writer.js index 5d3ad5e..6fc79eb 100644 --- a/writer.js +++ b/writer.js @@ -40,8 +40,8 @@ document.addEventListener('DOMContentLoaded', () => { // copy first paragraph to story let wptext = json.parse.text['*']; let storyinput = document.getElementById('story'); - if (storyinput && wptext) { - storyinput.innerHTML = wptext + if (storyinput && !storyinput.value && wptext) { + storyinput.value = wptext .replace(//sg, '') // ignore infobox .match(/

(.*?)<\/p>/s)[0] // first paragraph diff --git a/writer.plp b/writer.plp index a5aa431..c6d5898 100644 --- a/writer.plp +++ b/writer.plp @@ -105,7 +105,7 @@ my %wordcol = ( thumb => {-label => 'Convert options', -multiple => 1, -src => sub { return "data/word/en/$_[0]->{id}.jpg"; }}, - story => {-label => 'Story', type => 'textarea'}, + story => {-label => 'Story', type => 'textarea', hidden => 'hidden'}, ); if (my $search = $fields{q}) { @@ -228,6 +228,7 @@ bless $row, 'Shiar_Sheet::FormRow'; for my $col (@wordcols) { my $info = $wordcol{$col} or next; my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info; + next if delete $attr->{hidden} and not $row->{$col}; my $title = ref $attr ? delete $attr->{-label} : $attr; printf '

  • ', $col, $title; printf '';