Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1524688: Part 13 - Convert satchel to static registration. r=MattN

Browse Source 
--HG--
rename : toolkit/components/satchel/nsFormAutoComplete.js => toolkit/components/satchel/FormAutoComplete.jsm
rename : toolkit/components/satchel/FormHistoryStartup.js => toolkit/components/satchel/FormHistoryStartup.jsm
rename : toolkit/components/satchel/nsInputListAutoComplete.js => toolkit/components/satchel/InputListAutoComplete.jsm
extra : source : b586d55d76d5012f0e4a471f4c207a8ae09cc393
This commit is contained in:
Kris Maglione 2019-01-29 20:17:06 -08:00
parent e6f5752217
commit 67d05bba35
8 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/installer/package-manifest.in
View File

@ -233,10 +233,6 @@
@RESPATH@/components/HandlerService.js
@RESPATH@/components/nsWebHandlerApp.manifest
@RESPATH@/components/nsWebHandlerApp.js
@RESPATH@/components/satchel.manifest
@RESPATH@/components/nsFormAutoComplete.js
@RESPATH@/components/FormHistoryStartup.js
@RESPATH@/components/nsInputListAutoComplete.js
@RESPATH@/components/contentAreaDropListener.manifest
@RESPATH@/components/contentAreaDropListener.js
#ifdef XP_MACOSX

4
mobile/android/installer/package-manifest.in
View File

@ -165,10 +165,6 @@
@BINPATH@/components/HandlerService.js
@BINPATH@/components/nsWebHandlerApp.manifest
@BINPATH@/components/nsWebHandlerApp.js
@BINPATH@/components/satchel.manifest
@BINPATH@/components/nsFormAutoComplete.js
@BINPATH@/components/FormHistoryStartup.js
@BINPATH@/components/nsInputListAutoComplete.js
@BINPATH@/components/contentAreaDropListener.manifest
@BINPATH@/components/contentAreaDropListener.js
@BINPATH@/components/servicesComponents.manifest

3
toolkit/components/satchel/nsFormAutoComplete.js → toolkit/components/satchel/FormAutoComplete.jsm
View File

@ -5,7 +5,6 @@
"use strict";
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
function isAutocompleteDisabled(aField) {
@ -622,4 +621,4 @@ FormAutoCompleteResult.prototype = {
},
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FormAutoComplete]);
var EXPORTED_SYMBOLS = ["FormAutoComplete"];

3
toolkit/components/satchel/FormHistoryStartup.js → toolkit/components/satchel/FormHistoryStartup.jsm
View File

@ -2,7 +2,6 @@
* 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/. */
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(this, "FormHistory",
@ -134,4 +133,4 @@ FormHistoryStartup.prototype = {
},
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FormHistoryStartup]);
var EXPORTED_SYMBOLS = ["FormHistoryStartup"];

4
toolkit/components/satchel/nsInputListAutoComplete.js → toolkit/components/satchel/InputListAutoComplete.jsm
View File

@ -2,7 +2,6 @@
* 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/. */
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const {FormAutoCompleteResult} =
ChromeUtils.import("resource://gre/modules/nsFormAutoCompleteResult.jsm");
@ -62,5 +61,4 @@ InputListAutoComplete.prototype = {
},
};
var component = [InputListAutoComplete];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(component);
var EXPORTED_SYMBOLS = ["InputListAutoComplete"];

20
toolkit/components/satchel/components.conf
View File

@ -14,4 +14,24 @@ Classes = [
'type': 'nsFormFillController',
'headers': ['/toolkit/components/satchel/nsFormFillController.h'],
},
{
'cid': '{c11c21b2-71c9-4f87-a0f8-5e13f50495fd}',
'contract_ids': ['@mozilla.org/satchel/form-autocomplete;1'],
'jsm': 'resource://gre/modules/FormAutoComplete.jsm',
'constructor': 'FormAutoComplete',
},
{
'cid': '{bf1e01d0-953e-11df-981c-0800200c9a66}',
'contract_ids': ['@mozilla.org/satchel/inputlist-autocomplete;1'],
'jsm': 'resource://gre/modules/InputListAutoComplete.jsm',
'constructor': 'InputListAutoComplete',
},
{
'cid': '{3a0012eb-007f-4bb8-aa81-a07385f77a25}',
'contract_ids': ['@mozilla.org/satchel/form-history-startup;1'],
'jsm': 'resource://gre/modules/FormHistoryStartup.jsm',
'constructor': 'FormHistoryStartup',
'categories': {'profile-after-change': 'formHistoryStartup'},
},
]

10
toolkit/components/satchel/moz.build
View File

@ -27,16 +27,12 @@ LOCAL_INCLUDES += [
'../build',
]
EXTRA_COMPONENTS += [
'FormHistoryStartup.js',
'nsFormAutoComplete.js',
'nsInputListAutoComplete.js',
'satchel.manifest',
]
EXTRA_JS_MODULES += [
'AutoCompletePopup.jsm',
'FormAutoComplete.jsm',
'FormHistory.jsm',
'FormHistoryStartup.jsm',
'InputListAutoComplete.jsm',
'nsFormAutoCompleteResult.jsm',
]

7
toolkit/components/satchel/satchel.manifest
View File

@ -1,7 +0,0 @@
component {c11c21b2-71c9-4f87-a0f8-5e13f50495fd} nsFormAutoComplete.js
contract @mozilla.org/satchel/form-autocomplete;1 {c11c21b2-71c9-4f87-a0f8-5e13f50495fd}
component {bf1e01d0-953e-11df-981c-0800200c9a66} nsInputListAutoComplete.js
contract @mozilla.org/satchel/inputlist-autocomplete;1 {bf1e01d0-953e-11df-981c-0800200c9a66}
component {3a0012eb-007f-4bb8-aa81-a07385f77a25} FormHistoryStartup.js
contract @mozilla.org/satchel/form-history-startup;1 {3a0012eb-007f-4bb8-aa81-a07385f77a25}
category profile-after-change formHistoryStartup @mozilla.org/satchel/form-history-startup;1