rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow insecure url in imjoy plugins

Browse source
This commit is contained in:
Wei Ouyang 2021-04-07 09:49:09 +00:00
parent cd30872d62
commit 2a8536c386
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
openflexure_microscope/api/static/public/http_base_frame.html Normal file
View file

@ -0,0 +1,15 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript"
onload="loadImJoyRPCByQueryString().then((imjoyRPC)=&gt;{imjoyRPC.waitForInitialization({target_origin: &#39;*&#39;})})"
src="https://lib.imjoy.io/imjoy-loader.js"></script>
<script src="https://lib.imjoy.io/imjoy-rpc.min.js"></script>
<style>
body {
overscroll-behavior: contain;
}
</style>
</head>
<body></body>
</html>

6
openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue
View file

@ -122,6 +122,12 @@ export default {
mounted() { mounted() {
const self = this; const self = this;
const imjoy = new imjoyCore.ImJoy({ const imjoy = new imjoyCore.ImJoy({
// We will load the ImJoy plugin base frame via http (instead of https)
// such that imjoy plugins can access insecured urls
// however, some browser features won't work (e.g. webrtc)
// unless we explicitly set `base_frame` in the plugin to
// https://lib.imjoy.io/default_base_frame.html
default_base_frame: '/http_base_frame.html',
imjoy_api: { imjoy_api: {
async showDialog(plugin, config, exta_config) { async showDialog(plugin, config, exta_config) {
return await imjoy.pm.createWindow(plugin, config, exta_config); return await imjoy.pm.createWindow(plugin, config, exta_config);