Issue #65 - Remove AppConstants from toolkit/profile

This commit is contained in:
Matt A. Tobin 2020-02-05 13:52:28 -05:00 committed by Roy Tam
commit b358ba2a2c
3 changed files with 11 additions and 13 deletions

View file

@ -5,8 +5,6 @@
const C = Components.classes;
const I = Components.interfaces;
Components.utils.import("resource://gre/modules/AppConstants.jsm");
const ToolkitProfileService = "@mozilla.org/toolkit/profile-service;1";
var gProfileService;
@ -118,12 +116,12 @@ function checkCurrentInput(currentInput)
if (!errorMessage) {
finishText.className = "";
if (AppConstants.platform == "macosx") {
finishText.firstChild.data = gProfileManagerBundle.getString("profileFinishTextMac");
}
else {
finishText.firstChild.data = gProfileManagerBundle.getString("profileFinishText");
}
finishText.firstChild.data = gProfileManagerBundle
#ifdef XP_MACOSX
.getString("profileFinishTextMac");
#else
.getString("profileFinishText");
#endif
canAdvance = true;
}
else {

View file

@ -4,7 +4,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/. */
Components.utils.import("resource://gre/modules/AppConstants.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
const C = Components.classes;
@ -134,9 +133,10 @@ function onProfilesKey(aEvent)
{
switch ( aEvent.keyCode )
{
#ifndef XP_MACOSX
case KeyEvent.DOM_VK_BACK_SPACE:
if (AppConstants.platform != "macosx")
break;
break;
#endif
case KeyEvent.DOM_VK_DELETE:
ConfirmDelete();
break;

View file

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
content/mozapps/profile/createProfileWizard.js (content/createProfileWizard.js)
* content/mozapps/profile/createProfileWizard.js (content/createProfileWizard.js)
* content/mozapps/profile/createProfileWizard.xul (content/createProfileWizard.xul)
content/mozapps/profile/profileSelection.js (content/profileSelection.js)
* content/mozapps/profile/profileSelection.js (content/profileSelection.js)
content/mozapps/profile/profileSelection.xul (content/profileSelection.xul)