From d8c60c9af6906a79c3b853b445ae5288372e464b Mon Sep 17 00:00:00 2001 From: David Lechner Date: Fri, 21 Apr 2017 08:42:38 -0500 Subject: [PATCH] Add dialog matching for EnterLoginForProxy3 This adds password dialog matching for EnterLoginForProxy3, which was introduced somewhere around Firefox 50. Also rearranged the checks for older versions in a more logical order. Fixes #748 --- .../KeeFox/chrome/content/commonDialog.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Firefox addon/KeeFox/chrome/content/commonDialog.js b/Firefox addon/KeeFox/chrome/content/commonDialog.js index ccc72db..469751c 100644 --- a/Firefox addon/KeeFox/chrome/content/commonDialog.js +++ b/Firefox addon/KeeFox/chrome/content/commonDialog.js @@ -443,6 +443,10 @@ var keeFoxDialogManager = { // The proxy %2$S is requesting a username and password. The site says: "%1$S" var currentProxyL10nPattern = ""; try + { + // Name changed again in Firefox 50 or so + currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy3"); + } catch (exception) { try { @@ -450,11 +454,14 @@ var keeFoxDialogManager = { currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy2"); } catch (exception) { - currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy"); + try + { + currentProxyL10nPattern = this._cdBundle.GetStringFromName("EnterLoginForProxy"); + } catch (exception) + { + currentProxyL10nPattern = this._promptBundle.GetStringFromName("EnterLoginForProxy"); + } } - } catch (exception) - { - currentProxyL10nPattern = this._promptBundle.GetStringFromName("EnterLoginForProxy"); } realmFirst = false;