mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

File renaming: Fix empty value being added when all types are disabled

Browse source 
And filter out empty values in isRenameAllowedForType() in order to
handle bad pref values set before this commit.

Follow-up to aab90527ec
This commit is contained in:
Abe Jellinek 2024-08-01 10:30:21 -04:00
parent aab90527ec
commit 6cb6dd3bb5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/preferences/preferences_general.js
View file

@ -219,7 +219,11 @@ Zotero_Preferences.General = {
setAutoRenameFileTypes: function () { setAutoRenameFileTypes: function () {
let typesBox = document.getElementById('zotero-prefpane-file-renaming-file-types-box'); let typesBox = document.getElementById('zotero-prefpane-file-renaming-file-types-box');
let enabledTypes = new Set(Zotero.Prefs.get('autoRenameFiles.fileTypes').split(',')); let enabledTypes = new Set(
Zotero.Prefs.get('autoRenameFiles.fileTypes')
.split(',')
.filter(Boolean)
);
for (let checkbox of typesBox.querySelectorAll('checkbox')) { for (let checkbox of typesBox.querySelectorAll('checkbox')) {
if (checkbox.checked) { if (checkbox.checked) {
enabledTypes.add(checkbox.dataset.contentType); enabledTypes.add(checkbox.dataset.contentType);

6
chrome/content/zotero/xpcom/attachments.js
View file

@ -2479,9 +2479,9 @@ Zotero.Attachments = new function () {
this.isRenameAllowedForType = function (contentType) { this.isRenameAllowedForType = function (contentType) {
let typePrefixes; let typePrefixes;
try { try {
let prefValue = Zotero.Prefs.get('autoRenameFiles.fileTypes'); typePrefixes = Zotero.Prefs.get('autoRenameFiles.fileTypes')
if (!prefValue) return false; .split(',')
typePrefixes = prefValue.split(','); .filter(Boolean);
} }
catch (e) { catch (e) {
typePrefixes = []; typePrefixes = [];