Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

Import from chromeutils #228

Merged
merged 2 commits into from
Dec 3, 2018
Merged

Import from chromeutils #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffee056
Components.utils.import() has changed to ChromeUtils.import(). The ol…
Trim Dec 1, 2018
f75d916
clean global var Cu since ChromeUtils is used instead of it
Trim Dec 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions addressbook/content/abCardOverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/mailServices.js");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
Cu.import("resource://exchangecommon/erGetAttachments.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangecommon/erGetAttachments.js");

var photoHandlerInline = {
onLoad: function _onLoad(aCard, aDocument) {
Expand Down
14 changes: 7 additions & 7 deletions addressbook/content/addressbookOverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/mailServices.js");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
Cu.import("resource://exchangecommon/erGetAttachments.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangecommon/erGetAttachments.js");

function exchAddressbookOverlay(aDocument, aWindow) {
this._document = aDocument;
Expand Down
2 changes: 1 addition & 1 deletion addressbook/content/exchangeContactSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;


function exchExchangeContactSettings(aDocument, aWindow) {
this._document = aDocument;
Expand Down
2 changes: 1 addition & 1 deletion addressbook/content/exchangeContactsInit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Expand Down
12 changes: 6 additions & 6 deletions addressbook/exchangeapi/erExpandDL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecExchangeRequest.js");
Cu.import("resource://exchangecommon/soapFunctions.js");
Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/soapFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = ["erExpandDLRequest"];

Expand Down
12 changes: 6 additions & 6 deletions addressbook/exchangeapi/erFindContacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
*
*
* ***** BEGIN LICENSE BLOCK *****/
var Cu = Components.utils;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecExchangeRequest.js");
Cu.import("resource://exchangecommon/soapFunctions.js");
Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/soapFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = ["erFindContactsRequest"];

Expand Down
12 changes: 6 additions & 6 deletions addressbook/exchangeapi/erGetContacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecExchangeRequest.js");
Cu.import("resource://exchangecommon/soapFunctions.js");
Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/soapFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = ["erGetContactsRequest"];

Expand Down
12 changes: 6 additions & 6 deletions addressbook/exchangeapi/erResolveNames.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecExchangeRequest.js");
Cu.import("resource://exchangecommon/soapFunctions.js");
Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/soapFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = ["erResolveNames"];

Expand Down
12 changes: 6 additions & 6 deletions addressbook/exchangeapi/erSyncContactsFolder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecExchangeRequest.js");
Cu.import("resource://exchangecommon/soapFunctions.js");
Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/soapFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = ["erSyncContactsFolderRequest"];

Expand Down
10 changes: 5 additions & 5 deletions addressbook/exchangeapi/exchangeAbFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/iteratorUtils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource:///modules/iteratorUtils.jsm");

Cu.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");

var EXPORTED_SYMBOLS = [];

Expand Down
6 changes: 3 additions & 3 deletions addressbook/interface/exchangeAbCard/mivExchangeAbCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

function mivExchangeAbCard() {

Expand Down
18 changes: 8 additions & 10 deletions addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,24 @@
*
*
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/mailServices.js");
Cu.import("resource:///modules/iteratorUtils.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/iteratorUtils.jsm");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");


function exchangeAbDirFactory() {}

exchangeAbDirFactory.prototype = {

classID: components.ID("{e6f8074c-0236-4f51-b8e2-9c528727b4ee}"),
classID: Components.ID("{e6f8074c-0236-4f51-b8e2-9c528727b4ee}"),
contractID: "@mozilla.org/addressbook/directory-factory;1?name=exchWebService-contactRoot-directory",
classDescription: "Exchange 2007/2010 Contacts DirFactory",

Expand Down
2 changes: 0 additions & 2 deletions addressbook/interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ interfaces exchangeAbDirFactory.xpt

component {e6f8074c-0236-4f51-b8e2-9c528727b4ee} exchangeAbDirFactory.js
contract @mozilla.org/addressbook/directory-factory;1?name=exchWebService-contactRoot-directory {e6f8074c-0236-4f51-b8e2-9c528727b4ee}


26 changes: 13 additions & 13 deletions addressbook/interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");

Cu.import("resource:///modules/mailServices.js");
Cu.import("resource:///modules/iteratorUtils.jsm");
ChromeUtils.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/iteratorUtils.jsm");

Cu.import("resource://exchangeaddress/erFindContacts.js");
Cu.import("resource://exchangeaddress/erGetContacts.js");
Cu.import("resource://exchangeaddress/erSyncContactsFolder.js");
Cu.import("resource://exchangeaddress/erExpandDL.js");
Cu.import("resource://exchangeaddress/erResolveNames.js");
ChromeUtils.import("resource://exchangeaddress/erFindContacts.js");
ChromeUtils.import("resource://exchangeaddress/erGetContacts.js");
ChromeUtils.import("resource://exchangeaddress/erSyncContactsFolder.js");
ChromeUtils.import("resource://exchangeaddress/erExpandDL.js");
ChromeUtils.import("resource://exchangeaddress/erResolveNames.js");

Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");

const nsIAP = Ci.nsIActivityProcess;
const nsIAE = Ci.nsIActivityEvent;
Expand Down
28 changes: 14 additions & 14 deletions addressbook/interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;
var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");

Cu.import("resource:///modules/mailServices.js");
Cu.import("resource:///modules/iteratorUtils.jsm");
ChromeUtils.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/iteratorUtils.jsm");

Cu.import("resource://exchangeaddress/erFindContacts.js");
Cu.import("resource://exchangeaddress/erGetContacts.js");
Cu.import("resource://exchangeaddress/erSyncContactsFolder.js");
Cu.import("resource://exchangeaddress/erExpandDL.js");
Cu.import("resource://exchangeaddress/erResolveNames.js");
ChromeUtils.import("resource://exchangeaddress/erFindContacts.js");
ChromeUtils.import("resource://exchangeaddress/erGetContacts.js");
ChromeUtils.import("resource://exchangeaddress/erSyncContactsFolder.js");
ChromeUtils.import("resource://exchangeaddress/erExpandDL.js");
ChromeUtils.import("resource://exchangeaddress/erResolveNames.js");

//Cu.import("resource://exchangeaddress/exchangeAbDistListDirectory.js");
//ChromeUtils.import("resource://exchangeaddress/exchangeAbDistListDirectory.js");

Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");

const nsIAP = Ci.nsIActivityProcess;
const nsIAE = Ci.nsIActivityEvent;
Expand Down
21 changes: 10 additions & 11 deletions addressbook/interface/exchangeAbRootDirectory/exchangeAbRootDirectory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,21 @@
*
*
* ***** BEGIN LICENSE BLOCK *****/
var Cc = Components.classes;

var Ci = Components.interfaces;
var Cu = Components.utils;

var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource://exchangecommon/ecFunctions.js");
Cu.import("resource://exchangecommon/ecExchangeRequest.js");
ChromeUtils.import("resource://exchangecommon/ecFunctions.js");
ChromeUtils.import("resource://exchangecommon/ecExchangeRequest.js");

Cu.import("resource:///modules/mailServices.js");
Cu.import("resource:///modules/iteratorUtils.jsm");
ChromeUtils.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/iteratorUtils.jsm");

Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
ChromeUtils.import("resource://exchangeaddress/exchangeAbFunctions.js");

//
// exchangeAbRootDirectory
Expand Down Expand Up @@ -83,7 +82,7 @@ function exchangeAbRootDirectory() {

exchangeAbRootDirectory.prototype = {

classID: components.ID("{227664eb-cce6-4b7a-8d57-0bb0c6c9b362}"),
classID: Components.ID("{227664eb-cce6-4b7a-8d57-0bb0c6c9b362}"),
contractID: "@mozilla.org/addressbook/directory;1?type=exchWebService-contactRoot-directory",
classDescription: "Exchange 2007/2010 Contacts Root Directory",

Expand Down
6 changes: 3 additions & 3 deletions addressbook/interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ var Cu = Components.utils;
var Cr = Components.results;
var components = Components;

Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");

Cu.import("resource:///modules/mailServices.js");
ChromeUtils.import("resource:///modules/mailServices.js");

function mivExchangeAutoCompleteResult() {

Expand Down
Loading