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

Merge branch 'imjoy-support' of gitlab.com:rwb27/openflexure-microscope-server into imjoy-support

Browse source
This commit is contained in:
Richard 2021-04-27 11:31:20 +01:00
commit 757ee216cf
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,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://lib.imjoy.io/default_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);