wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 06:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #65 - Remove AppConstants from toolkit/profile

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

14
toolkit/profile/content/createProfileWizard.js
View file

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

6
toolkit/profile/content/profileSelection.js
View file

@ -4,7 +4,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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"); Components.utils.import("resource://gre/modules/Services.jsm");
const C = Components.classes; const C = Components.classes;
@ -134,9 +133,10 @@ function onProfilesKey(aEvent)
{ {
switch ( aEvent.keyCode ) switch ( aEvent.keyCode )
{ {
#ifndef XP_MACOSX
case KeyEvent.DOM_VK_BACK_SPACE: case KeyEvent.DOM_VK_BACK_SPACE:
if (AppConstants.platform != "macosx") break;
break; #endif
case KeyEvent.DOM_VK_DELETE: case KeyEvent.DOM_VK_DELETE:
ConfirmDelete(); ConfirmDelete();
break; break;

4
toolkit/profile/jar.mn
View file

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar: 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/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) content/mozapps/profile/profileSelection.xul (content/profileSelection.xul)