Merge branch 'master' into fast-autofocus-in-scanning
Updating with new URL for autofocus Some of the buttons have stopped working - this will make the clinet match changes in the server.
This commit is contained in:
commit
5e40af1b2f
4 changed files with 7 additions and 3 deletions
|
|
@ -12,7 +12,7 @@ $wslroot = (wsl wslpath -a ("$root" -Replace '\\','\\'))
|
|||
mkdir "$root/release-builds/dist/$version/"
|
||||
|
||||
echo "Gzipping PWA..."
|
||||
wsl tar -czvf "$wslroot/release-builds/dist/$version/${name}_${version}_pwa.tar.gz" -C "$wslroot/dist" .
|
||||
wsl tar -czvf "$wslroot/release-builds/dist/$version/${name}_${version}_web.tar.gz" -C "$wslroot/dist" .
|
||||
|
||||
echo "Building deb packages..."
|
||||
wsl node "$wslhere/create-deb-x64.js"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"author": "OpenFlexure",
|
||||
"description": "An electron-based user client for the OpenFlexure Microscope Server",
|
||||
"main": "app.js",
|
||||
"version": "0.1.1",
|
||||
"version": "0.1.2-beta",
|
||||
"license": "GNU General Public License v3.0 ",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -50,9 +50,13 @@ export default {
|
|||
created: function () {
|
||||
var context = this
|
||||
UIkit.util.on(document, 'hidden', '.toggle-hidden', function () {
|
||||
// BUG: This gets called every time a tab switches. Really shouldn't
|
||||
console.log("Sidebar hidden")
|
||||
context.$root.$emit('globalResizePreview')
|
||||
})
|
||||
UIkit.util.on(document, 'shown', '.toggle-hidden', function () {
|
||||
// BUG: This gets called every time a tab switches. Really shouldn't
|
||||
console.log("Sidebar shown")
|
||||
context.$root.$emit('globalResizePreview')
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ export default {
|
|||
return this.$store.getters.uri + "/plugin/default/autofocus/autofocus"
|
||||
},
|
||||
fastAutofocusApiUri: function () {
|
||||
return this.$store.getters.uri + "/plugin/default/fast_autofocus/fast_autofocus"
|
||||
return this.$store.getters.uri + "/plugin/default/autofocus/fast_autofocus"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue