Skip to content

Commit cc143a6

Browse files
adam-padam-p
committed
Merge master
2 parents bc0739c + 5308e78 commit cc143a6

File tree

6 files changed

+78
-40
lines changed

6 files changed

+78
-40
lines changed

‎src/_locales/en/messages.json

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
"description": "Text shown on the context menu.",
2929
"inMozDTD": true
3030
},
31+
"moz_options_dlg_title": {
32+
"message": "Markdown Here Options",
33+
"description": "In Thunderbird, in order to open the options tab we first have to open a temporary dialog box. This is the title for that box.",
34+
"inMozDTD": true
35+
},
36+
"moz_options_dlg_instruction": {
37+
"message": "Click the 'OK' button to open the Markdown Here Options tab",
38+
"description": "In Thunderbird, in order to open the options tab we first have to open a temporary dialog box. This is the text in that box telling the user what to do. Please use the same translation for 'OK' that the application uses.",
39+
"inMozDTD": true
40+
},
3141
"invalid_field": {
3242
"message": "The selected field is not valid for Markdown rendering. Please use a rich editor.",
3343
"description": "Shown in an alert dialog if the user tries to render a field that cannot be rendered"

‎src/common/CHANGES.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Change Log
22
==========
33

4+
2017-xx-yy: v2.13.0
5+
--------------------
6+
7+
* [Fixed bug # 369](https://github.com/adam-p/markdown-here/issues/369): Clicking Markdown Here's "Options" button in Firefox and Thunderbird (version 48+) causes the client application to hang.
8+
- Thanks to [Sam Estep](https://github.com/samestep), [r2evans](https://github.com/r2evans), [happyconfident](https://github.com/happyconfident), [Juan Salvador Aleixandre](https://github.com/juaalta), [haililihai](https://github.com/haililihai), [Shi Liang](https://github.com/shiliang-hust), [jjroper](https://github.com/jjroper), [Linxzh](https://github.com/l0o0).
49

510
2015-09-07: v2.12.0
611
--------------------

‎src/firefox/chrome/content/options.xul

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE overlay SYSTEM "chrome://markdown_here/locale/strings.dtd">
3+
4+
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
5+
6+
<prefwindow id="markdown-here-options-intermediate"
7+
title="&moz_options_dlg_title;"
8+
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
9+
buttons="accept"
10+
ondialogaccept="openOptionsTab()">
11+
12+
<script>
13+
function openOptionsTab() {
14+
var optionsUrl = 'resource://markdown_here_common/options.html';
15+
var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1']
16+
.getService(Components.interfaces.nsIWindowMediator);
17+
18+
if (navigator.userAgent.indexOf('Thunderbird') >= 0 ||
19+
navigator.userAgent.indexOf('Icedove') >= 0) {
20+
windowMediator.getMostRecentWindow('mail:3pane')
21+
.document.getElementById('tabmail')
22+
.openTab('contentTab', {contentPage: optionsUrl});
23+
}
24+
else if (navigator.userAgent.indexOf('Postbox') >= 0) {
25+
/* Haven't yet figured out how to open a tab in Postbox */
26+
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
27+
.getService(Components.interfaces.nsIPromptService);
28+
prompts.alert(null, 'Markdown Here', 'Sorry, the options page is not supported for Postbox.');
29+
}
30+
else if (navigator.userAgent.indexOf('Zotero') >= 0) {
31+
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
32+
.getService(Components.interfaces.nsIPromptService);
33+
prompts.alert(null, 'Markdown Here', 'Sorry, the options page is not supported for Zotero.');
34+
35+
/* This code does open the options page in a separate window,
36+
but the page can't communicate with the background services
37+
to get and set the options, so it's effectively unsupported. */
38+
/*
39+
var win = windowMediator.getMostRecentWindow('navigator:browser');
40+
win.open(optionsUrl, "Markdown-Here-Options");
41+
*/
42+
}
43+
else {
44+
var win = windowMediator.getMostRecentWindow('navigator:browser');
45+
win.gBrowser.selectedTab = win.gBrowser.addTab(optionsUrl);
46+
}
47+
}
48+
</script>
49+
50+
<prefpane>
51+
<hbox align="center">
52+
<text value="&moz_options_dlg_instruction;"
53+
style="font-weight:bold"/>
54+
</hbox>
55+
</prefpane>
56+
57+
</prefwindow>

‎src/firefox/chrome/locale/en/strings.dtd

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!ENTITY context_menu_item "Markdown Toggle">
33
<!ENTITY forgot_to_render_back_button "Back">
44
<!ENTITY forgot_to_render_send_button "Send">
5+
<!ENTITY moz_options_dlg_instruction "Click the 'OK' button to open the Markdown Here Options tab">
6+
<!ENTITY moz_options_dlg_title "Markdown Here Options">
57
<!ENTITY toggle_button_text "MD Toggle">
68
<!ENTITY toggle_button_tooltip "Click to toggle Markdown rendering">
79
<!ENTITY toggle_button_tooltip_disabled "The selected field is not valid for Markdown rendering">

‎src/firefox/chrome/locale/en/strings.properties

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ forgot_to_render_prompt_question=Send it anyway?
1010
forgot_to_render_prompt_title=Forget to toggle Markdown?
1111
forgot_to_render_send_button=Send
1212
invalid_field=The selected field is not valid for Markdown rendering. Please use a rich editor.
13+
moz_options_dlg_instruction=Click the 'OK' button to open the Markdown Here Options tab
14+
moz_options_dlg_title=Markdown Here Options
1315
new_changelist_items=NEW
1416
nothing_to_render=Nothing found to render or revert
1517
options_page__advanced_title=Advanced and Miscellaneous

‎src/install.rdf

+2-40
Original file line numberDiff line numberDiff line change
@@ -152,46 +152,8 @@
152152
<em:iconURL>resource://markdown_here_common/images/icon128.png</em:iconURL>
153153
<em:homepageURL>https://github.com/adam-p/markdown-here</em:homepageURL>
154154

155-
<em:optionsURL>
156-
javascript:
157-
/* This is a pretty convoluted way of getting a tab to open with
158-
our options page. */
159-
var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1']
160-
.getService(Components.interfaces.nsIWindowMediator);
161-
var optionsUrl = 'resource://markdown_here_common/options.html';
162-
if (navigator.userAgent.indexOf('Thunderbird') >= 0 ||
163-
navigator.userAgent.indexOf('Icedove') >= 0) {
164-
windowMediator.getMostRecentWindow('mail:3pane')
165-
.document.getElementById('tabmail')
166-
.openTab('contentTab', {contentPage: optionsUrl});
167-
}
168-
else if (navigator.userAgent.indexOf('Postbox') >= 0) {
169-
/* Haven't yet figured out how to open a tab in Postbox */
170-
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
171-
.getService(Components.interfaces.nsIPromptService);
172-
prompts.alert(null, 'Markdown Here', 'Sorry, the options page is not supported for Postbox.');
173-
}
174-
else if (navigator.userAgent.indexOf('Zotero') >= 0) {
175-
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
176-
.getService(Components.interfaces.nsIPromptService);
177-
prompts.alert(null, 'Markdown Here', 'Sorry, the options page is not supported for Zotero.');
178-
179-
/* This code does open the options page in a separate window,
180-
but the page can't communicate with the background services
181-
to get and set the options, so it's effectively unsupported. */
182-
/*
183-
var win = windowMediator.getMostRecentWindow('navigator:browser');
184-
win.open(optionsUrl, "Markdown-Here-Options");
185-
*/
186-
}
187-
else {
188-
var win = windowMediator.getMostRecentWindow('navigator:browser');
189-
win.gBrowser.selectedTab = win.gBrowser.addTab(optionsUrl);
190-
}
191-
/* Close the stub prefs dialog that will have opened. */
192-
window.close();
193-
</em:optionsURL>
194-
155+
<em:optionsType>1</em:optionsType>
156+
<em:optionsURL>chrome://markdown_here/content/options.xul</em:optionsURL>
195157

196158
</Description>
197159
</RDF>

0 commit comments

Comments
 (0)