X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2304fc9d1a391372a6714502fb769c9d1a5ed182..1c05401638473dda6f220b1a2111a439a7b9108e:/word/edit.plp

diff --git a/word/edit.plp b/word/edit.plp
index 0f212b8..4a6daaa 100644
--- a/word/edit.plp
+++ b/word/edit.plp
@@ -10,8 +10,6 @@ Html({
 	raw => <<'EOT',
 <link rel="stylesheet" type="text/css" media="all" href="/word/editor.css" />
 <script src="/word/editor.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/croppie/2.6.5/croppie.min.js"></script>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/croppie/2.6.5/croppie.min.css" />
 EOT
 });
 
@@ -113,7 +111,7 @@ my %wordcol = (
 	convert => {-label => 'Convert options', -json => 'image', -multiple => 1, -src => sub {
 		return "data/word/32/$_[0]->{id}.jpg";
 	}},
-	crop32  => {-label => 'Crop 3:2', -json => 'image'},
+	crop32  => {-json => 'image', type => 'hidden'}, # set by javascript interface
 	story   => {-label => 'Story', type => 'textarea', hidden => 'hidden'},
 );
 
@@ -154,7 +152,6 @@ elsif (defined $post{form}) {{
 		my @val = map { parseinput($_) } $post{'@'.$col}->@*;
 		my $val = $colinfo->{-multiple} && @val ? \@val : $val[-1];
 		if (my $jsoncol = $colinfo->{-json}) {
-			defined $val and
 			$row->{$jsoncol}->{$col} = $val;  # hash will be encoded
 		}
 		else {
@@ -162,7 +159,13 @@ elsif (defined $post{form}) {{
 		}
 	}
 	my $imagecol = $row->{image};  # backup image subcolumns
-	ref $_ eq 'HASH' and $_ = encode_json($_) for values %{$row};
+	while (my ($col, $val) = each %{$row}) {
+		# convert json subcolumns to database string
+		ref $val eq 'HASH' or next;
+		$val = { %{decode_json($_)}, %{$val} } for $replace->{$col} // ();  # preserve unknown
+		defined $val->{$_} or delete $val->{$_} for keys %{$val};  # delete emptied
+		$row->{$col} = encode_json($val);
+	}
 
 	if (!$row->{form} and $row->{lang}) {
 		if ($row->{ref} ne 'delete') {
@@ -262,9 +265,12 @@ for my $col (@wordcols) {
 		printf '<span class=inline>';
 		print $row->input($col => $attr);
 		if (my $imgsrc = $attr->{-src}) {
-			printf('<img id="%spreview" src="/%s" alt="%s"%s />',
-				$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>';