Fix out-of-sync pinned drawer icons (#2944) * Fix out-of-sync pinned drawer icons * Ugly but consistent --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

c016319477632c929b382b242a08b6d18740b72f

Goshe-nite <112730817+Goshe-nite@users.noreply.github.com>

Signed
2 files changed, +20 -5Ignore whitespace
public/script.js+2 -2
@@ -10671,7 +10671,7 @@ jQuery(async function () {
10671 $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', async function () {10671 $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', async function () {
10672 await delay(50); $(this).closest('.drawer-content').removeClass('resizing');10672 await delay(50); $(this).closest('.drawer-content').removeClass('resizing');
10673 });10673 });
10674 $('.openIcon').toggleClass('closedIcon openIcon');10674 $('.openIcon').not('.drawerPinnedOpen').toggleClass('closedIcon openIcon');
10675 $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');10675 $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');
10676 icon.toggleClass('openIcon closedIcon');10676 icon.toggleClass('openIcon closedIcon');
10677 drawer.toggleClass('openDrawer closedDrawer');10677 drawer.toggleClass('openDrawer closedDrawer');
@@ -10757,7 +10757,7 @@ jQuery(async function () {
10757 $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', function () {10757 $('.openDrawer').not('.pinnedOpen').addClass('resizing').slideToggle(200, 'swing', function () {
10758 $(this).closest('.drawer-content').removeClass('resizing');10758 $(this).closest('.drawer-content').removeClass('resizing');
10759 });10759 });
10760 $('.openIcon').toggleClass('closedIcon openIcon');10760 $('.openIcon').not('.drawerPinnedOpen').toggleClass('closedIcon openIcon');
10761 $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');10761 $('.openDrawer').not('.pinnedOpen').toggleClass('closedDrawer openDrawer');
1076210762
10763 }10763 }
public/scripts/RossAscends-mods.js+18 -3
@@ -45,8 +45,11 @@ var LPanelPin = document.getElementById('lm_button_panel_pin');
45var WIPanelPin = document.getElementById('WI_panel_pin');45var WIPanelPin = document.getElementById('WI_panel_pin');
4646
47var RightNavPanel = document.getElementById('right-nav-panel');47var RightNavPanel = document.getElementById('right-nav-panel');
48var RightNavDrawerIcon = document.getElementById('rightNavDrawerIcon');
48var LeftNavPanel = document.getElementById('left-nav-panel');49var LeftNavPanel = document.getElementById('left-nav-panel');
50var LeftNavDrawerIcon = document.getElementById('leftNavDrawerIcon');
49var WorldInfo = document.getElementById('WorldInfo');51var WorldInfo = document.getElementById('WorldInfo');
52var WIDrawerIcon = document.getElementById('WIDrawerIcon');
5053
51var SelectedCharacterTab = document.getElementById('rm_button_selected_ch');54var SelectedCharacterTab = document.getElementById('rm_button_selected_ch');
5255
@@ -761,13 +764,15 @@ export function initRossMods() {
761 if ($(RPanelPin).prop('checked') == true) {764 if ($(RPanelPin).prop('checked') == true) {
762 //console.log('adding pin class to right nav');765 //console.log('adding pin class to right nav');
763 $(RightNavPanel).addClass('pinnedOpen');766 $(RightNavPanel).addClass('pinnedOpen');
767 $(RightNavDrawerIcon).addClass('drawerPinnedOpen');
764 } else {768 } else {
765 //console.log('removing pin class from right nav');769 //console.log('removing pin class from right nav');
766 $(RightNavPanel).removeClass('pinnedOpen');770 $(RightNavPanel).removeClass('pinnedOpen');
771 $(RightNavDrawerIcon).removeClass('drawerPinnedOpen');
767772
768 if ($(RightNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {773 if ($(RightNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {
769 $(RightNavPanel).slideToggle(200, 'swing');774 $(RightNavPanel).slideToggle(200, 'swing');
770 //$(rightNavDrawerIcon).toggleClass('openIcon closedIcon');775 $(RightNavDrawerIcon).toggleClass('openIcon closedIcon');
771 $(RightNavPanel).toggleClass('openDrawer closedDrawer');776 $(RightNavPanel).toggleClass('openDrawer closedDrawer');
772 }777 }
773 }778 }
@@ -777,13 +782,15 @@ export function initRossMods() {
777 if ($(LPanelPin).prop('checked') == true) {782 if ($(LPanelPin).prop('checked') == true) {
778 //console.log('adding pin class to Left nav');783 //console.log('adding pin class to Left nav');
779 $(LeftNavPanel).addClass('pinnedOpen');784 $(LeftNavPanel).addClass('pinnedOpen');
785 $(LeftNavDrawerIcon).addClass('drawerPinnedOpen');
780 } else {786 } else {
781 //console.log('removing pin class from Left nav');787 //console.log('removing pin class from Left nav');
782 $(LeftNavPanel).removeClass('pinnedOpen');788 $(LeftNavPanel).removeClass('pinnedOpen');
789 $(LeftNavDrawerIcon).removeClass('drawerPinnedOpen');
783790
784 if ($(LeftNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {791 if ($(LeftNavPanel).hasClass('openDrawer') && $('.openDrawer').length > 1) {
785 $(LeftNavPanel).slideToggle(200, 'swing');792 $(LeftNavPanel).slideToggle(200, 'swing');
786 //$(leftNavDrawerIcon).toggleClass('openIcon closedIcon');793 $(LeftNavDrawerIcon).toggleClass('openIcon closedIcon');
787 $(LeftNavPanel).toggleClass('openDrawer closedDrawer');794 $(LeftNavPanel).toggleClass('openDrawer closedDrawer');
788 }795 }
789 }796 }
@@ -794,14 +801,16 @@ export function initRossMods() {
794 if ($(WIPanelPin).prop('checked') == true) {801 if ($(WIPanelPin).prop('checked') == true) {
795 console.debug('adding pin class to WI');802 console.debug('adding pin class to WI');
796 $(WorldInfo).addClass('pinnedOpen');803 $(WorldInfo).addClass('pinnedOpen');
804 $(WIDrawerIcon).addClass('drawerPinnedOpen');
797 } else {805 } else {
798 console.debug('removing pin class from WI');806 console.debug('removing pin class from WI');
799 $(WorldInfo).removeClass('pinnedOpen');807 $(WorldInfo).removeClass('pinnedOpen');
808 $(WIDrawerIcon).removeClass('drawerPinnedOpen');
800809
801 if ($(WorldInfo).hasClass('openDrawer') && $('.openDrawer').length > 1) {810 if ($(WorldInfo).hasClass('openDrawer') && $('.openDrawer').length > 1) {
802 console.debug('closing WI after lock removal');811 console.debug('closing WI after lock removal');
803 $(WorldInfo).slideToggle(200, 'swing');812 $(WorldInfo).slideToggle(200, 'swing');
804 //$(WorldInfoDrawerIcon).toggleClass('openIcon closedIcon');813 $(WIDrawerIcon).toggleClass('openIcon closedIcon');
805 $(WorldInfo).toggleClass('openDrawer closedDrawer');814 $(WorldInfo).toggleClass('openDrawer closedDrawer');
806 }815 }
807 }816 }
@@ -812,20 +821,24 @@ export function initRossMods() {
812 if (LoadLocalBool('NavLockOn') == true) {821 if (LoadLocalBool('NavLockOn') == true) {
813 //console.log('setting pin class via local var');822 //console.log('setting pin class via local var');
814 $(RightNavPanel).addClass('pinnedOpen');823 $(RightNavPanel).addClass('pinnedOpen');
824 $(RightNavDrawerIcon).addClass('drawerPinnedOpen');
815 }825 }
816 if ($(RPanelPin).prop('checked')) {826 if ($(RPanelPin).prop('checked')) {
817 console.debug('setting pin class via checkbox state');827 console.debug('setting pin class via checkbox state');
818 $(RightNavPanel).addClass('pinnedOpen');828 $(RightNavPanel).addClass('pinnedOpen');
829 $(RightNavDrawerIcon).addClass('drawerPinnedOpen');
819 }830 }
820 // read the state of left Nav Lock and apply to leftnav classlist831 // read the state of left Nav Lock and apply to leftnav classlist
821 $(LPanelPin).prop('checked', LoadLocalBool('LNavLockOn'));832 $(LPanelPin).prop('checked', LoadLocalBool('LNavLockOn'));
822 if (LoadLocalBool('LNavLockOn') == true) {833 if (LoadLocalBool('LNavLockOn') == true) {
823 //console.log('setting pin class via local var');834 //console.log('setting pin class via local var');
824 $(LeftNavPanel).addClass('pinnedOpen');835 $(LeftNavPanel).addClass('pinnedOpen');
836 $(LeftNavDrawerIcon).addClass('drawerPinnedOpen');
825 }837 }
826 if ($(LPanelPin).prop('checked')) {838 if ($(LPanelPin).prop('checked')) {
827 console.debug('setting pin class via checkbox state');839 console.debug('setting pin class via checkbox state');
828 $(LeftNavPanel).addClass('pinnedOpen');840 $(LeftNavPanel).addClass('pinnedOpen');
841 $(LeftNavDrawerIcon).addClass('drawerPinnedOpen');
829 }842 }
830843
831 // read the state of left Nav Lock and apply to leftnav classlist844 // read the state of left Nav Lock and apply to leftnav classlist
@@ -833,11 +846,13 @@ export function initRossMods() {
833 if (LoadLocalBool('WINavLockOn') == true) {846 if (LoadLocalBool('WINavLockOn') == true) {
834 //console.log('setting pin class via local var');847 //console.log('setting pin class via local var');
835 $(WorldInfo).addClass('pinnedOpen');848 $(WorldInfo).addClass('pinnedOpen');
849 $(WIDrawerIcon).addClass('drawerPinnedOpen');
836 }850 }
837851
838 if ($(WIPanelPin).prop('checked')) {852 if ($(WIPanelPin).prop('checked')) {
839 console.debug('setting pin class via checkbox state');853 console.debug('setting pin class via checkbox state');
840 $(WorldInfo).addClass('pinnedOpen');854 $(WorldInfo).addClass('pinnedOpen');
855 $(WIDrawerIcon).addClass('drawerPinnedOpen');
841 }856 }
842857
843 //save state of Right nav being open or closed858 //save state of Right nav being open or closed