diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
| commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
| tree | 985faf01c526763515731569fa01a99f4dbef36e /toolkit/mozapps/handling | |
| parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
| parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
| download | UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip | |
Merge branch 'master' into js-modules
Diffstat (limited to 'toolkit/mozapps/handling')
| -rw-r--r-- | toolkit/mozapps/handling/content/dialog.xul | 5 | ||||
| -rw-r--r-- | toolkit/mozapps/handling/jar.mn | 2 |
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) |