Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | <?xml version="1.0"?> |
michael@0 | 2 | |
michael@0 | 3 | <!-- This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | - License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
michael@0 | 6 | |
michael@0 | 7 | <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> |
michael@0 | 8 | |
michael@0 | 9 | <!DOCTYPE dialog [ |
michael@0 | 10 | <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > |
michael@0 | 11 | <!ENTITY % changempDTD SYSTEM "chrome://mozapps/locale/preferences/changemp.dtd" > |
michael@0 | 12 | %brandDTD; |
michael@0 | 13 | %changempDTD; |
michael@0 | 14 | ]> |
michael@0 | 15 | |
michael@0 | 16 | <dialog id="changemp" title="&setPassword.title;" |
michael@0 | 17 | xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
michael@0 | 18 | style="width: 35em;" |
michael@0 | 19 | ondialogaccept="setPassword();" |
michael@0 | 20 | onload="init()"> |
michael@0 | 21 | |
michael@0 | 22 | <script type="application/javascript" src="chrome://mozapps/content/preferences/changemp.js"/> |
michael@0 | 23 | |
michael@0 | 24 | <stringbundle id="bundlePreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/> |
michael@0 | 25 | |
michael@0 | 26 | <description control="pw1">&masterPasswordDescription.label;</description> |
michael@0 | 27 | |
michael@0 | 28 | <groupbox> |
michael@0 | 29 | <grid> |
michael@0 | 30 | <columns> |
michael@0 | 31 | <column/> |
michael@0 | 32 | <column/> |
michael@0 | 33 | </columns> |
michael@0 | 34 | <rows> |
michael@0 | 35 | <row> |
michael@0 | 36 | <label control="oldpw" value="&setPassword.oldPassword.label;"/> |
michael@0 | 37 | <textbox id="oldpw" type="password"/> |
michael@0 | 38 | <!-- This textbox is inserted as a workaround to the fact that making the 'type' |
michael@0 | 39 | & 'disabled' property of the 'oldpw' textbox toggle between ['password' & |
michael@0 | 40 | 'false'] and ['text' & 'true'] - as would be necessary if the menu has more |
michael@0 | 41 | than one tokens, some initialized and some not - does not work properly. So, |
michael@0 | 42 | either the textbox 'oldpw' or the textbox 'message' would be displayed, |
michael@0 | 43 | depending on the state of the token selected |
michael@0 | 44 | --> |
michael@0 | 45 | <textbox id="message" disabled="true" /> |
michael@0 | 46 | </row> |
michael@0 | 47 | <row> |
michael@0 | 48 | <label control="pw1" value="&setPassword.newPassword.label;"/> |
michael@0 | 49 | <textbox id="pw1" type="password" |
michael@0 | 50 | oninput="setPasswordStrength(); checkPasswords();"/> |
michael@0 | 51 | </row> |
michael@0 | 52 | <row> |
michael@0 | 53 | <label control="pw2" value="&setPassword.reenterPassword.label;"/> |
michael@0 | 54 | <textbox id="pw2" type="password" oninput="checkPasswords();"/> |
michael@0 | 55 | </row> |
michael@0 | 56 | </rows> |
michael@0 | 57 | </grid> |
michael@0 | 58 | </groupbox> |
michael@0 | 59 | |
michael@0 | 60 | <groupbox> |
michael@0 | 61 | <caption label="&setPassword.meter.label;"/> |
michael@0 | 62 | <progressmeter id="pwmeter" mode="determined" value="0"/> |
michael@0 | 63 | </groupbox> |
michael@0 | 64 | |
michael@0 | 65 | <description control="pw2" class="header">&masterPasswordWarning.label;</description> |
michael@0 | 66 | |
michael@0 | 67 | </dialog> |