[MAC] fix url handling for OnNavigateToUrl

sevoku · Jun 10, 2014 · 858c710 · 858c710
1 parent 93b1d3c
commit 858c710
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/TestApps/Samples/Samples/WebViewSample.cs b/TestApps/Samples/Samples/WebViewSample.cs
@@ -94,9 +94,9 @@ public WebViewSample ()
 				forward.Sensitive = wb.CanGoForward;
 			};
 			wb.NavigateToUrl += delegate(object sender, NavigateToUrlEventArgs e) {
-				if (e.Uri.Host == "www.facebook.com") {
+				if (e.Uri.Host.EndsWith("facebook.com")) {
 					e.SetHandled ();
-					MessageDialog.ShowMessage ("Loading www.facebook.com overriden");
+					MessageDialog.ShowMessage ("Loading *.facebook.com overriden");
 				}
 				else {
 				}

diff --git a/Xwt.Gtk.Mac/WebViewBackend.cs b/Xwt.Gtk.Mac/WebViewBackend.cs
@@ -138,8 +138,10 @@ public override void DisableEvent (object eventId)
 		void HandleStartedProvisionalLoad (object sender, MonoMac.WebKit.WebFrameEventArgs e)
 		{
 			var url = String.Empty;
-			if (e.ForFrame.DataSource.Request.MainDocumentURL != null)
-				e.ForFrame.DataSource.Request.MainDocumentURL.ToString ();
+			if (e.ForFrame.ProvisionalDataSource.Request.MainDocumentURL != null)
+				url = e.ForFrame.ProvisionalDataSource.Request.MainDocumentURL.ToString ();
+			if (String.IsNullOrEmpty (url))
+				return;
 
 			bool cancel = false;
 			ApplicationContext.InvokeUserCode (delegate {

diff --git a/Xwt.Mac/Xwt.Mac/WebViewBackend.cs b/Xwt.Mac/Xwt.Mac/WebViewBackend.cs
@@ -140,8 +140,10 @@ public override void DisableEvent (object eventId)
 		void HandleStartedProvisionalLoad (object sender, WebFrameEventArgs e)
 		{
 			var url = String.Empty;
-			if (e.ForFrame.DataSource.Request.MainDocumentURL != null)
-				e.ForFrame.DataSource.Request.MainDocumentURL.ToString ();
+			if (e.ForFrame.ProvisionalDataSource.Request.MainDocumentURL != null)
+				url = e.ForFrame.ProvisionalDataSource.Request.MainDocumentURL.ToString ();
+			if (String.IsNullOrEmpty (url))
+				return;
 
 			bool cancel = false;
 			ApplicationContext.InvokeUserCode (delegate {

diff --git a/Xwt/Xwt/WebView.cs b/Xwt/Xwt/WebView.cs
@@ -45,7 +45,7 @@ protected new class WidgetBackendHost : Widget.WidgetBackendHost, IWebViewEventS
 		{
 			public bool OnNavigateToUrl (string url)
 			{
-				var args = new NavigateToUrlEventArgs (new Uri(url));
+				var args = new NavigateToUrlEventArgs (new Uri(url, UriKind.RelativeOrAbsolute));
 				((WebView)Parent).OnNavigateToUrl (args);
 				return args.Handled;
 			}