Clean-up commented code
| @@ -5310,12 +5310,10 @@ | |||
| 5310 | <div class="flex-container flex1"> | 5310 | <div class="flex-container flex1"> |
| 5311 | <textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea> | 5311 | <textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea> |
| 5312 | </div> | 5312 | </div> |
| 5313 | <!-- <span class="world_entry_form_position_value"></span> --> | ||
| 5314 | <select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized❌ Disabled" title="WI Entry Status: 🔵 Constant 🟢 Normal 🔗 Vectorized ❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0"> | 5313 | <select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal🔗 Vectorized❌ Disabled" title="WI Entry Status: 🔵 Constant 🟢 Normal 🔗 Vectorized ❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0"> |
| 5315 | <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option> | 5314 | <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option> |
| 5316 | <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option> | 5315 | <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option> |
| 5317 | <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option> | 5316 | <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option> |
| 5318 | <!--<option value="disabled" title="Disabled" data-i18n="[title]WI_Entry_Status_Disabled">❌</option>--> | ||
| 5319 | </select> | 5317 | </select> |
| 5320 | </div> | 5318 | </div> |
| 5321 | <div class="WIEnteryHeaderControls flex-container"> | 5319 | <div class="WIEnteryHeaderControls flex-container"> |
| @@ -2872,42 +2872,22 @@ async function getWorldEntry(name, data, entry) { | |||
| 2872 | switch (value) { | 2872 | switch (value) { |
| 2873 | case 'constant': | 2873 | case 'constant': |
| 2874 | data.entries[uid].constant = true; | 2874 | data.entries[uid].constant = true; |
| 2875 | //data.entries[uid].disable = false; | ||
| 2876 | data.entries[uid].vectorized = false; | 2875 | data.entries[uid].vectorized = false; |
| 2877 | setWIOriginalDataValue(data, uid, 'enabled', true); | ||
| 2878 | setWIOriginalDataValue(data, uid, 'constant', true); | 2876 | setWIOriginalDataValue(data, uid, 'constant', true); |
| 2879 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); | 2877 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); |
| 2880 | //template.removeClass('disabledWIEntry'); | ||
| 2881 | break; | 2878 | break; |
| 2882 | case 'normal': | 2879 | case 'normal': |
| 2883 | data.entries[uid].constant = false; | 2880 | data.entries[uid].constant = false; |
| 2884 | //data.entries[uid].disable = false; | ||
| 2885 | data.entries[uid].vectorized = false; | 2881 | data.entries[uid].vectorized = false; |
| 2886 | setWIOriginalDataValue(data, uid, 'enabled', true); | ||
| 2887 | setWIOriginalDataValue(data, uid, 'constant', false); | 2882 | setWIOriginalDataValue(data, uid, 'constant', false); |
| 2888 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); | 2883 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); |
| 2889 | //template.removeClass('disabledWIEntry'); | ||
| 2890 | break; | 2884 | break; |
| 2891 | case 'vectorized': | 2885 | case 'vectorized': |
| 2892 | data.entries[uid].constant = false; | 2886 | data.entries[uid].constant = false; |
| 2893 | //data.entries[uid].disable = false; | ||
| 2894 | data.entries[uid].vectorized = true; | 2887 | data.entries[uid].vectorized = true; |
| 2895 | setWIOriginalDataValue(data, uid, 'enabled', true); | ||
| 2896 | setWIOriginalDataValue(data, uid, 'constant', false); | 2888 | setWIOriginalDataValue(data, uid, 'constant', false); |
| 2897 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', true); | 2889 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', true); |
| 2898 | //template.removeClass('disabledWIEntry'); | ||
| 2899 | break; | 2890 | break; |
| 2900 | /* | ||
| 2901 | case 'disabled': | ||
| 2902 | data.entries[uid].constant = false; | ||
| 2903 | data.entries[uid].disable = true; | ||
| 2904 | data.entries[uid].vectorized = false; | ||
| 2905 | setWIOriginalDataValue(data, uid, 'enabled', false); | ||
| 2906 | setWIOriginalDataValue(data, uid, 'constant', false); | ||
| 2907 | setWIOriginalDataValue(data, uid, 'extensions.vectorized', false); | ||
| 2908 | template.addClass('disabledWIEntry'); | ||
| 2909 | break; | ||
| 2910 | */ | ||
| 2911 | } | 2891 | } |
| 2912 | await saveWorldInfo(name, data); | 2892 | await saveWorldInfo(name, data); |
| 2913 | 2893 | ||
| @@ -2918,7 +2898,7 @@ async function getWorldEntry(name, data, entry) { | |||
| 2918 | entryKillSwitch.on('click', async function (event) { | 2898 | entryKillSwitch.on('click', async function (event) { |
| 2919 | const uid = entry.uid; | 2899 | const uid = entry.uid; |
| 2920 | data.entries[uid].disable = !data.entries[uid].disable; | 2900 | data.entries[uid].disable = !data.entries[uid].disable; |
| 2921 | let isActive = !data.entries[uid].disable; | 2901 | const isActive = !data.entries[uid].disable; |
| 2922 | setWIOriginalDataValue(data, uid, 'enabled', isActive); | 2902 | setWIOriginalDataValue(data, uid, 'enabled', isActive); |
| 2923 | template.toggleClass('disabledWIEntry', !isActive); | 2903 | template.toggleClass('disabledWIEntry', !isActive); |
| 2924 | entryKillSwitch.toggleClass('fa-toggle-off', !isActive); | 2904 | entryKillSwitch.toggleClass('fa-toggle-off', !isActive); |
| @@ -2928,9 +2908,6 @@ async function getWorldEntry(name, data, entry) { | |||
| 2928 | }); | 2908 | }); |
| 2929 | 2909 | ||
| 2930 | const entryState = function () { | 2910 | const entryState = function () { |
| 2931 | /* if (entry.disable === true) { | ||
| 2932 | return 'disabled'; | ||
| 2933 | } else */ | ||
| 2934 | if (entry.constant === true) { | 2911 | if (entry.constant === true) { |
| 2935 | return 'constant'; | 2912 | return 'constant'; |
| 2936 | } else if (entry.vectorized === true) { | 2913 | } else if (entry.vectorized === true) { |