From ef8cba804f270106ae73d4bea86da9d033a432a3 Mon Sep 17 00:00:00 2001 From: peolic <66393006+peolic@users.noreply.github.com> Date: Wed, 10 Jun 2020 03:13:57 +0300 Subject: [PATCH 1/3] Fix `sanitizeURL` (#599) --- ui/v2.5/src/utils/text.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/v2.5/src/utils/text.ts b/ui/v2.5/src/utils/text.ts index 496d1f1e6..3b5ec83a4 100644 --- a/ui/v2.5/src/utils/text.ts +++ b/ui/v2.5/src/utils/text.ts @@ -119,11 +119,11 @@ const sanitiseURL = (url?: string, siteURL?: URL) => { if (siteURL) { // if url starts with the site host, then prepend the protocol if (url.startsWith(siteURL.host)) { - return siteURL.protocol + url; + return `${siteURL.protocol}//${url}`; } // otherwise, construct the url from the protocol, host and passed url - return `${siteURL.protocol}${siteURL.host}/${url}`; + return `${siteURL.protocol}//${siteURL.host}/${url}`; } // just prepend the protocol - assume https From d168df1ad63a810ace3696984bb07d6336ca7ffd Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Wed, 10 Jun 2020 10:15:02 +1000 Subject: [PATCH 2/3] Fix max loop duration not working (#604) --- ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx index c3451f3a2..131ad8043 100644 --- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx +++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx @@ -107,7 +107,7 @@ export class ScenePlayerImpl extends React.Component< } private shouldRepeat(scene: GQL.SceneDataFragment) { - const maxLoopDuration = this.state?.config.maximumLoopDuration ?? 0; + const maxLoopDuration = this.props?.config?.maximumLoopDuration ?? 0; return ( !!scene.file.duration && !!maxLoopDuration && From 9f335b8ea2857f4c5e7ead42c452ec66817b98b8 Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Wed, 10 Jun 2020 10:53:49 +1000 Subject: [PATCH 3/3] Add 0.2.1 changelog (#607) --- ui/v2.5/src/components/Changelog/Changelog.tsx | 11 ++++++++++- ui/v2.5/src/components/Changelog/versions/index.ts | 1 + ui/v2.5/src/components/Changelog/versions/v021.tsx | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ui/v2.5/src/components/Changelog/versions/v021.tsx diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx index 6d768b776..e5ec22014 100644 --- a/ui/v2.5/src/components/Changelog/Changelog.tsx +++ b/ui/v2.5/src/components/Changelog/Changelog.tsx @@ -1,7 +1,7 @@ import React from "react"; import { useChangelogStorage } from "src/hooks"; import Version from "./Version"; -import { V010, V011, V020 } from "./versions"; +import { V010, V011, V020, V021 } from "./versions"; const Changelog: React.FC = () => { const [{ data, loading }, setOpenState] = useChangelogStorage(); @@ -21,6 +21,15 @@ const Changelog: React.FC = () => { return ( <>

Changelog:

+ + + ;