Skip to content

Commit 5ca6836

Browse files
committed
Fixed popup not working #901
1 parent 759e403 commit 5ca6836

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

src/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "__MSG_extensionName__",
33
"description": "__MSG_extensionDescription__",
4-
"version": "2.8.2",
4+
"version": "2.8.3",
55
"manifest_version": 2,
66
"browser_specific_settings": {
77
"gecko": {

src/pages/options/widgets/general.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,9 @@ redirectOnlyInIncognitoElement.addEventListener('change', event => {
112112
const bookmarksMenuElement = document.getElementById('bookmarksMenu')
113113
bookmarksMenuElement.addEventListener('change', async event => {
114114
if (event.target.checked)
115-
bookmarksMenuElement.checked = await browser.permissions.request({
116-
permissions: ["bookmarks"]
117-
})
115+
browser.permissions.request({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r)
118116
else
119-
bookmarksMenuElement.checked = !await browser.permissions.remove({
120-
permissions: ["bookmarks"]
121-
})
117+
browser.permissions.remove({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = !r)
122118
})
123119

124120
let themeElement = document.getElementById("theme")
@@ -149,7 +145,7 @@ let options = await utils.getOptions()
149145
themeElement.value = options.theme
150146
fetchInstancesElement.value = options.fetchInstances
151147
redirectOnlyInIncognitoElement.checked = options.redirectOnlyInIncognito
152-
bookmarksMenuElement.checked = await browser.permissions.contains({ permissions: ["bookmarks"] })
148+
browser.permissions.contains({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r)
153149
for (const service in config.services) document.getElementById(service).checked = options.popupServices.includes(service)
154150

155151
instanceTypeElement.addEventListener("change", event => {

src/pages/popup/popup.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ import utils from "../../assets/javascripts/utils.js"
77
document.getElementById("more-options").href = browser.runtime.getURL("pages/options/index.html")
88
document.getElementById("more-options").setAttribute('target', '_blank')
99

10-
const os = (await browser.runtime.getPlatformInfo()).os
11-
12-
switch (os) {
13-
case "fuchsia":
14-
case "ios":
15-
case "android": {
16-
document.getElementsByTagName("html")[0].classList.add("mobile")
10+
await browser.runtime.getPlatformInfo(r => {
11+
switch (r.os) {
12+
case "fuchsia":
13+
case "ios":
14+
case "android": {
15+
document.getElementsByTagName("html")[0].classList.add("mobile")
16+
}
1717
}
1818
}
19+
)
20+
1921

2022
const allSites = document.getElementById("all_sites")
2123
const currSite = document.getElementById("current_site")

0 commit comments

Comments
 (0)