Skip to content

Commit b289fa2

Browse files
committed
Updated Disposed event
1 parent 484a151 commit b289fa2

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Assets/Samples/SampleLifecycle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void Start()
2020
.Then(sprite => Debug.Log("Loaded")) // if loaded
2121
.ThenSet(image) // if loaded set sprite into image
2222
.Canceled(() => Debug.Log("Canceled")) // if canceled
23-
.Disposed(() => Debug.Log("Disposed")) // if disposed
23+
.Disposed(future => Debug.Log("Disposed")) // if disposed
2424
.Forget();
2525
}
2626
}

Assets/_PackageRoot/Documentation~/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public class SampleLifecycle : MonoBehaviour
233233
.Then(sprite => Debug.Log("Loaded")) // if loaded
234234
.ThenSet(image) // if loaded set sprite into image
235235
.Canceled(() => Debug.Log("Canceled")) // if canceled
236-
.Disposed(() => Debug.Log("Disposed")) // if disposed
236+
.Disposed(future => Debug.Log("Disposed")) // if disposed
237237
.Forget();
238238
}
239239
}

Assets/_PackageRoot/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public class SampleLifecycle : MonoBehaviour
233233
.Then(sprite => Debug.Log("Loaded")) // if loaded
234234
.ThenSet(image) // if loaded set sprite into image
235235
.Canceled(() => Debug.Log("Canceled")) // if canceled
236-
.Disposed(() => Debug.Log("Disposed")) // if disposed
236+
.Disposed(future => Debug.Log("Disposed")) // if disposed
237237
.Forget();
238238
}
239239
}

Assets/_PackageRoot/Runtime/Future/Future.API.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public Future<T> Canceled(Action action)
151151
/// </summary>
152152
/// <param name="action">action to execute on the event</param>
153153
/// <returns>Returns the Future instance</returns>
154-
public Future<T> Disposed(Action action)
154+
public Future<T> Disposed(Action<Future<T>> action)
155155
{
156156
OnDispose += action;
157157
return this;
@@ -178,7 +178,7 @@ public void Dispose()
178178
{
179179
Clear();
180180
Status = FutureStatus.Disposed;
181-
OnDispose?.Invoke();
181+
OnDispose?.Invoke(this);
182182
OnDispose = null;
183183

184184
if (value is IDisposable disposable)

Assets/_PackageRoot/Runtime/Future/Future.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public partial class Future<T> : IFuture, IDisposable
2828
private event Action<Exception> OnFailedToLoad;
2929
private event Action<bool> OnCompleted;
3030
private event Action OnCanceled;
31-
private event Action OnDispose;
31+
private event Action<Future<T>> OnDispose;
3232

3333
private readonly CancellationTokenSource cts;
3434
private readonly bool muteLogs;
@@ -71,7 +71,7 @@ internal Future<T> PassEvents(Future<T> to, bool passCancelled = true)
7171
if (passCancelled)
7272
Canceled(to.Cancel);
7373

74-
Disposed(to.Dispose);
74+
Disposed(future => to.Dispose());
7575

7676
return this;
7777
}

Assets/_PackageRoot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "Ivan Murzak",
66
"url": "https://github.com/IvanMurzak"
77
},
8-
"version": "5.3.0",
8+
"version": "5.3.1",
99
"unity": "2019.2",
1010
"description": "Asynchronous image loading from remote or local destination. It has two layers of configurable Memory and Disk cache systems.",
1111
"dependencies": {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public class SampleLifecycle : MonoBehaviour
233233
.Then(sprite => Debug.Log("Loaded")) // if loaded
234234
.ThenSet(image) // if loaded set sprite into image
235235
.Canceled(() => Debug.Log("Canceled")) // if canceled
236-
.Disposed(() => Debug.Log("Disposed")) // if disposed
236+
.Disposed(future => Debug.Log("Disposed")) // if disposed
237237
.Forget();
238238
}
239239
}

0 commit comments

Comments
 (0)