mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 905097 - The final nail in the coffin of calUtils.js. r=MakeMyDay 

MozReview-Commit-ID: AGfDXZjSn2z

--HG--
rename : calendar/base/modules/calACLUtils.jsm => calendar/base/modules/utils/calACLUtils.jsm
rename : calendar/base/modules/calAlarmUtils.jsm => calendar/base/modules/utils/calAlarmUtils.jsm
rename : calendar/base/modules/calAsyncUtils.jsm => calendar/base/modules/utils/calAsyncUtils.jsm
rename : calendar/base/modules/calAuthUtils.jsm => calendar/base/modules/utils/calAuthUtils.jsm
rename : calendar/base/modules/calCategoryUtils.jsm => calendar/base/modules/utils/calCategoryUtils.jsm
rename : calendar/base/modules/calDataUtils.jsm => calendar/base/modules/utils/calDataUtils.jsm
rename : calendar/base/modules/calDateTimeUtils.jsm => calendar/base/modules/utils/calDateTimeUtils.jsm
rename : calendar/base/modules/calEmailUtils.jsm => calendar/base/modules/utils/calEmailUtils.jsm
rename : calendar/base/modules/calItemUtils.jsm => calendar/base/modules/utils/calItemUtils.jsm
rename : calendar/base/modules/calIteratorUtils.jsm => calendar/base/modules/utils/calIteratorUtils.jsm
rename : calendar/base/modules/calItipUtils.jsm => calendar/base/modules/utils/calItipUtils.jsm
rename : calendar/base/modules/calL10NUtils.jsm => calendar/base/modules/utils/calL10NUtils.jsm
rename : calendar/base/modules/calPrintUtils.jsm => calendar/base/modules/utils/calPrintUtils.jsm
rename : calendar/base/modules/calProviderUtils.jsm => calendar/base/modules/utils/calProviderUtils.jsm
rename : calendar/base/modules/calUnifinderUtils.jsm => calendar/base/modules/utils/calUnifinderUtils.jsm
rename : calendar/base/modules/calViewUtils.jsm => calendar/base/modules/utils/calViewUtils.jsm
rename : calendar/base/modules/calWindowUtils.jsm => calendar/base/modules/utils/calWindowUtils.jsm
rename : calendar/base/modules/calXMLUtils.jsm => calendar/base/modules/utils/calXMLUtils.jsm
extra : rebase_source : aaf55652f78ca295d04622aa072c287cd4ec0225
extra : intermediate-source : 89e7f20f7ec0e19d365a0ebf8a901e8c9e2c1cb0
extra : source : 4b5512291620703bcb7f52cc4801e5ad3fff8014
This commit is contained in:
Philipp Kewisch 2018-02-25 19:50:18 +01:00
Родитель 10d6091d85
Коммит 31db11a974
36 изменённых файлов: 320 добавлений и 85 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
calendar/.eslintrc.js
Просмотреть файл

@ -483,13 +483,13 @@ module.exports = {
},
"overrides": [{
files: [
"base/modules/calAuthUtils.jsm",
"base/modules/calEmailUtils.jsm",
"base/modules/calIteratorUtils.jsm",
"base/modules/calItipUtils.jsm",
"base/modules/calUnifinderUtils.jsm",
"base/modules/calL10NUtils.jsm",
"base/modules/calProviderUtils.jsm",
"base/modules/utils/calAuthUtils.jsm",
"base/modules/utils/calEmailUtils.jsm",
"base/modules/utils/calIteratorUtils.jsm",
"base/modules/utils/calItipUtils.jsm",
"base/modules/utils/calL10NUtils.jsm",
"base/modules/utils/calProviderUtils.jsm",
"base/modules/utils/calUnifinderUtils.jsm",
],
rules: {
"require-jsdoc": [2, { require: { ClassDeclaration: true } }],

1
calendar/base/content/calendar-month-view.xml
Просмотреть файл

@ -420,7 +420,6 @@
<implementation implements="calICalendarView">
<constructor><![CDATA[
ChromeUtils.import("resource://gre/modules/Preferences.jsm");
ChromeUtils.import("resource://calendar/modules/calViewUtils.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
// Set the preference for the default start of the week

1
calendar/base/content/calendar-task-tree.xml
Просмотреть файл

@ -116,7 +116,6 @@
ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
ChromeUtils.import("resource://calendar/modules/calItemUtils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// set up the tree filter

44
calendar/base/modules/calUtils.jsm
Просмотреть файл

@ -386,24 +386,24 @@ XPCOMUtils.defineLazyPreferenceGetter(cal, "debugLogEnabled", "calendar.debug.lo
XPCOMUtils.defineLazyPreferenceGetter(cal, "threadingEnabled", "calendar.threading.disabled", false);
// Sub-modules for calUtils
XPCOMUtils.defineLazyModuleGetter(cal, "acl", "resource://calendar/modules/calACLUtils.jsm", "calacl");
XPCOMUtils.defineLazyModuleGetter(cal, "alarms", "resource://calendar/modules/calAlarmUtils.jsm", "calalarms");
XPCOMUtils.defineLazyModuleGetter(cal, "async", "resource://calendar/modules/calAsyncUtils.jsm", "calasync");
XPCOMUtils.defineLazyModuleGetter(cal, "auth", "resource://calendar/modules/calAuthUtils.jsm", "calauth");
XPCOMUtils.defineLazyModuleGetter(cal, "category", "resource://calendar/modules/calCategoryUtils.jsm", "calcategory");
XPCOMUtils.defineLazyModuleGetter(cal, "data", "resource://calendar/modules/calDataUtils.jsm", "caldata");
XPCOMUtils.defineLazyModuleGetter(cal, "dtz", "resource://calendar/modules/calDateTimeUtils.jsm", "caldtz");
XPCOMUtils.defineLazyModuleGetter(cal, "email", "resource://calendar/modules/calEmailUtils.jsm", "calemail");
XPCOMUtils.defineLazyModuleGetter(cal, "item", "resource://calendar/modules/calItemUtils.jsm", "calitem");
XPCOMUtils.defineLazyModuleGetter(cal, "iterate", "resource://calendar/modules/calIteratorUtils.jsm", "caliterate");
XPCOMUtils.defineLazyModuleGetter(cal, "itip", "resource://calendar/modules/calItipUtils.jsm", "calitip");
XPCOMUtils.defineLazyModuleGetter(cal, "l10n", "resource://calendar/modules/calL10NUtils.jsm", "call10n");
XPCOMUtils.defineLazyModuleGetter(cal, "print", "resource://calendar/modules/calPrintUtils.jsm", "calprint");
XPCOMUtils.defineLazyModuleGetter(cal, "provider", "resource://calendar/modules/calProviderUtils.jsm", "calprovider");
XPCOMUtils.defineLazyModuleGetter(cal, "unifinder", "resource://calendar/modules/calUnifinderUtils.jsm", "calunifinder");
XPCOMUtils.defineLazyModuleGetter(cal, "view", "resource://calendar/modules/calViewUtils.jsm", "calview");
XPCOMUtils.defineLazyModuleGetter(cal, "window", "resource://calendar/modules/calWindowUtils.jsm", "calwindow");
XPCOMUtils.defineLazyModuleGetter(cal, "xml", "resource://calendar/modules/calXMLUtils.jsm", "calxml");
XPCOMUtils.defineLazyModuleGetter(cal, "acl", "resource://calendar/modules/utils/calACLUtils.jsm", "calacl");
XPCOMUtils.defineLazyModuleGetter(cal, "alarms", "resource://calendar/modules/utils/calAlarmUtils.jsm", "calalarms");
XPCOMUtils.defineLazyModuleGetter(cal, "async", "resource://calendar/modules/utils/calAsyncUtils.jsm", "calasync");
XPCOMUtils.defineLazyModuleGetter(cal, "auth", "resource://calendar/modules/utils/calAuthUtils.jsm", "calauth");
XPCOMUtils.defineLazyModuleGetter(cal, "category", "resource://calendar/modules/utils/calCategoryUtils.jsm", "calcategory");
XPCOMUtils.defineLazyModuleGetter(cal, "data", "resource://calendar/modules/utils/calDataUtils.jsm", "caldata");
XPCOMUtils.defineLazyModuleGetter(cal, "dtz", "resource://calendar/modules/utils/calDateTimeUtils.jsm", "caldtz");
XPCOMUtils.defineLazyModuleGetter(cal, "email", "resource://calendar/modules/utils/calEmailUtils.jsm", "calemail");
XPCOMUtils.defineLazyModuleGetter(cal, "item", "resource://calendar/modules/utils/calItemUtils.jsm", "calitem");
XPCOMUtils.defineLazyModuleGetter(cal, "iterate", "resource://calendar/modules/utils/calIteratorUtils.jsm", "caliterate");
XPCOMUtils.defineLazyModuleGetter(cal, "itip", "resource://calendar/modules/utils/calItipUtils.jsm", "calitip");
XPCOMUtils.defineLazyModuleGetter(cal, "l10n", "resource://calendar/modules/utils/calL10NUtils.jsm", "call10n");
XPCOMUtils.defineLazyModuleGetter(cal, "print", "resource://calendar/modules/utils/calPrintUtils.jsm", "calprint");
XPCOMUtils.defineLazyModuleGetter(cal, "provider", "resource://calendar/modules/utils/calProviderUtils.jsm", "calprovider");
XPCOMUtils.defineLazyModuleGetter(cal, "unifinder", "resource://calendar/modules/utils/calUnifinderUtils.jsm", "calunifinder");
XPCOMUtils.defineLazyModuleGetter(cal, "view", "resource://calendar/modules/utils/calViewUtils.jsm", "calview");
XPCOMUtils.defineLazyModuleGetter(cal, "window", "resource://calendar/modules/utils/calWindowUtils.jsm", "calwindow");
XPCOMUtils.defineLazyModuleGetter(cal, "xml", "resource://calendar/modules/utils/calXMLUtils.jsm", "calxml");
/**
* Returns a function that provides access to the given service.
@ -457,14 +457,6 @@ function shutdownCleanup(obj, prop) {
shutdownCleanup.mEntries.push({ mObj: obj, mProp: prop });
}
// Interim import of all symbols into cal:
// This should serve as a clean start for new code, e.g. new code could use
// cal.createDatetime instead of plain createDatetime NOW.
cal.loadScripts(["calUtils.js"], cal);
// Some functions in calUtils.js refer to other in the same file, thus include
// the code in global scope (although only visible to this module file), too:
cal.loadScripts(["calUtils.js"], Components.utils.getGlobalForObject(cal));
// Backwards compatibility for bug 905097. Please remove with Thunderbird 61.
ChromeUtils.import("resource://calendar/modules/calUtilsCompat.jsm");
injectCalUtilsCompat(cal);

65
calendar/base/modules/moz.build
Просмотреть файл

@ -3,30 +3,45 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES += [
'calACLUtils.jsm',
'calAlarmUtils.jsm',
'calAsyncUtils.jsm',
'calAuthUtils.jsm',
'calCategoryUtils.jsm',
'calDataUtils.jsm',
'calDateTimeUtils.jsm',
'calEmailUtils.jsm',
'calExtract.jsm',
'calHashedArray.jsm',
'calItemUtils.jsm',
'calIteratorUtils.jsm',
'calItipUtils.jsm',
'calL10NUtils.jsm',
'calPrintUtils.jsm',
'calProviderUtils.jsm',
'calRecurrenceUtils.jsm',
'calUnifinderUtils.jsm',
'calUtils.jsm',
'calUtilsCompat.jsm',
'calViewUtils.jsm',
'calWindowUtils.jsm',
'calXMLUtils.jsm',
'ical.js',
EXTRA_JS_MODULES.utils += [
'utils/calACLUtils.jsm',
'utils/calAlarmUtils.jsm',
'utils/calAsyncUtils.jsm',
'utils/calAuthUtils.jsm',
'utils/calCategoryUtils.jsm',
'utils/calDataUtils.jsm',
'utils/calDateTimeUtils.jsm',
'utils/calEmailUtils.jsm',
'utils/calItemUtils.jsm',
'utils/calIteratorUtils.jsm',
'utils/calItipUtils.jsm',
'utils/calL10NUtils.jsm',
'utils/calPrintUtils.jsm',
'utils/calProviderUtils.jsm',
'utils/calUnifinderUtils.jsm',
'utils/calViewUtils.jsm',
'utils/calWindowUtils.jsm',
'utils/calXMLUtils.jsm',
]
EXTRA_JS_MODULES += [
'shim/calAlarmUtils.jsm',
'shim/calAsyncUtils.jsm',
'shim/calAuthUtils.jsm',
'shim/calItemUtils.jsm',
'shim/calIteratorUtils.jsm',
'shim/calItipUtils.jsm',
'shim/calPrintUtils.jsm',
'shim/calProviderUtils.jsm',
'shim/calViewUtils.jsm',
'shim/calXMLUtils.jsm',
]
EXTRA_JS_MODULES += [
'calExtract.jsm',
'calHashedArray.jsm',
'calRecurrenceUtils.jsm',
'calUtils.jsm',
'calUtilsCompat.jsm',
'ical.js',
]

13
calendar/base/modules/shim/calAlarmUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calAlarmUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calAsyncUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calAsyncUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calAuthUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calAuthUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calItemUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calItemUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calIteratorUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calIteratorUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calItipUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calItipUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calPrintUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calPrintUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calProviderUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calProviderUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calViewUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calViewUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

13
calendar/base/modules/shim/calXMLUtils.jsm Normal file
Просмотреть файл

@ -0,0 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Deprecated.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
this.EXPORTED_SYMBOLS = ["cal"];
Deprecated.warning("calXMLUtils.jsm must no longer be imported directly, it" +
" is already available via calUtils.jsm",
"https://bugzilla.mozilla.org/show_bug.cgi?id=905097",
Components.stack.caller);

11
calendar/base/modules/calACLUtils.jsm → calendar/base/modules/utils/calACLUtils.jsm
Просмотреть файл

@ -3,7 +3,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Helpers for permission checks and other ACL features
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.acl namespace.
this.EXPORTED_SYMBOLS = ["calacl"]; /* exported calacl */

7
calendar/base/modules/calAlarmUtils.jsm → calendar/base/modules/utils/calAlarmUtils.jsm
Просмотреть файл

@ -7,6 +7,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Helpers for manipulating calendar alarms
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.alarm namespace.
this.EXPORTED_SYMBOLS = ["calalarms"]; /* exported calalarms */
var calalarms = {

5
calendar/base/modules/calAsyncUtils.jsm → calendar/base/modules/utils/calAsyncUtils.jsm
Просмотреть файл

@ -6,9 +6,12 @@ ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
/*
* Asynchronous tools for handling calendar operations.
* Asynchronous tools for handling calendar operations
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.async namespace.
this.EXPORTED_SYMBOLS = ["calasync"]; /* exported calasync */
var cIOL = Components.interfaces.calIOperationListener;

5
calendar/base/modules/calAuthUtils.jsm → calendar/base/modules/utils/calAuthUtils.jsm
Просмотреть файл

@ -9,9 +9,12 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Authentication helper code
* Authentication tools and prompts, mostly for providers
*/
// NOTE: This module should not be loaded directly, it is available when including
// calUtils.jsm under the cal.auth namespace.
this.EXPORTED_SYMBOLS = ["calauth"]; /* exported calauth */
var calauth = {

7
calendar/base/modules/calCategoryUtils.jsm → calendar/base/modules/utils/calCategoryUtils.jsm
Просмотреть файл

@ -7,6 +7,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Helpers for reading and writing calendar categories
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.category namespace.
this.EXPORTED_SYMBOLS = ["calcategory"]; /* exported calcategory */
var calcategory = {

7
calendar/base/modules/calDataUtils.jsm → calendar/base/modules/utils/calDataUtils.jsm
Просмотреть файл

@ -6,6 +6,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Data structures and algorithms used within the codebase
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.data namespace.
this.EXPORTED_SYMBOLS = ["caldata"]; /* exported caldata */
class PropertyMap extends Map {

14
calendar/base/modules/calDateTimeUtils.jsm → calendar/base/modules/utils/calDateTimeUtils.jsm
Просмотреть файл

@ -2,18 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/*
* date, time and timezone related functions via cal.dtz.*
*
* NOTE this module should never be imported directly. Instead, load
* calUtils.jsm and accss them via cal.dtz.*
*/
ChromeUtils.import("resource://gre/modules/Preferences.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Date, time and timezone related functions
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.dtz namespace.
this.EXPORTED_SYMBOLS = ["caldtz"]; /* exported caldtz */
var caldtz = {

7
calendar/base/modules/calEmailUtils.jsm → calendar/base/modules/utils/calEmailUtils.jsm
Просмотреть файл

@ -7,6 +7,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Functions for processing email addresses and sending email
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.email namespace.
this.EXPORTED_SYMBOLS = ["calemail"]; /* exported calemail */
var calemail = {

7
calendar/base/modules/calItemUtils.jsm → calendar/base/modules/utils/calItemUtils.jsm
Просмотреть файл

@ -11,6 +11,13 @@ ChromeUtils.import("resource://calendar/modules/calHashedArray.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Calendar item related functions
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.item namespace.
this.EXPORTED_SYMBOLS = ["calitem", "itemDiff"]; /* exported calitem, itemDiff */
var calitem = {

7
calendar/base/modules/calIteratorUtils.jsm → calendar/base/modules/utils/calIteratorUtils.jsm
Просмотреть файл

@ -8,6 +8,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Iterators for various data structures
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.iterate namespace.
this.EXPORTED_SYMBOLS = ["caliterate"]; /* exported caliterate */
var caliterate = {

10
calendar/base/modules/calItipUtils.jsm → calendar/base/modules/utils/calItipUtils.jsm
Просмотреть файл

@ -6,12 +6,18 @@ ChromeUtils.import("resource://gre/modules/Preferences.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
/**
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Scheduling and iTIP helper code
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.itip namespace.
this.EXPORTED_SYMBOLS = ["calitip"]; /* exported calitip */
var calitip = {
/**
* Gets the sequence/revision number, either of the passed item or the last received one of an

7
calendar/base/modules/calL10NUtils.jsm → calendar/base/modules/utils/calL10NUtils.jsm
Просмотреть файл

@ -4,6 +4,13 @@
ChromeUtils.import("resource://gre/modules/Services.jsm");
/*
* Localization and locale functions
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.l10n namespace.
this.EXPORTED_SYMBOLS = ["call10n"]; /* exported call10n */
/**

7
calendar/base/modules/calPrintUtils.jsm → calendar/base/modules/utils/calPrintUtils.jsm
Просмотреть файл

@ -7,6 +7,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Helpers for printing and print preparation
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.print namespace.
this.EXPORTED_SYMBOLS = ["calprint"]; /* exported calprint */
var calprint = {

5
calendar/base/modules/calProviderUtils.jsm → calendar/base/modules/utils/calProviderUtils.jsm
Просмотреть файл

@ -11,9 +11,12 @@ ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Provider helper code
* Helpers and base class for calendar providers
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.provider namespace.
this.EXPORTED_SYMBOLS = ["calprovider"]; /* exported calprovider */
var calprovider = {

7
calendar/base/modules/calUnifinderUtils.jsm → calendar/base/modules/utils/calUnifinderUtils.jsm
Просмотреть файл

@ -7,6 +7,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* Helpers for the unifinder
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.unifinder namespace.
this.EXPORTED_SYMBOLS = ["calunifinder"]; /* exported calunifinder */
var calunifinder = {

7
calendar/base/modules/calViewUtils.jsm → calendar/base/modules/utils/calViewUtils.jsm
Просмотреть файл

@ -6,6 +6,13 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
/*
* View and DOM related helper functions
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.view namespace.
this.EXPORTED_SYMBOLS = ["calview"]; /* exported calview */
var calview = {

7
calendar/base/modules/calWindowUtils.jsm → calendar/base/modules/utils/calWindowUtils.jsm
Просмотреть файл

@ -5,6 +5,13 @@
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
/*
* Calendar window helpers, e.g. to open our dialogs
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.window namespace.
this.EXPORTED_SYMBOLS = ["calwindow"]; /* exported calwindow */
var calwindow = {

9
calendar/base/modules/calXMLUtils.jsm → calendar/base/modules/utils/calXMLUtils.jsm
Просмотреть файл

@ -2,14 +2,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/** Helper functions for parsing and serializing XML */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
Cu.importGlobalProperties(["XMLSerializer", "XMLHttpRequest"]);
/*
* Helper functions for parsing and serializing XML
*/
// NOTE: This module should not be loaded directly, it is available when
// including calUtils.jsm under the cal.xml namespace.
this.EXPORTED_SYMBOLS = ["calxml"]; /* exported calxml */
var calxml = {

7
calendar/base/src/calUtils.js
Просмотреть файл

@ -1,7 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Goodbye, calUtils.js. You've been a great friend over the years. We'll miss
* you and wish you all the best for your departure in one of the next
* changesets. */

1
calendar/base/src/moz.build
Просмотреть файл

@ -46,7 +46,6 @@ FINAL_TARGET_FILES['calendar-js'] += [
'calTimezone.js',
'calTodo.js',
'calTransactionManager.js',
'calUtils.js',
'calWeekInfoService.js',
]

6
calendar/providers/gdata/modules/calUtilsShim.jsm
Просмотреть файл

@ -5,8 +5,10 @@
ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
// Load these modules, which will inject into calUtils.jsm on old versions, and
// just load an unused symbol on newer versions.
ChromeUtils.import("resource://calendar/modules/calAsyncUtils.jsm");
// silently fail on newer versions.
try {
ChromeUtils.import("resource://calendar/modules/calAsyncUtils.jsm");
} catch (e) {}
this.EXPORTED_SYMBOLS = ["cal"];