From da94c824fa036210c2024a39e19a556f64b7ed22 Mon Sep 17 00:00:00 2001 From: Gregory-K Date: Wed, 20 Jul 2022 22:14:28 +0300 Subject: [PATCH] > Fetch : fetch & merge official CardBook.xpi v76.4 :: [Rel.verUp 76.4.1] Source from .xpi release [Release version Up - 76.4.1] --- README.md | 2 +- src/README.md | 2 +- src/chrome/content/birthdays/cardbookBirthdaysUtils.js | 7 ++++--- src/chrome/content/birthdays/wdw_birthdayList.js | 3 ++- src/chrome/content/birthdays/wdw_birthdaySync.js | 1 + src/chrome/content/cardbookInit.js | 4 ++-- src/chrome/content/cardbookUtils.jsm | 2 +- .../content/configuration/wdw_cardbookConfiguration.xhtml | 4 ++-- src/manifest.json | 2 +- version.txt | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3643e12..687314a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ GitHub (main) - https://github.com/Gregory-K/CardBook.Alt.Icon GitLab (alt.) - https://gitlab.com/Gregory.K/CardBook.Alt.Icon Version: -**76.3.1** +**76.4.1** Compatibility: 91.0a1 <= Thunderbird version >= 91.* diff --git a/src/README.md b/src/README.md index 5c999bd..c5c91c7 100644 --- a/src/README.md +++ b/src/README.md @@ -5,7 +5,7 @@ This is a **fork** of [**CardBook**](https://gitlab.com/CardBook/CardBook), a [T **CardBook Alt.Icon** simply provides an **alternative** main **icon** more aligned with Thunderbird's toolbar icon design. Version: -**76.3.1** +**76.4.1** Icon Variation (sub-release): %sub_release% Compatibility: diff --git a/src/chrome/content/birthdays/cardbookBirthdaysUtils.js b/src/chrome/content/birthdays/cardbookBirthdaysUtils.js index 30c0dd1..9c5d7c7 100644 --- a/src/chrome/content/birthdays/cardbookBirthdaysUtils.js +++ b/src/chrome/content/birthdays/cardbookBirthdaysUtils.js @@ -324,7 +324,8 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) { } }, - loadBirthdays: function (lnumberOfDays) { + loadBirthdays: function (aNumberOfDays) { + aNumberOfDays = (aNumberOfDays > 365) ? 365 : aNumberOfDays; var myContact = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.addressBooksNameList"); var useOnlyEmail = cardbookRepository.cardbookPreferences.getBoolPref("extensions.cardbook.useOnlyEmail"); var search = {}; @@ -353,7 +354,7 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) { var isDate = cardbookRepository.cardbookDates.convertDateStringToDateUTC(myFieldValue, dateFormat); if (isDate != "WRONGDATE") { listOfEmail = cardbookRepository.cardbookUtils.getMimeEmailsFromCards([myCard], useOnlyEmail); - cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myFieldValue, myCard.fn, lnumberOfDays, myFieldValue, listOfEmail, myDirPrefId, name, fieldType[field]); + cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myFieldValue, myCard.fn, aNumberOfDays, myFieldValue, listOfEmail, myDirPrefId, name, fieldType[field]); } else { cardbookRepository.cardbookUtils.formatStringForOutput("dateEntry1Wrong", [myDirPrefName, myCard.fn, myFieldValue, dateFormat], "Warning"); } @@ -365,7 +366,7 @@ if ("undefined" == typeof(cardbookBirthdaysUtils)) { var isDate = cardbookRepository.cardbookDates.convertDateStringToDateUTC(myEvents.result[j][0], dateFormat); if (isDate != "WRONGDATE") { listOfEmail = cardbookRepository.cardbookUtils.getMimeEmailsFromCards([myCard], useOnlyEmail); - cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myEvents.result[j][0], myCard.fn, lnumberOfDays, myEvents.result[j][0], listOfEmail, myDirPrefId, name, myEvents.result[j][1]); + cardbookBirthdaysUtils.getAllBirthdaysByName(dateFormat, myEvents.result[j][0], myCard.fn, aNumberOfDays, myEvents.result[j][0], listOfEmail, myDirPrefId, name, myEvents.result[j][1]); } else { cardbookRepository.cardbookUtils.formatStringForOutput("dateEntry1Wrong", [myDirPrefName, myCard.fn, myEvents.result[j][0], dateFormat], "Warning"); } diff --git a/src/chrome/content/birthdays/wdw_birthdayList.js b/src/chrome/content/birthdays/wdw_birthdayList.js index b18a33b..5d5685a 100644 --- a/src/chrome/content/birthdays/wdw_birthdayList.js +++ b/src/chrome/content/birthdays/wdw_birthdayList.js @@ -147,6 +147,7 @@ if ("undefined" == typeof(wdw_birthdayList)) { let noneFound = document.getElementById("noneFound"); let resulTable = document.getElementById("birthdayListTable"); let maxDaysUntilNextBirthday = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.numberOfDaysForSearching"); + maxDaysUntilNextBirthday = (maxDaysUntilNextBirthday > 365) ? 365 : maxDaysUntilNextBirthday; // if there are no birthdays in the configured timespan if (cardbookBirthdaysUtils.lBirthdayList.length == 0) { @@ -172,7 +173,7 @@ if ("undefined" == typeof(wdw_birthdayList)) { }, displaySyncList: function() { - Services.wm.getMostRecentWindow("mail:3pane").openDialog("chrome://cardbook/content/birthdays/wdw_birthdaySync.xhtml", "", cardbookRepository.modalWindowParams); + Services.wm.getMostRecentWindow("mail:3pane").openDialog("chrome://cardbook/content/birthdays/wdw_birthdaySync.xhtml", "", cardbookRepository.windowParams); }, buttonShowing: function () { diff --git a/src/chrome/content/birthdays/wdw_birthdaySync.js b/src/chrome/content/birthdays/wdw_birthdaySync.js index 9534810..9a361c6 100644 --- a/src/chrome/content/birthdays/wdw_birthdaySync.js +++ b/src/chrome/content/birthdays/wdw_birthdaySync.js @@ -26,6 +26,7 @@ function do_refresh () { let noneFound = document.getElementById("noneFound"); let resulTable = document.getElementById("syncListTable"); let maxDaysUntilNextBirthday = cardbookRepository.cardbookPreferences.getStringPref("extensions.cardbook.numberOfDaysForWriting"); + maxDaysUntilNextBirthday = (maxDaysUntilNextBirthday > 365) ? 365 : maxDaysUntilNextBirthday; // if there are no birthdays in the configured timespan if (cardbookBirthdaysUtils.lBirthdayList.length == 0) { diff --git a/src/chrome/content/cardbookInit.js b/src/chrome/content/cardbookInit.js index 11c0a6d..bf4b02c 100644 --- a/src/chrome/content/cardbookInit.js +++ b/src/chrome/content/cardbookInit.js @@ -86,7 +86,7 @@ var cardbookInit = { prefs.setCharPref("periodicPopupIime", "08:00"); prefs.setBoolPref("showPopupEvenIfNoBirthday", true); prefs.setBoolPref("syncWithLightningOnStartup", false); - prefs.setCharPref("numberOfDaysForWriting", "366"); + prefs.setCharPref("numberOfDaysForWriting", "365"); // localized prefs.setCharPref("eventEntryTitle", cardbookRepository.extension.localeData.localizeMessage("eventEntryTitleMessage")); prefs.setCharPref("calendarEntryCategories", cardbookRepository.extension.localeData.localizeMessage("anniversaryCategory")); @@ -104,7 +104,7 @@ var cardbookInit = { prefs.setCharPref("accountShown", ""); prefs.setCharPref("uncategorizedCards", ""); prefs.setCharPref("categoryColors", ""); - prefs.setCharPref("addonVersion", "76.3.1"); + prefs.setCharPref("addonVersion", "76.4.1"); prefs.setCharPref("defaultRegion", "NOTSET"); prefs.setBoolPref("localDataEncryption", false); diff --git a/src/chrome/content/cardbookUtils.jsm b/src/chrome/content/cardbookUtils.jsm index 90d7aac..43239bc 100644 --- a/src/chrome/content/cardbookUtils.jsm +++ b/src/chrome/content/cardbookUtils.jsm @@ -668,7 +668,7 @@ var cardbookUtils = { } } }; - let aImageConnection = {connPrefId: aDirPrefId, connUrl: aImageURI, connDescription: aDirname}; + let aImageConnection = {connPrefId: aDirPrefId, connUrl: aImageURI, connDescription: aDirname, accessToken: "NOACCESSTOKEN"}; let request = new cardbookWebDAV(aImageConnection, listener_getimage); cardbookRepository.cardbookUtils.formatStringForOutput("serverCardGettingImage", [aDirname, aCardName]); request.getimage(); diff --git a/src/chrome/content/configuration/wdw_cardbookConfiguration.xhtml b/src/chrome/content/configuration/wdw_cardbookConfiguration.xhtml index da303e7..3cf66e4 100644 --- a/src/chrome/content/configuration/wdw_cardbookConfiguration.xhtml +++ b/src/chrome/content/configuration/wdw_cardbookConfiguration.xhtml @@ -805,7 +805,7 @@ accesskey="__MSG_numberOfDaysForSearchingAccesskey__" control="numberOfDaysForSearchingTextBox" id="numberOfDaysForSearchingLabel"/> - @@ -840,7 +840,7 @@ accesskey="__MSG_numberOfDaysForWritingAccesskey__" control="numberOfDaysForWritingTextBox" id="numberOfDaysForWritingLabel"/> - diff --git a/src/manifest.json b/src/manifest.json index 1849c46..a13f24a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "name": "__MSG_extName__ Alt.Icon", - "version": "76.3.1", + "version": "76.4.1", "description": "__MSG_extDesc__ -- An alternative icon version/fork (**CAUTION**: visit 'Homepage' bellow). --", "homepage_url": "https://github.com/Gregory-K/CardBook.Alt.Icon", "author": "Philippe VIGNEAU", diff --git a/version.txt b/version.txt index d5222a5..c04efc3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -76.3.1 +76.4.1