Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes from Development #1587

Merged
merged 39 commits into from
Jan 27, 2025
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7e0c28a
fixing version of three-render-objects
Robbie1977 Oct 26, 2024
981de68
Update Dockerfile
Robbie1977 Oct 27, 2024
dac6b6e
fixing spaces
Robbie1977 Oct 28, 2024
3ad6d9c
adding three-stdlib
Robbie1977 Oct 28, 2024
6d2fffb
Fixing to v2.2.4.7 live versions
Robbie1977 Oct 28, 2024
4b9c32a
fixing client version
Robbie1977 Oct 28, 2024
1770a3d
directly assigning versions and alias
Robbie1977 Oct 29, 2024
bbf2b3d
forcing three to same version
Robbie1977 Oct 29, 2024
7ae0c70
resolving dependacies
Robbie1977 Oct 29, 2024
bee0d29
adding missing examples
Robbie1977 Oct 29, 2024
ba707da
cleaning out dplicates
Robbie1977 Oct 29, 2024
84e9bc4
moving browser to webpack
Robbie1977 Oct 30, 2024
77fb9fe
cap fix
Robbie1977 Oct 30, 2024
5b4d3cf
Revert "cap fix"
Robbie1977 Oct 30, 2024
b06b8d5
caching npm and fixes for puppeteer
Robbie1977 Oct 31, 2024
a47dc3a
syntax fixes
Robbie1977 Oct 31, 2024
1fc78f8
fixing react
Robbie1977 Oct 31, 2024
97995e7
simplifying test env
Robbie1977 Nov 1, 2024
b4db42a
Revert "simplifying test env"
Robbie1977 Jan 21, 2025
122142a
Revert "fixing react"
Robbie1977 Jan 21, 2025
45443a0
Revert "syntax fixes"
Robbie1977 Jan 21, 2025
e373b47
Revert "caching npm and fixes for puppeteer"
Robbie1977 Jan 21, 2025
73f1501
Reapply "cap fix"
Robbie1977 Jan 21, 2025
a49e91e
Revert "cap fix"
Robbie1977 Jan 21, 2025
1a13a8a
Revert "moving browser to webpack"
Robbie1977 Jan 21, 2025
d0e5596
Revert "cleaning out dplicates"
Robbie1977 Jan 21, 2025
ad63d03
Revert "adding missing examples"
Robbie1977 Jan 21, 2025
ff20f23
Revert "resolving dependacies"
Robbie1977 Jan 21, 2025
9b2fc01
Revert "forcing three to same version"
Robbie1977 Jan 21, 2025
5849aaa
Revert "directly assigning versions and alias"
Robbie1977 Jan 21, 2025
9e38beb
Revert "fixing client version"
Robbie1977 Jan 21, 2025
fed1bac
Revert "Fixing to v2.2.4.7 live versions"
Robbie1977 Jan 21, 2025
7d56f5c
Revert "adding three-stdlib"
Robbie1977 Jan 21, 2025
eb858cf
Revert "fixing spaces"
Robbie1977 Jan 21, 2025
f221aa0
Revert "Update Dockerfile"
Robbie1977 Jan 21, 2025
886f7df
Revert "fixing version of three-render-objects"
Robbie1977 Jan 21, 2025
29a1401
Merge pull request #1583 from VirtualFlyBrain/dev-build-fix
Robbie1977 Jan 21, 2025
ae71555
lint fix
Robbie1977 Jan 27, 2025
681d8e6
Merge pull request #1586 from VirtualFlyBrain/dev-build-fix
Robbie1977 Jan 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/VFBMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,8 @@ class VFBMain extends React.Component {
// if a user data query is called and the VFBu_ id is not loaded after timeout then it must still be being analysed
let url = window.location.origin + window.location.pathname + "?id=" + querySplit[0].trim() + "&q=" + query;
// Use an IIFE (Immediately Invoked Function Expression) to create a closure and capture the variables
(function(querySplit, url) {
setTimeout(function() {
(function (querySplit, url) {
setTimeout(function () {
if (window[querySplit[0].trim()] == undefined) {
if (confirm("The image you uploaded is still being analysed; this can take over an hour. \nClick OK to check again or Cancel to just open VFB.")) {
window.ga('vfb.send', 'event', 'opening', 'uploadQuery', querySplit[0].trim());
Expand Down
Loading