From 62f39d829dbc630ab287545442ef9a339d2b8fb1 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 5 Feb 2020 13:52:28 -0500 Subject: Issue #65 - Remove AppConstants from toolkit/profile --- toolkit/profile/content/createProfileWizard.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'toolkit/profile/content/createProfileWizard.js') diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js index 14d006b31..f13eb8faa 100644 --- a/toolkit/profile/content/createProfileWizard.js +++ b/toolkit/profile/content/createProfileWizard.js @@ -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 { -- cgit v1.2.3 From 91be1183769f96ed17f9297522b2103e7714585d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 7 Feb 2020 04:55:10 -0500 Subject: Issue #65 - Don't split in the middle of assignment statements in createProfileWizard.js --- toolkit/profile/content/createProfileWizard.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'toolkit/profile/content/createProfileWizard.js') diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js index f13eb8faa..aa87eacd7 100644 --- a/toolkit/profile/content/createProfileWizard.js +++ b/toolkit/profile/content/createProfileWizard.js @@ -116,11 +116,10 @@ function checkCurrentInput(currentInput) if (!errorMessage) { finishText.className = ""; - finishText.firstChild.data = gProfileManagerBundle #ifdef XP_MACOSX - .getString("profileFinishTextMac"); + finishText.firstChild.data = gProfileManagerBundle.getString("profileFinishTextMac"); #else - .getString("profileFinishText"); + finishText.firstChild.data = gProfileManagerBundle.getString("profileFinishText"); #endif canAdvance = true; } -- cgit v1.2.3