diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2017-03-07 14:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 14:56:24 -0500 |
| commit | e6d5186c8acbf37b877c7ca3c77a378352a3743d (patch) | |
| tree | d61ca8ea619f7844e9e0a973dbd7bac794e39147 /Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs | |
| parent | 2b92142ab2a501de71d3572efc0e5deb2b7bae9a (diff) | |
| download | xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.gz xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.bz2 xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.zip | |
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.Platform.MacOS/Renderers/WebViewRenderer.cs')
| -rw-r--r-- | Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs index 8d93c2c7..509c38fb 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs @@ -13,7 +13,7 @@ namespace Xamarin.Forms.Platform.MacOS WebNavigationEvent _lastBackForwardEvent; WebNavigationEvent _lastEvent; - IElementController ElementController => Element; + IWebViewController ElementController => Element; void IWebViewDelegate.LoadHtml(string html, string baseUrl) { @@ -43,9 +43,9 @@ namespace Xamarin.Forms.Platform.MacOS Control.OnFinishedLoading += OnNSWebViewFinishedLoad; Control.OnFailedLoading += OnNSWebViewFailedLoadWithError; - Element.EvalRequested += OnEvalRequested; - Element.GoBackRequested += OnGoBackRequested; - Element.GoForwardRequested += OnGoForwardRequested; + ElementController.EvalRequested += OnEvalRequested; + ElementController.GoBackRequested += OnGoBackRequested; + ElementController.GoForwardRequested += OnGoForwardRequested; Layer.BackgroundColor = NSColor.Clear.CGColor; } @@ -69,9 +69,9 @@ namespace Xamarin.Forms.Platform.MacOS _disposed = true; Control.OnFinishedLoading -= OnNSWebViewFinishedLoad; Control.OnFailedLoading -= OnNSWebViewFailedLoadWithError; - Element.EvalRequested -= OnEvalRequested; - Element.GoBackRequested -= OnGoBackRequested; - Element.GoForwardRequested -= OnGoForwardRequested; + ElementController.EvalRequested -= OnEvalRequested; + ElementController.GoBackRequested -= OnGoBackRequested; + ElementController.GoForwardRequested -= OnGoForwardRequested; } base.Dispose(disposing); } @@ -90,8 +90,8 @@ namespace Xamarin.Forms.Platform.MacOS { if (Element == null) return; - Element.CanGoBack = Control.CanGoBack(); - Element.CanGoForward = Control.CanGoForward(); + ElementController.CanGoBack = Control.CanGoBack(); + ElementController.CanGoForward = Control.CanGoForward(); } void OnEvalRequested(object sender, EvalRequested eventArg) @@ -124,7 +124,7 @@ namespace Xamarin.Forms.Platform.MacOS void OnNSWebViewFailedLoadWithError(object sender, WebKit.WebResourceErrorEventArgs e) { _lastEvent = _lastBackForwardEvent; - Element?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = Control.MainFrameUrl }, + ElementController?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, new UrlWebViewSource { Url = Control.MainFrameUrl }, Control.MainFrameUrl, WebNavigationResult.Failure)); UpdateCanGoBackForward(); @@ -140,7 +140,7 @@ namespace Xamarin.Forms.Platform.MacOS _ignoreSourceChanges = false; _lastEvent = _lastBackForwardEvent; - Element?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, Element?.Source, Control.MainFrameUrl, + ElementController?.SendNavigated(new WebNavigatedEventArgs(_lastEvent, Element?.Source, Control.MainFrameUrl, WebNavigationResult.Success)); UpdateCanGoBackForward(); |