selfhosted
/
padloc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #485 from padloc/fix/firefox-extension-focus 

Fix occasional non-focus extension popup in Firefox
This commit is contained in:
Martin Kleinschrodt 2022-06-30 14:13:14 +02:00 committed by GitHub
parent 14fcd1bf25 90156024da
commit 81b2007f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-web-extension.yml vendored
View File

@ -54,7 +54,7 @@ jobs:
name: padloc-web-extension-${{ github.sha }}-signed.xpi
path: packages/extension/dist/web-ext-artifacts/*.xpi
if-no-files-found: error
- name: Archive Unsigned Web Extension (Chrome)
- name: Archive Unsigned Web Extension (Chrome/Edge)
uses: actions/upload-artifact@v2
with:
name: padloc-web-extension-${{ github.sha }}-unsigned
@ -63,19 +63,19 @@ jobs:
!packages/extension/dist/web-ext-artifacts
!packages/extension/dist/*.xpi
if-no-files-found: error
- name: Build ZIP for signing Chrome Extension
- name: Build ZIP for signing Chrome/Edge Extension
uses: cardinalby/webext-buildtools-pack-extension-dir-action@v1
with:
extensionDir: packages/extension/dist
zipFilePath: packages/extension/padloc.zip
zipIgnore: web-ext-artifacts/**|*.xpi
- name: Sign for Chrome
- name: Sign for Chrome/Edge
uses: cardinalby/webext-buildtools-chrome-crx-action@v2
with:
zipFilePath: packages/extension/padloc.zip
crxFilePath: packages/extension/padloc-signed.crx
privateKey: ${{ secrets.PL_WEB_EXTENSION_CHROME_CRX_PRIVATE_KEY }}
- name: Archive Signed Web Extension (Chrome)
- name: Archive Signed Web Extension (Chrome/Edge)
uses: actions/upload-artifact@v2
with:
name: padloc-web-extension-${{ github.sha }}-signed.crx

9
packages/extension/src/popup.ts
View File

@ -6,8 +6,17 @@ import { ExtensionPlatform } from "./platform";
await import("./app");
function focusWindow() {
if (document.visibilityState !== "hidden") {
window.focus();
}
}
window.onload = () => {
const app = document.createElement("pl-extension-app");
document.body.appendChild(app);
setTimeout(focusWindow, 100);
setTimeout(focusWindow, 250);
};
})();