Skip to content

Commit

Permalink
Merge pull request #184 from HerrZatacke/develop
Browse files Browse the repository at this point in the history
Version 1.42.6
  • Loading branch information
HerrZatacke authored Sep 7, 2024
2 parents a2a9128 + 09ee42c commit 10145e3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gb-printer-web",
"version": "1.42.5",
"version": "1.42.6",
"description": "gb-printer-web",
"scripts": {
"start": "webpack serve --config ./scripts/webpack.dev.js",
Expand Down
22 changes: 10 additions & 12 deletions src/javascript/app/components/EditImageTabs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function EditImageTabs(props: Props) {
props.mixedTypes ? null : Tab.PALETTE,
props.regularImage ? Tab.FRAME : null,
Tab.TAGS,
props.meta ? Tab.MISC : null,
Tab.MISC,
].reduce(reduceItems<Tab>, []);

const [tab, setTab] = useState(tabs[0]);
Expand Down Expand Up @@ -179,17 +179,15 @@ function EditImageTabs(props: Props) {
<button type="button" className="edit-image-tabs__button">
Misc
</button>
{ props.meta ? (
<ImageMeta
created={props.created}
hash={props.hash}
hashes={props.hashes}
updateCreated={props.updateCreated}
meta={props.meta}
rotation={props.rotation}
updateRotation={props.updateRotation}
/>
) : null }
<ImageMeta
created={props.created}
hash={props.hash}
hashes={props.hashes}
updateCreated={props.updateCreated}
meta={props.meta}
rotation={props.rotation}
updateRotation={props.updateRotation}
/>
</li>
) : null}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/javascript/app/components/GalleryImage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function GalleryImage({ page, hash }: Props) {
}
}}
role="presentation"
title={JSON.stringify(galleryImageData, null, 2)}
title={enableDebug ? JSON.stringify(galleryImageData, null, 2) : undefined}
>
{
showButtons ? (
Expand Down

0 comments on commit 10145e3

Please sign in to comment.