From 099375a9d6791c9ff10fb6c2070fc3c2e5b5347a Mon Sep 17 00:00:00 2001 From: Olly Levett Date: Tue, 14 Mar 2017 07:40:47 +0000 Subject: [PATCH 1/4] refactor: removed unused extension method and make class internal (#1317) --- src/ReactiveUI/CompatMixins.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/ReactiveUI/CompatMixins.cs b/src/ReactiveUI/CompatMixins.cs index ce0753a409..92f7484377 100644 --- a/src/ReactiveUI/CompatMixins.cs +++ b/src/ReactiveUI/CompatMixins.cs @@ -1,16 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive.Subjects; namespace ReactiveUI { - public static class CompatMixins + internal static class CompatMixins { internal static void ForEach(this IEnumerable This, Action block) { foreach (var v in This) { - block(v); + block(v); } } @@ -18,12 +17,6 @@ internal static IEnumerable SkipLast(this IEnumerable This, int count) { return This.Take(This.Count() - count); } - - internal static IObservable PermaRef(this IConnectableObservable This) - { - This.Connect(); - return This; - } } // according to spouliot, this is just a string match, and will cause the From 05822b0f7cb7df65486fc10f31cb938cdf6f5e0f Mon Sep 17 00:00:00 2001 From: Olly Levett Date: Tue, 14 Mar 2017 08:02:05 +0000 Subject: [PATCH 2/4] chore: tidy up xml comment (#1307) --- src/ReactiveUI/ViewLocator.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ReactiveUI/ViewLocator.cs b/src/ReactiveUI/ViewLocator.cs index c7eb8a5fe0..b92a1621ea 100755 --- a/src/ReactiveUI/ViewLocator.cs +++ b/src/ReactiveUI/ViewLocator.cs @@ -61,7 +61,6 @@ public DefaultViewLocator(Func viewModelToViewFunc = null) /// /// /// - /// /// /// Look for a service registered under the type whose name is given to us by passing T to (which defaults to changing "ViewModel" to "View"). /// @@ -87,6 +86,9 @@ public DefaultViewLocator(Func viewModelToViewFunc = null) /// /// The view model whose associated view is to be resolved. /// + /// + /// Optional contract to be used when resolving from Splat + /// /// /// The view associated with the given view model. /// From 37abf71ac63b789df302f1c499d785630ef466ce Mon Sep 17 00:00:00 2001 From: Olly Levett Date: Tue, 14 Mar 2017 08:26:17 +0000 Subject: [PATCH 3/4] chore: tidy xml comments in RegisterableInterfaces (#1308) --- src/ReactiveUI/RegisterableInterfaces.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ReactiveUI/RegisterableInterfaces.cs b/src/ReactiveUI/RegisterableInterfaces.cs index 9b3b339edc..3926fe95c7 100755 --- a/src/ReactiveUI/RegisterableInterfaces.cs +++ b/src/ReactiveUI/RegisterableInterfaces.cs @@ -205,7 +205,7 @@ bool ExecuteHook( public interface IActivatable { } /// - /// This base class is mostly used by the Framework. Implement IViewFor + /// This base class is mostly used by the Framework. Implement /// instead. /// public interface IViewFor : IActivatable @@ -394,8 +394,9 @@ public interface ISuspensionHost : IReactiveObject Func CreateNewAppState { get; set; } /// - /// The current application state - get a typed version of this via - /// GetAppState. The "application state" is a notion entirely defined + /// The current application state - get a typed version of this via + /// . + /// The "application state" is a notion entirely defined /// via the client application - the framework places no restrictions on /// the object other than it can be serialized. /// From 8f09dd058f5c9698ab205c278b878d077cf1607c Mon Sep 17 00:00:00 2001 From: Olly Levett Date: Tue, 14 Mar 2017 08:43:32 +0000 Subject: [PATCH 4/4] chore: fix xml doc referencing type with generic arguments (#1309) --- src/ReactiveUI/Interactions.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ReactiveUI/Interactions.cs b/src/ReactiveUI/Interactions.cs index e451e5094a..b4179cf3e7 100755 --- a/src/ReactiveUI/Interactions.cs +++ b/src/ReactiveUI/Interactions.cs @@ -115,7 +115,7 @@ public TOutput GetOutput() /// /// Note that handlers are not required to handle an interaction. They can choose to ignore it, leaving it /// for some other handler to handle. If no handler handles the interaction, the method - /// will throw an . + /// will throw an . /// /// /// @@ -228,7 +228,7 @@ public IDisposable RegisterHandler(Func /// This method passes the interaction through to relevant handlers in reverse order of registration, /// ceasing once any handler handles the interaction. If the interaction remains unhandled after all - /// relevant handlers have executed, an is thrown. + /// relevant handlers have executed, an is thrown. /// /// /// @@ -236,7 +236,7 @@ public IDisposable RegisterHandler(Func /// /// An observable that ticks when the interaction completes, or throws an - /// if no handler handles the interaction. + /// if no handler handles the interaction. /// public virtual IObservable Handle(TInput input) {