summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Core/WebView.cs
diff options
context:
space:
mode:
authorkingces95 <kingces95@users.noreply.github.com>2017-03-07 19:56:24 (GMT)
committerGitHub <noreply@github.com>2017-03-07 19:56:24 (GMT)
commite6d5186c8acbf37b877c7ca3c77a378352a3743d (patch)
treed61ca8ea619f7844e9e0a973dbd7bac794e39147 /Xamarin.Forms.Core/WebView.cs
parent2b92142ab2a501de71d3572efc0e5deb2b7bae9a (diff)
downloadxamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.zip
xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.gz
xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.bz2
Remove InternalsVisibleTo from Core to XF.Platforms.* (#782)
* Remove InternalsVisibleTo from Core to XF.Platforms.* * Changes per Jason's code review * Move LockableObservableListWrapper to internals namespace * Changes per Stephane's code review * update docs * Touch code to get CI to run tests * Rebase; Update documentation
Diffstat (limited to 'Xamarin.Forms.Core/WebView.cs')
-rw-r--r--Xamarin.Forms.Core/WebView.cs47
1 files changed, 33 insertions, 14 deletions
diff --git a/Xamarin.Forms.Core/WebView.cs b/Xamarin.Forms.Core/WebView.cs
index b366bb4..bba8430 100644
--- a/Xamarin.Forms.Core/WebView.cs
+++ b/Xamarin.Forms.Core/WebView.cs
@@ -5,7 +5,7 @@ using Xamarin.Forms.Platform;
namespace Xamarin.Forms
{
[RenderWith(typeof(_WebViewRenderer))]
- public class WebView : View, IElementConfiguration<WebView>
+ public class WebView : View, IWebViewController, IElementConfiguration<WebView>
{
public static readonly BindableProperty SourceProperty = BindableProperty.Create("Source", typeof(WebViewSource), typeof(WebView), default(WebViewSource),
propertyChanging: (bindable, oldvalue, newvalue) =>
@@ -39,16 +39,24 @@ namespace Xamarin.Forms
_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<WebView>>(() => new PlatformConfigurationRegistry<WebView>(this));
}
+ bool IWebViewController.CanGoBack {
+ get { return CanGoBack; }
+ set { SetValue(CanGoBackPropertyKey, value); }
+ }
+
public bool CanGoBack
{
get { return (bool)GetValue(CanGoBackProperty); }
- internal set { SetValue(CanGoBackPropertyKey, value); }
+ }
+
+ bool IWebViewController.CanGoForward {
+ get { return CanGoForward; }
+ set { SetValue(CanGoForwardPropertyKey, value); }
}
public bool CanGoForward
{
get { return (bool)GetValue(CanGoForwardProperty); }
- internal set { SetValue(CanGoForwardPropertyKey, value); }
}
[TypeConverter(typeof(WebViewSourceTypeConverter))]
@@ -110,24 +118,35 @@ namespace Xamarin.Forms
OnPropertyChanged(SourceProperty.PropertyName);
}
- internal event EventHandler<EvalRequested> EvalRequested;
+ event EventHandler<EvalRequested> IWebViewController.EvalRequested {
+ add { EvalRequested += value; }
+ remove { EvalRequested -= value; }
+ }
+
+ event EventHandler<EvalRequested> EvalRequested;
- internal event EventHandler GoBackRequested;
+ event EventHandler IWebViewController.GoBackRequested {
+ add { GoBackRequested += value; }
+ remove { GoBackRequested -= value; }
+ }
+
+ event EventHandler GoBackRequested;
+
+ event EventHandler IWebViewController.GoForwardRequested {
+ add { GoForwardRequested += value; }
+ remove { GoForwardRequested -= value; }
+ }
- internal event EventHandler GoForwardRequested;
+ event EventHandler GoForwardRequested;
- internal void SendNavigated(WebNavigatedEventArgs args)
+ void IWebViewController.SendNavigated(WebNavigatedEventArgs args)
{
- EventHandler<WebNavigatedEventArgs> handler = Navigated;
- if (handler != null)
- handler(this, args);
+ Navigated?.Invoke(this, args);
}
- internal void SendNavigating(WebNavigatingEventArgs args)
+ void IWebViewController.SendNavigating(WebNavigatingEventArgs args)
{
- EventHandler<WebNavigatingEventArgs> handler = Navigating;
- if (handler != null)
- handler(this, args);
+ Navigating?.Invoke(this, args);
}
public IPlatformElementConfiguration<T, WebView> On<T>() where T : IConfigPlatform