summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-16 08:16:07 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-16 08:16:07 +0200
commit57e08f8dd67870662c2021fd7603a966bed44343 (patch)
tree918ac5500f83f733da73481586c8b72a510687ac
parent422a3cda0caacd3b9397c5eaf1af0262f02308f8 (diff)
downloadUXP-57e08f8dd67870662c2021fd7603a966bed44343.tar
UXP-57e08f8dd67870662c2021fd7603a966bed44343.tar.gz
UXP-57e08f8dd67870662c2021fd7603a966bed44343.tar.lz
UXP-57e08f8dd67870662c2021fd7603a966bed44343.tar.xz
UXP-57e08f8dd67870662c2021fd7603a966bed44343.zip
Use expected dialog button ordering in Launch Application dialog.
This resolves #639.
-rw-r--r--toolkit/mozapps/handling/content/dialog.xul5
-rw-r--r--toolkit/mozapps/handling/jar.mn2
2 files changed, 6 insertions, 1 deletions
diff --git a/toolkit/mozapps/handling/content/dialog.xul b/toolkit/mozapps/handling/content/dialog.xul
index f73ce6d7f..2e2dab4e4 100644
--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -45,8 +45,13 @@
<description id="remember-text"/>
<hbox class="dialog-button-box" pack="end">
+#ifdef XP_WIN
+ <button dlgtype="accept" label="&accept;" icon="open" class="dialog-button"/>
+ <button dlgtype="cancel" icon="cancel" class="dialog-button"/>
+#else
<button dlgtype="cancel" icon="cancel" class="dialog-button"/>
<button dlgtype="accept" label="&accept;" icon="open" class="dialog-button"/>
+#endif
</hbox>
</dialog>
diff --git a/toolkit/mozapps/handling/jar.mn b/toolkit/mozapps/handling/jar.mn
index d6225ecca..8c338a0db 100644
--- a/toolkit/mozapps/handling/jar.mn
+++ b/toolkit/mozapps/handling/jar.mn
@@ -6,5 +6,5 @@ toolkit.jar:
% content mozapps %content/mozapps/
content/mozapps/handling/handler.css (content/handler.css)
content/mozapps/handling/handler.xml (content/handler.xml)
- content/mozapps/handling/dialog.xul (content/dialog.xul)
+* content/mozapps/handling/dialog.xul (content/dialog.xul)
content/mozapps/handling/dialog.js (content/dialog.js)