Skip to content

Commit fa9f20d

Browse files
committed
Get it working with Firefox Developer Edition (for testing)
1 parent 0da0422 commit fa9f20d

File tree

6 files changed

+39
-9
lines changed

6 files changed

+39
-9
lines changed

source/content/frame-script.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ var newAmoBr = {
2323

2424
modifyNewSite: function () {
2525
var addonDetails = content.document.querySelector('.Addon-details');
26+
if (!addonDetails) return;
27+
28+
if (content.document.getElementById('newSiteMessage')) return;
2629

2730
var newSiteMessage = content.document.createElement("div");
31+
newSiteMessage.id = "newSiteMessage";
2832
addonDetails.parentElement.insertBefore(newSiteMessage, addonDetails);
2933

3034
newSiteMessage.textContent = amoBr.getString('viewVersionHistoryFxTB');
@@ -166,7 +170,7 @@ var amoBr = {
166170
/* Handle DOMContentLoaded event */
167171
handleEvent: function(e) {
168172
if (e.target.defaultView.frameElement // ignore frames
169-
|| !['https://addons.mozilla.org/', 'https://addons-dev.allizom.org/'].some(s => e.target.defaultView.location.href.indexOf(s) == 0)
173+
|| !['https://addons.mozilla.org/', 'https://addons-dev.allizom.org/', 'https://addons.thunderbird.net/'].some(s => e.target.defaultView.location.href.indexOf(s) == 0)
170174
|| !content.document.body
171175
) {
172176
return;
@@ -175,9 +179,7 @@ var amoBr = {
175179
/* Handle new version of AMO */
176180
if (content.document.getElementById('react-view')) {
177181
newAmoBr.modifyNewSite();
178-
content.window.addEventListener('popstate', function () {
179-
newAmoBr.modifyNewSite();
180-
});
182+
content.window.addEventListener('click', () => newAmoBr.modifyNewSite());
181183
return;
182184
}
183185

source/content/search.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>
2121
Search
2222
</h2>
2323

24-
<form method="get">
24+
<form method="get" id="search-form">
2525
<div style="display: flex; flex-direction: row; margin: 10px 0;">
2626
<input type="search" name="q" data-bind="value: q" style="flex: 1 0 auto;" />
2727
<select name="host" data-bind="value: host" style="margin-left: 0.5em;">
@@ -78,7 +78,7 @@ <h2>
7878
data-bind="attr: { src: addon.icon_url }" />
7979
<div class="version-main">
8080
<div class="version-header">
81-
<a href="#" data-bind="attr: { href: 'versions.html?id=' + addon.id }, text: addon.name"></a>
81+
<a href="#" data-bind="attr: { href: 'versions.html?id=' + addon.id + '&host=' + encodeURIComponent($parent.host()) }, text: addon.name"></a>
8282
<span class="tags">
8383
<span data-bind="if: file.is_restart_required" style="background-color: darkgreen">Restart Required</span>
8484
<span data-bind="if: file.is_webextension" style="background-color: red">WebExtensions</span>

source/content/search.js

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/install.rdf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
44
<rdf:Description rdf:about="urn:mozilla:install-manifest">
55
<em:id>[email protected]</em:id>
6-
<em:version>0.10.0a1</em:version>
6+
<em:version>0.10.0a2</em:version>
77
<em:type>2</em:type>
88
<em:bootstrap>true</em:bootstrap>
99

@@ -15,6 +15,15 @@
1515
<em:maxVersion>2.53.*</em:maxVersion>
1616
</Description>
1717
</em:targetApplication>
18+
19+
<em:targetApplication>
20+
<!-- Firefox Developer Edition (use only for testing, remove before submitting to AMO) -->
21+
<Description>
22+
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
23+
<em:minVersion>44.0</em:minVersion>
24+
<em:maxVersion>*</em:maxVersion>
25+
</Description>
26+
</em:targetApplication>
1827

1928
<em:name>AMO Browsing for SeaMonkey</em:name>
2029
<em:description>This extension makes browsing for extensions easier at addons.mozilla.org. It fixes incorrect information about some extensions being not available for SeaMonkey and adds links to the Add-on Converter where needed.

xpi-versions/search.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>
2121
Search
2222
</h2>
2323

24-
<form method="get">
24+
<form method="get" id="search-form">
2525
<div style="display: flex; flex-direction: row; margin: 10px 0;">
2626
<input type="search" name="q" data-bind="value: q" style="flex: 1 0 auto;" />
2727
<select name="host" data-bind="value: host" style="margin-left: 0.5em;">

xpi-versions/search.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ window.onload = async () => {
4141
searchModel.app(app);
4242
searchModel.q(q);
4343

44+
const form = document.getElementById("search-form");
45+
if (form instanceof HTMLFormElement) {
46+
form.addEventListener("submit", e => {
47+
e.preventDefault();
48+
location.href = location.href.substring(0, `${location.href}?`.indexOf("?"))
49+
+ `?q=${encodeURIComponent(searchModel.q())}&host=${encodeURIComponent(searchModel.host())}`
50+
+ `&type=${searchModel.type()}&sort=${searchModel.sort()}&app=${searchModel.app()}`;
51+
});
52+
}
53+
4454
if (!q) return;
4555

4656
let url = `https://${host}/api/v3/addons/search?q=${encodeURIComponent(q)}&type=${type}&sort=${sort}&page=${page}&page_size=${page_size}&lang=${navigator.language}`;

0 commit comments

Comments
 (0)