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.

Sign up for GitHub

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

Fix opening links without http and https #640

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix opening links without http and https #640

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b237b9
Fix opening links without http and https
Dmitry-VF May 17, 2023
d7c04ee
fix logic a little
ceo1647 May 17, 2023
9362cfb
fix label action
ceo1647 May 17, 2023
ff33787
Fix linklabel url building logic
Dmitry-VF May 18, 2023
1ca8766
Reduce repeating and improve readability
Dmitry-VF May 18, 2023
63ef35c
Fix to open both kind of links website and application
Dmitry-VF May 18, 2023
ced9dc1
add test
ceo1647 May 18, 2023
7f10be4
little fixes
ceo1647 May 18, 2023
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
2 changes: 1 addition & 1 deletion src/Orc.Controls.Example/Views/LinkLabel.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="5" >
<TextBlock Text="LinkLabel" VerticalAlignment="Center" Width="160" />
<orccontrols:LinkLabel Content="Action" ToolTip="Action" Command="{Binding DefaultAction}"
HoverForeground="Orange" Url="http://catelproject.com"
HoverForeground="Orange" Url="catelproject.com"
ClickBehavior="OpenUrlInBrowser"/>
</StackPanel>
</catel:UserControl>
32 changes: 28 additions & 4 deletions src/Orc.Controls/Controls/LinkLabel/LinkLabel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public IInputElement? CommandTarget
/// <summary>
/// ClickEvent
/// </summary>
[Category("Behavior")]
[Category("Behavior")]
public static readonly RoutedEvent? ClickEvent;

/// <summary>
Expand All @@ -214,7 +214,7 @@ public event RoutedEventHandler? Click
/// <summary>
/// RequestNavigateEvent
/// </summary>
[Category("Behavior")]
[Category("Behavior")]
public static readonly RoutedEvent? RequestNavigateEvent;

/// <summary>
Expand Down Expand Up @@ -339,8 +339,32 @@ private static void OpenBrowserBehaviorImpl(object sender, RoutedEventArgs args)
return;
}

var destinationUrl = hyperlinkSender?.NavigateUri ?? linklabelSender?.Url;
if (destinationUrl is null || string.IsNullOrEmpty(destinationUrl.ToString()))
var uri = linklabelSender?.Url;
if (uri is null)
{
return;
}

if (!uri.IsAbsoluteUri || !(uri.Scheme.StartsWith("http", StringComparison.OrdinalIgnoreCase)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uri.Scheme.StartsWith("http", StringComparison.OrdinalIgnoreCase) || uri.Scheme.StartsWith("https", StringComparison.OrdinalIgnoreCase) === uri.Scheme.StartsWith("http", StringComparison.OrdinalIgnoreCase)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Catel even has StartsWithIgnoreCase and StartsWithAnyIgnoreCase

|| uri.Scheme.StartsWith("https", StringComparison.OrdinalIgnoreCase)))
{
string modifiedUriString;
if (uri.IsAbsoluteUri)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe there is a way not to check it twice

{
modifiedUriString = $"https://{uri}";
}
else
{
var relativePart = uri.GetComponents(UriComponents.PathAndQuery | UriComponents.Fragment,
UriFormat.UriEscaped);
modifiedUriString = $"https://{relativePart}";
}

uri = new Uri(modifiedUriString);
}

var destinationUrl = hyperlinkSender?.NavigateUri ?? uri;
if (string.IsNullOrEmpty(destinationUrl.ToString()))
{
return;
}
Expand Down