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

Slising => Sliding #2597

Merged
merged 2 commits into from
Jul 7, 2021
Merged
Changes from all commits
Commits
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 Source/Blazorise.AntDesign/AntDesignClassProvider.cs
Original file line number Diff line number Diff line change
@@ -487,11 +487,11 @@ public override string DropdownDirection( Direction direction )

public override string CarouselSlideSlidingLeft( bool left ) => null;

public override string CarouselSlideSlisingRight( bool right ) => null;
public override string CarouselSlideSlidingRight( bool right ) => null;

public override string CarouselSlideSlidingPrev( bool previous ) => null;

public override string CarouselSlideSlisingNext( bool next ) => null;
public override string CarouselSlideSlidingNext( bool next ) => null;

public override string CarouselIndicators() => "slick-dots slick-dots-bottom";

4 changes: 2 additions & 2 deletions Source/Blazorise.Bootstrap/BootstrapClassProvider.cs
Original file line number Diff line number Diff line change
@@ -480,11 +480,11 @@ public override string DropdownDirection( Direction direction )

public override string CarouselSlideSlidingLeft( bool left ) => left ? "carousel-item-left" : null;

public override string CarouselSlideSlisingRight( bool right ) => right ? "carousel-item-right" : null;
public override string CarouselSlideSlidingRight( bool right ) => right ? "carousel-item-right" : null;

public override string CarouselSlideSlidingPrev( bool previous ) => previous ? "carousel-item-prev" : null;

public override string CarouselSlideSlisingNext( bool next ) => next ? "carousel-item-next" : null;
public override string CarouselSlideSlidingNext( bool next ) => next ? "carousel-item-next" : null;

public override string CarouselIndicators() => "carousel-indicators";

4 changes: 2 additions & 2 deletions Source/Blazorise.Bulma/BulmaClassProvider.cs
Original file line number Diff line number Diff line change
@@ -490,11 +490,11 @@ public override string DropdownDirection( Direction direction )

public override string CarouselSlideSlidingLeft( bool left ) => null;

public override string CarouselSlideSlisingRight( bool right ) => null;
public override string CarouselSlideSlidingRight( bool right ) => null;

public override string CarouselSlideSlidingPrev( bool previous ) => null;

public override string CarouselSlideSlisingNext( bool next ) => null;
public override string CarouselSlideSlidingNext( bool next ) => null;

public override string CarouselIndicators() => "carousel-indicator is-inside is-bottom";

14 changes: 7 additions & 7 deletions Source/Blazorise/Base/BaseComponent.cs
Original file line number Diff line number Diff line change
@@ -81,33 +81,33 @@ public override Task SetParametersAsync( ParameterView parameters )

// WORKAROUND for: https://github.com/dotnet/aspnetcore/issues/32252
// HTML native width/height attributes are recognized as Width/Height parameters
// and Blazor tries to convert them resulting in error. This workworund tries to fix it by removing
// and Blazor tries to convert them resulting in error. This workaorund tries to fix it by removing
// width/height from parameter list and moving them to Attributes(as unmatched values).
//
// This behavior is really an edge-case and shouldn't affect performance too much.
// Only in some rare cases when width/height are used will the parameters be rebuilt.
if ( parameters.TryGetValue( "width", out object widthAttribute )
|| parameters.TryGetValue( "height", out heightAttribute ) )
{
var paremetersDictionary = parameters.ToDictionary() as Dictionary<string, object>;
var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;

Attributes ??= new();

if ( widthAttribute != null && paremetersDictionary.ContainsKey( "width" ) )
if ( widthAttribute != null && parametersDictionary.ContainsKey( "width" ) )
{
paremetersDictionary.Remove( "width" );
parametersDictionary.Remove( "width" );

Attributes.Add( "width", widthAttribute );
}

if ( heightAttribute != null && paremetersDictionary.ContainsKey( "height" ) )
if ( heightAttribute != null && parametersDictionary.ContainsKey( "height" ) )
{
paremetersDictionary.Remove( "height" );
parametersDictionary.Remove( "height" );

Attributes.Add( "height", heightAttribute );
}

return base.SetParametersAsync( ParameterView.FromDictionary( paremetersDictionary ) );
return base.SetParametersAsync( ParameterView.FromDictionary( parametersDictionary ) );
}

return base.SetParametersAsync( parameters );
4 changes: 2 additions & 2 deletions Source/Blazorise/Components/Carousel/CarouselSlide.razor.cs
Original file line number Diff line number Diff line change
@@ -60,9 +60,9 @@ protected override void BuildClasses( ClassBuilder builder )
builder.Append( ClassProvider.CarouselSlide() );
builder.Append( ClassProvider.CarouselSlideActive( Active ) );
builder.Append( ClassProvider.CarouselSlideSlidingLeft( Left ) );
builder.Append( ClassProvider.CarouselSlideSlisingRight( Right ) );
builder.Append( ClassProvider.CarouselSlideSlidingRight( Right ) );
builder.Append( ClassProvider.CarouselSlideSlidingPrev( Prev ) );
builder.Append( ClassProvider.CarouselSlideSlisingNext( Next ) );
builder.Append( ClassProvider.CarouselSlideSlidingNext( Next ) );

base.BuildClasses( builder );
}
4 changes: 2 additions & 2 deletions Source/Blazorise/Interfaces/IClassProvider.cs
Original file line number Diff line number Diff line change
@@ -439,11 +439,11 @@ public interface IClassProvider

string CarouselSlideSlidingLeft( bool left );

string CarouselSlideSlisingRight( bool right );
string CarouselSlideSlidingRight( bool right );

string CarouselSlideSlidingPrev( bool previous );

string CarouselSlideSlisingNext( bool next );
string CarouselSlideSlidingNext( bool next );

string CarouselIndicators();

4 changes: 2 additions & 2 deletions Source/Blazorise/Providers/ClassProvider.cs
Original file line number Diff line number Diff line change
@@ -440,11 +440,11 @@ public abstract class ClassProvider : IClassProvider

public abstract string CarouselSlideSlidingLeft( bool left );

public abstract string CarouselSlideSlisingRight( bool right );
public abstract string CarouselSlideSlidingRight( bool right );

public abstract string CarouselSlideSlidingPrev( bool previous );

public abstract string CarouselSlideSlisingNext( bool next );
public abstract string CarouselSlideSlidingNext( bool next );

public abstract string CarouselIndicators();

4 changes: 2 additions & 2 deletions Source/Blazorise/Providers/EmptyClassProvider.cs
Original file line number Diff line number Diff line change
@@ -441,11 +441,11 @@ class EmptyClassProvider : IClassProvider

public string CarouselSlideSlidingLeft( bool left ) => null;

public string CarouselSlideSlisingRight( bool right ) => null;
public string CarouselSlideSlidingRight( bool right ) => null;

public string CarouselSlideSlidingPrev( bool previous ) => null;

public string CarouselSlideSlisingNext( bool next ) => null;
public string CarouselSlideSlidingNext( bool next ) => null;

public string CarouselIndicators() => null;