[[ Bug 16694 ]] Add OnNavigationRequestUnhandled event to browser event handler

livecodeian · livecodeian · commit 1a2da22d8fe3 · 2016-01-27T16:00:01.000Z
diff --git a/engine/src/browser.lcb b/engine/src/browser.lcb
@@ -149,8 +149,9 @@ public constant kMCBrowserRequestTypeMap is ["navigate", "documentLoad"]
 public constant kMCBrowserRequestStateBegin is 0
 public constant kMCBrowserRequestStateComplete is 1
 public constant kMCBrowserRequestStateFailed is 2
+public constant kMCBrowserRequestStateUnhandled is 3
 
-public constant kMCBrowserRequestStateMap is ["begin", "complete", "failed"]
+public constant kMCBrowserRequestStateMap is ["begin", "complete", "failed", "unhandled"]
 
 --
 
diff --git a/libbrowser/include/libbrowser.h b/libbrowser/include/libbrowser.h
@@ -48,6 +48,8 @@ class MCBrowserEventHandler : public MCBrowserRefCounted
 	virtual void OnDocumentLoadBegin(MCBrowser *p_browser, bool p_in_frame, const char *p_url) = 0;
 	virtual void OnDocumentLoadComplete(MCBrowser *p_browser, bool p_in_frame, const char *p_url) = 0;
 	virtual void OnDocumentLoadFailed(MCBrowser *p_browser, bool p_in_frame, const char *p_url, const char *p_error) = 0;
+
+	virtual void OnNavigationRequestUnhandled(MCBrowser *p_browser, bool p_in_frame, const char *p_url) = 0;
 };
 
 // Javascript call handler
@@ -256,6 +258,7 @@ enum MCBrowserRequestState
 	kMCBrowserRequestStateBegin,
 	kMCBrowserRequestStateComplete,
 	kMCBrowserRequestStateFailed,
+	kMCBrowserRequestStateUnhandled,
 };
 
 typedef void (*MCBrowserRequestCallback)(void *p_context, MCBrowserRef p_browser, MCBrowserRequestType p_type, MCBrowserRequestState p_state, bool p_in_frame, const char *p_url, const char *p_error);
diff --git a/libbrowser/src/libbrowser.cpp b/libbrowser/src/libbrowser.cpp
@@ -97,6 +97,12 @@ void MCBrowserBase::OnDocumentLoadFailed(bool p_in_frame, const char *p_url, con
 		m_event_handler->OnDocumentLoadFailed(this, p_in_frame, p_url, p_error);
 }
 
+void MCBrowserBase::OnNavigationRequestUnhandled(bool p_in_frame, const char *p_url)
+{
+	if (m_event_handler)
+		m_event_handler->OnNavigationRequestUnhandled(this, p_in_frame, p_url);
+}
+
 void MCBrowserBase::SetJavaScriptHandler(MCBrowserJavaScriptHandler *p_handler)
 {
 	if (p_handler)
@@ -396,6 +402,12 @@ class MCBrowserEventHandlerWrapper : public MCBrowserEventHandler
 			m_callback(m_context, p_browser, kMCBrowserRequestTypeDocumentLoad, kMCBrowserRequestStateFailed, p_in_frame, p_url, p_error);
 	}
 	
+	virtual void OnNavigationRequestUnhandled(MCBrowser *p_browser, bool p_in_frame, const char *p_url)
+	{
+		if (m_callback)
+			m_callback(m_context, p_browser, kMCBrowserRequestTypeNavigate, kMCBrowserRequestStateUnhandled, p_in_frame, p_url, nil);
+	}
+	
 private:
 	MCBrowserRequestCallback m_callback;
 	void *m_context;
diff --git a/libbrowser/src/libbrowser_internal.h b/libbrowser/src/libbrowser_internal.h
@@ -48,6 +48,8 @@ class MCBrowserBase : public MCBrowser
 	void OnDocumentLoadComplete(bool p_in_frame, const char *p_url);
 	void OnDocumentLoadFailed(bool p_in_frame, const char *p_url, const char *p_error);
 	
+	void OnNavigationRequestUnhandled(bool p_in_frame, const char *p_url);
+	
 	void OnJavaScriptCall(const char *p_handler, MCBrowserListRef p_params);
 	
 	static bool BrowserListAdd(MCBrowser *p_browser);
