Skip to content

Commit bc9cbef

Browse files
mcmonkey4evamcmonkey4eva
committed
minor cleanings
1 parent 12a55fd commit bc9cbef

3 files changed

Lines changed: 37 additions & 40 deletions

File tree

‎src/Pages/_Generate/GenerateTab.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@
197197
<span class="text_button translate" onclick="imageFullView.close()">[Close]</span><br>
198198
</div>
199199
</div>
200-
<div class="modal modal-fullscreen imageview_popup_modal_background" id="image_compare_modal">
200+
<div class="modal modal-fullscreen image_compare_modal imageview_popup_modal_background" id="image_compare_modal">
201201
<div class="modal-dialog"></div>
202202
<div class="imageview_modal_inner_div">
203203
<div class="imageview_modal_imagewrap">
204-
<div class="image_compare_stage_side" id="image_compare_stage"></div>
204+
<div class="image_compare_stage image_compare_stage_side" id="image_compare_stage"></div>
205205
</div>
206206
<div class="imageview_popup_modal_undertext">
207207
<div id="image_compare_transparency_row" style="display: none;">

‎src/wwwroot/css/genpage.css‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -809,19 +809,19 @@ body {
809809
overflow: hidden;
810810
margin: auto;
811811
}
812-
#image_compare_modal .modal-dialog {
812+
.image_compare_modal .modal-dialog {
813813
display: none;
814814
}
815-
#image_compare_modal .imageview_modal_inner_div {
815+
.image_compare_modal .imageview_modal_inner_div {
816816
display: flex;
817817
flex-direction: column;
818818
height: 100vh;
819819
}
820-
#image_compare_modal .imageview_modal_imagewrap {
820+
.image_compare_modal .imageview_modal_imagewrap {
821821
flex: 1 1 auto;
822822
min-height: 0;
823823
}
824-
#image_compare_modal .imageview_popup_modal_undertext {
824+
.image_compare_modal .imageview_popup_modal_undertext {
825825
flex: 0 0 auto;
826826
min-height: 2rem;
827827
height: auto;
@@ -849,38 +849,38 @@ body {
849849
text-align: left;
850850
white-space: nowrap;
851851
}
852-
#image_compare_modal .image_fullview_extra_buttons {
852+
.image_compare_modal .image_fullview_extra_buttons {
853853
display: flex;
854854
align-items: center;
855855
}
856-
#image_compare_modal .image_fullview_extra_buttons [aria-pressed="true"] {
856+
.image_compare_modal .image_fullview_extra_buttons [aria-pressed="true"] {
857857
background-color: var(--button-background-hover);
858858
border-color: var(--emphasis);
859859
}
860-
#image_compare_stage {
860+
.image_compare_stage {
861861
width: 100%;
862862
height: 100%;
863863
min-height: 0;
864864
overflow: hidden;
865865
padding: 0;
866866
background-color: transparent;
867867
}
868-
#image_compare_stage.image_compare_stage_side {
868+
.image_compare_stage.image_compare_stage_side {
869869
display: grid;
870870
grid-template-columns: 1fr 1fr;
871871
grid-template-rows: 1fr;
872872
gap: 0;
873873
}
874-
#image_compare_stage.image_compare_stage_single {
874+
.image_compare_stage.image_compare_stage_single {
875875
display: block;
876876
}
877-
#image_compare_stage.image_compare_stage_side .image_compare_slot,
878-
#image_compare_stage.image_compare_stage_overlay .image_compare_slot,
879-
#image_compare_stage.image_compare_stage_single .image_compare_slot {
877+
.image_compare_stage.image_compare_stage_side .image_compare_slot,
878+
.image_compare_stage.image_compare_stage_overlay .image_compare_slot,
879+
.image_compare_stage.image_compare_stage_single .image_compare_slot {
880880
width: 100%;
881881
height: 100%;
882882
}
883-
#image_compare_stage .image_compare_slot {
883+
.image_compare_stage .image_compare_slot {
884884
position: relative;
885885
width: 100%;
886886
height: 100%;
@@ -890,7 +890,7 @@ body {
890890
text-align: left;
891891
cursor: grab;
892892
}
893-
#image_compare_stage .image_compare_media {
893+
.image_compare_stage .image_compare_media {
894894
width: auto;
895895
height: auto;
896896
max-width: 100%;
@@ -901,43 +901,43 @@ body {
901901
position: relative;
902902
margin: auto;
903903
}
904-
#image_compare_stage.image_compare_stage_overlay {
904+
.image_compare_stage.image_compare_stage_overlay {
905905
display: flex;
906906
}
907-
#image_compare_stage .image_compare_overlay {
907+
.image_compare_stage .image_compare_overlay {
908908
position: relative;
909909
width: 100%;
910910
height: 100%;
911911
overflow: hidden;
912912
--image-compare-split: 50%;
913913
cursor: grab;
914914
}
915-
#image_compare_stage .image_compare_overlay_layer {
915+
.image_compare_stage .image_compare_overlay_layer {
916916
position: absolute;
917917
inset: 0;
918918
overflow: hidden;
919919
pointer-events: none;
920920
}
921-
#image_compare_stage .image_compare_overlay_layer_left {
921+
.image_compare_stage .image_compare_overlay_layer_left {
922922
clip-path: inset(0 calc(100% - var(--image-compare-split)) 0 0);
923923
}
924-
#image_compare_stage .image_compare_overlay_layer_right {
924+
.image_compare_stage .image_compare_overlay_layer_right {
925925
clip-path: inset(0 0 0 var(--image-compare-split));
926926
}
927-
#image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_layer_left {
927+
.image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_layer_left {
928928
clip-path: inset(0 0 calc(100% - var(--image-compare-split)) 0);
929929
}
930-
#image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_layer_right {
930+
.image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_layer_right {
931931
clip-path: inset(var(--image-compare-split) 0 0 0);
932932
}
933-
#image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_left,
934-
#image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_right {
933+
.image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_left,
934+
.image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_right {
935935
clip-path: none;
936936
}
937-
#image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_right {
937+
.image_compare_stage .image_compare_overlay_transparency .image_compare_overlay_layer_right {
938938
opacity: var(--image-compare-transparency, 0.5);
939939
}
940-
#image_compare_stage .image_compare_overlay_divider {
940+
.image_compare_stage .image_compare_overlay_divider {
941941
position: absolute;
942942
top: 0;
943943
bottom: 0;
@@ -949,7 +949,7 @@ body {
949949
cursor: ew-resize;
950950
z-index: 2;
951951
}
952-
#image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_divider {
952+
.image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_divider {
953953
top: var(--image-compare-split);
954954
left: 0;
955955
right: 0;
@@ -958,7 +958,7 @@ body {
958958
transform: translateY(-50%);
959959
cursor: ns-resize;
960960
}
961-
#image_compare_stage .image_compare_overlay_divider::before {
961+
.image_compare_stage .image_compare_overlay_divider::before {
962962
content: '';
963963
position: absolute;
964964
top: 0;
@@ -968,14 +968,14 @@ body {
968968
background-color: var(--emphasis);
969969
box-shadow: 0 0 0.75rem var(--emphasis);
970970
}
971-
#image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_divider::before {
971+
.image_compare_stage .image_compare_overlay_slide_vertical .image_compare_overlay_divider::before {
972972
top: calc(50% - 1px);
973973
left: 0;
974974
right: 0;
975975
width: auto;
976976
height: 2px;
977977
}
978-
#image_compare_stage .image_compare_overlay_divider::after {
978+
.image_compare_stage .image_compare_overlay_divider::after {
979979
content: '';
980980
position: absolute;
981981
top: 50%;
@@ -988,7 +988,7 @@ body {
988988
pointer-events: none;
989989
}
990990
@media (max-width: 900px) {
991-
#image_compare_stage.image_compare_stage_side {
991+
.image_compare_stage.image_compare_stage_side {
992992
grid-template-columns: 1fr;
993993
grid-template-rows: 1fr 1fr;
994994
}

‎src/wwwroot/js/genpage/gentab/currentimagehandler.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,8 @@ function setCurrentImage(src, metadata = '', batchId = '', previewGrow = false,
942942
}
943943
return normalized;
944944
}
945-
function includeButton(name, action, extraClass = '', title = '', mediaTypes = null, can_multi = false, multi_only = false) {
946-
buttonDefs[normalizeButtonKey(name)] = { name, action, extraClass, title, mediaTypes, can_multi, multi_only };
945+
function includeButton(name, action, extraClass = '', title = '', mediaTypes = null) {
946+
buttonDefs[normalizeButtonKey(name)] = { name, action, extraClass, title, mediaTypes };
947947
}
948948
function includeLinkButton(name, href, isDownload = false, title = '', mediaTypes = null) {
949949
buttonDefs[normalizeButtonKey(name)] = { name, href, is_download: isDownload, title, mediaTypes };
@@ -973,9 +973,6 @@ function setCurrentImage(src, metadata = '', batchId = '', previewGrow = false,
973973
}
974974
}
975975
for (let def of Object.values(buttonDefs)) {
976-
if (def.multi_only) {
977-
continue;
978-
}
979976
if (def.mediaTypes && !def.mediaTypes.includes(mediaType)) {
980977
continue;
981978
}
@@ -1160,14 +1157,14 @@ function setCurrentImage(src, metadata = '', batchId = '', previewGrow = false,
11601157
}, '', 'Jumps the History browser to where this file is at.');
11611158
}
11621159
for (let added of buttonsForImage(imagePathClean, src, metadata, true)) {
1163-
if (added.label == 'Star' || added.label == 'Unstar') {
1160+
if (added.label == 'Star' || added.label == 'Unstar' || added.multi_only) {
11641161
continue;
11651162
}
11661163
if (added.href) {
11671164
includeLinkButton(added.label, added.href, added.is_download, added.title);
11681165
}
11691166
else {
1170-
includeButton(added.label, added.onclick, '', added.title, null, added.can_multi, added.multi_only);
1167+
includeButton(added.label, added.onclick, '', added.title, null);
11711168
}
11721169
}
11731170
renderButtonsFromDefs();
@@ -1403,7 +1400,7 @@ class ImageCompareHelper {
14031400
constructor() {
14041401
this.zoomRate = 1.1;
14051402
this.modal = getRequiredElementById('image_compare_modal');
1406-
this.modalJq = $('#image_compare_modal');
1403+
this.modalJq = $(this.modal);
14071404
this.stage = getRequiredElementById('image_compare_stage');
14081405
document.addEventListener('click', (e) => {
14091406
if (e.target.tagName == 'BODY') {

0 commit comments

Comments
 (0)