From 51183abe58d430a16a839ea40dc39260bbe2b74f Mon Sep 17 00:00:00 2001
From: Thomas Rientjes <synzvato@protonmail.com>
Date: Tue, 7 Nov 2017 20:20:00 -0300
Subject: [PATCH] Fix #214 by revising popup panel logic
---
pages/popup/popup.js | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index 73ddce6..68b2365 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', function () {
let version, optionsButtonElement, scriptDirection;
- version = helpers.formatVersion(browser.runtime.getManifest().version);
+ version = helpers.formatVersion(chrome.runtime.getManifest().version);
document.getElementById('version-label').innerText = version;
scriptDirection = helpers.determineScriptDirection(navigator.language);
@@ -223,17 +223,20 @@ document.addEventListener('DOMContentLoaded', function () {
});
});
- optionsButtonElement.addEventListener('mouseup', function () {
+ chrome.runtime.getPlatformInfo(function (information) {
- if (popup.backgroundPage.main.operatingSystem === chrome.runtime.PlatformOs.ANDROID) {
+ optionsButtonElement.addEventListener('mouseup', function () {
- return chrome.tabs.create({
- 'url': chrome.extension.getURL('pages/options/options.html')
- });
- }
+ if (information.os === chrome.runtime.PlatformOs.ANDROID) {
- chrome.runtime.openOptionsPage();
- return window.close();
+ return chrome.tabs.create({
+ 'url': chrome.extension.getURL('pages/options/options.html')
+ });
+ }
+
+ chrome.runtime.openOptionsPage();
+ return window.close();
+ });
});
document.getElementById('testing-utility-link').addEventListener('mouseup', function (event) {
--
GitLab