Skip to content

Cleaned up some unecessary includes, and fixed a potential null reference bug #7

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

Open
bfootepacstar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Cleaned up some unecessary includes, and fixed a potential null reference bug #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5702ee8
Fixed a potential null reference bug, cleaned up some using statement…
Nov 4, 2024
d165ac6
Missed one file.
Nov 4, 2024
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
39 changes: 0 additions & 39 deletions BlazorGridStack/BlazorGridStack - Backup (1).csproj
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions BlazorGridStack/BlazorGridStack - Backup.csproj
View file
Open in desktop

This file was deleted.

66 changes: 33 additions & 33 deletions BlazorGridStack/BlazorGridStackBody.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
/// <returns></returns>
public Task AddWidget(BlazorGridStackWidgetOptions options)
{
return GridJs.AddWidget(options);
return GridJs?.AddWidget(options) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -105,7 +105,7 @@ public Task AddWidget(BlazorGridStackWidgetOptions options)
/// <returns></returns>
public Task AddWidget(string id)
{
return GridJs.AddWidget(id);
return GridJs?.AddWidget(id) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -115,7 +115,7 @@ public Task AddWidget(string id)
/// <returns></returns>
public Task BatchUpdate(bool? flag = null)
{
return GridJs.BatchUpdate(flag);
return GridJs?.BatchUpdate(flag) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -124,7 +124,7 @@ public Task BatchUpdate(bool? flag = null)
/// <returns></returns>
public Task Compact()
{
return GridJs.Compact();
return GridJs?.Compact() ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -135,7 +135,7 @@ public Task Compact()
/// <returns></returns>
public Task CellHeight(int val, bool? update = null)
{
return GridJs.CellHeight(val, update);
return GridJs?.CellHeight(val, update) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -144,7 +144,7 @@ public Task CellHeight(int val, bool? update = null)
/// <returns></returns>
public Task<int> CellWidth()
{
return GridJs.CellWidth();
return (Task<int>)(GridJs?.CellWidth() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -155,7 +155,7 @@ public Task<int> CellWidth()
/// <returns></returns>
public Task Column(int column, string? layout = null)
{
return GridJs.Column(column, layout);
return GridJs?.Column(column, layout) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -165,7 +165,7 @@ public Task Column(int column, string? layout = null)
/// <returns></returns>
public Task Destroy(bool? removeDOM = null)
{
return GridJs.Destroy(removeDOM);
return GridJs?.Destroy(removeDOM) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -174,7 +174,7 @@ public Task Destroy(bool? removeDOM = null)
/// <returns></returns>
public Task Disable()
{
return GridJs.Disable();
return GridJs?.Disable() ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -183,7 +183,7 @@ public Task Disable()
/// <returns></returns>
public Task Enable()
{
return GridJs.Enable();
return GridJs?.Enable() ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -193,7 +193,7 @@ public Task Enable()
/// <returns></returns>
public Task EnableMove(bool doEnable)
{
return GridJs.EnableMove(doEnable);
return GridJs?.EnableMove(doEnable) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -203,7 +203,7 @@ public Task EnableMove(bool doEnable)
/// <returns></returns>
public Task EnableResize(bool doEnable)
{
return GridJs.EnableResize(doEnable);
return GridJs?.EnableResize(doEnable) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -212,7 +212,7 @@ public Task EnableResize(bool doEnable)
/// <returns></returns>
public Task<bool> GetFloat()
{
return GridJs.GetFloat();
return (Task<bool>)(GridJs?.GetFloat() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -222,7 +222,7 @@ public Task<bool> GetFloat()
/// <returns></returns>
public Task SetFloat(bool? val = null)
{
return GridJs.SetFloat(val);
return GridJs?.SetFloat(val) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -231,7 +231,7 @@ public Task SetFloat(bool? val = null)
/// <returns></returns>
public Task<int> GetCellHeight()
{
return GridJs.GetCellHeight();
return (Task<int>)(GridJs?.GetCellHeight() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -243,7 +243,7 @@ public Task<int> GetCellHeight()
/// <returns>an object with properties x and y i.e. the column and row in the grid.</returns>
public Task<BlazorGridCoordinates> GetCellFromPixel(int top, int left, bool? useOffset = null)
{
return GridJs.GetCellFromPixel(top, left, useOffset);
return (Task<BlazorGridCoordinates>)(GridJs?.GetCellFromPixel(top, left, useOffset) ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -252,7 +252,7 @@ public Task<BlazorGridCoordinates> GetCellFromPixel(int top, int left, bool? use
/// <returns></returns>
public Task<int> GetColumn()
{
return GridJs.GetColumn();
return (Task<int>)(GridJs?.GetColumn() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -261,7 +261,7 @@ public Task<int> GetColumn()
/// <returns></returns>
public Task<IEnumerable<BlazorGridStackWidgetData>> GetGridItems()
{
return GridJs.GetGridItems();
return (Task<IEnumerable<BlazorGridStackWidgetData>>)(GridJs?.GetGridItems() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -270,7 +270,7 @@ public Task<IEnumerable<BlazorGridStackWidgetData>> GetGridItems()
/// <returns></returns>
public Task<int> GetMargin()
{
return GridJs.GetMargin();
return (Task<int>)(GridJs?.GetMargin() ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -283,7 +283,7 @@ public Task<int> GetMargin()
/// <returns></returns>
public Task<bool> IsAreaEmpty(int x, int y, int width, int height)
{
return GridJs.IsAreaEmpty(x, y, width, height);
return (Task<bool>)(GridJs?.IsAreaEmpty(x, y, width, height) ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -294,7 +294,7 @@ public Task<bool> IsAreaEmpty(int x, int y, int width, int height)
/// <returns></returns>
public Task Load(IEnumerable<BlazorGridStackWidgetOptions> layout, bool? addAndRemove = null)
{
return GridJs.Load(layout, addAndRemove);
return (Task<bool>)(GridJs?.Load(layout, addAndRemove) ?? Task.CompletedTask);
}

/// <summary>
Expand All @@ -304,7 +304,7 @@ public Task Load(IEnumerable<BlazorGridStackWidgetOptions> layout, bool? addAndR
/// <returns></returns>
public Task MakeWidget(string id)
{
return GridJs.MakeWidget(id);
return GridJs?.MakeWidget(id) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -314,7 +314,7 @@ public Task MakeWidget(string id)
/// <returns></returns>
public Task Margin(int value)
{
return GridJs.Margin(value);
return GridJs?.Margin(value) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -326,7 +326,7 @@ public Task Margin(int value)
/// <returns></returns>
public Task Margin(string value)
{
return GridJs.Margin(value);
return GridJs?.Margin(value) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -337,7 +337,7 @@ public Task Margin(string value)
/// <returns></returns>
public Task Movable(string id, bool val)
{
return GridJs.Movable(id, val);
return GridJs?.Movable(id, val) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -349,7 +349,7 @@ public Task Movable(string id, bool val)
/// <returns></returns>
public Task RemoveWidget(string id, bool? removeDOM = null, bool? triggerEvent = true)
{
return GridJs.RemoveWidget(id, removeDOM, triggerEvent);
return GridJs?.RemoveWidget(id, removeDOM, triggerEvent) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -359,7 +359,7 @@ public Task RemoveWidget(string id, bool? removeDOM = null, bool? triggerEvent =
/// <returns></returns>
public Task RemoveAll(bool? removeDOM = null)
{
return GridJs.RemoveAll(removeDOM);
return GridJs?.RemoveAll(removeDOM) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -370,7 +370,7 @@ public Task RemoveAll(bool? removeDOM = null)
/// <returns></returns>
public Task Resizable(string id, bool val)
{
return GridJs.Resizable(id, val);
return GridJs?.Resizable(id, val) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -380,7 +380,7 @@ public Task Resizable(string id, bool val)
/// <returns></returns>
public Task Save(bool? saveContent)
{
return GridJs.Save(saveContent);
return GridJs?.Save(saveContent) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -390,7 +390,7 @@ public Task Save(bool? saveContent)
/// <returns></returns>
public Task SetAnimation(bool doAnimate)
{
return GridJs.SetAnimation(doAnimate);
return GridJs?.SetAnimation(doAnimate) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -400,7 +400,7 @@ public Task SetAnimation(bool doAnimate)
/// <returns></returns>
public Task SetStatic(bool staticValue)
{
return GridJs.SetStatic(staticValue);
return GridJs?.SetStatic(staticValue) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -411,7 +411,7 @@ public Task SetStatic(bool staticValue)
/// <returns></returns>
public Task Update(string id, BlazorGridStackWidgetOptions opts)
{
return GridJs.Update(id, opts);
return GridJs?.Update(id, opts) ?? Task.CompletedTask;
}

/// <summary>
Expand All @@ -425,7 +425,7 @@ public Task Update(string id, BlazorGridStackWidgetOptions opts)
/// <returns></returns>
public Task<bool> WillItFit(int x, int y, int width, int height, bool autoPosition)
{
return GridJs.WillItFit(x, y, width, height, autoPosition);
return (Task<bool>)(GridJs?.WillItFit(x, y, width, height, autoPosition) ?? Task.CompletedTask);
}
}
}
4 changes: 1 addition & 3 deletions BlazorGridStack/Models/BlazorGridStackBodyOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using Newtonsoft.Json;
using Microsoft.JSInterop;

namespace BlazorGridStack.Models
{
Expand Down
9 changes: 1 addition & 8 deletions BlazorGridStack/Models/BlazorGridStackWidgetOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;

namespace BlazorGridStack.Models
namespace BlazorGridStack.Models
{
public class BlazorGridStackWidgetOptions
{
Expand Down