Bug 1580646 - move default button to the right place on Windows, r=mak
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 19 Sep 2019 17:40:41 +0000
changeset 494077 32cab40a14b5e4075781f12244c3c900ae051f95
parent 494076 912b69e094780c1abea881433a0056605c38777f
child 494079 9602dbc76cd3a8d73e633b9337230287563a261a
push id114105
push usermalexandru@mozilla.com
push dateFri, 20 Sep 2019 04:04:33 +0000
treeherdermozilla-inbound@c77eb3f5ee05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1580646
milestone71.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1580646 - move default button to the right place on Windows, r=mak Differential Revision: https://phabricator.services.mozilla.com/D46473
toolkit/mozapps/handling/content/dialog.xul
toolkit/mozapps/handling/jar.mn
--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -40,13 +40,18 @@
       </richlistitem>
     </richlistbox>
   </vbox>
 
   <checkbox id="remember" aria-describedby="remember-text" oncommand="dialog.onCheck();"/>
   <description id="remember-text"/>
 
   <hbox class="dialog-button-box" pack="end">
+#ifdef XP_UNIX
     <button dlgtype="cancel" class="dialog-button"/>
     <button dlgtype="extra1" label="&accept;" class="dialog-button"/>
+#else
+    <button dlgtype="extra1" label="&accept;" class="dialog-button"/>
+    <button dlgtype="cancel" class="dialog-button"/>
+#endif
   </hbox>
 
 </dialog>
--- a/toolkit/mozapps/handling/jar.mn
+++ b/toolkit/mozapps/handling/jar.mn
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 toolkit.jar:
 % content mozapps %content/mozapps/
   content/mozapps/handling/handler.css                          (content/handler.css)
-  content/mozapps/handling/dialog.xul                           (content/dialog.xul)
+* content/mozapps/handling/dialog.xul                           (content/dialog.xul)
   content/mozapps/handling/dialog.js                            (content/dialog.js)