From 0283d35a46e5e62ebde19ba77fd6f45b28c30583 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Thu, 19 Mar 2015 09:38:35 +0200
Subject: [PATCH] Added loadStarted event.

---
 apps/tests/ui/web-view/web-view-tests.ts |  4 ++--
 apps/web-view-demo/app.ts                |  5 +++++
 apps/web-view-demo/main-page.ts          |  9 ++++++++-
 apps/web-view-demo/main-page.xml         |  2 +-
 ui/web-view/web-view-common.ts           | 20 ++++++++++++++++----
 ui/web-view/web-view.android.ts          |  5 +++--
 ui/web-view/web-view.d.ts                | 16 +++++++++++-----
 ui/web-view/web-view.ios.ts              | 15 ++++++++++++---
 8 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/apps/tests/ui/web-view/web-view-tests.ts b/apps/tests/ui/web-view/web-view-tests.ts
index ae5e423f8..976d1c43b 100644
--- a/apps/tests/ui/web-view/web-view-tests.ts
+++ b/apps/tests/ui/web-view/web-view-tests.ts
@@ -34,7 +34,7 @@ export var testLoadExistingUrl = function (done) {
         // <snippet module="ui/web-view" title="WebView">
         // ### Using WebView,
         // ``` JavaScript
-        webView.on(webViewModule.knownEvents.finished, function (args: webViewModule.FinishedEventData) {
+        webView.on(webViewModule.knownEvents.loadFinished, function (args: webViewModule.LoadEventData) {
             var message;
             if (!args.error) {
                 message = "WebView finished loading " + args.url;
@@ -60,7 +60,7 @@ export var testLoadInvalidUrl = function (done) {
         var webView = <webViewModule.WebView>views[0];
         
         var errorReceived = false;
-        webView.on(webViewModule.knownEvents.finished, function (args: webViewModule.FinishedEventData) {
+        webView.on(webViewModule.knownEvents.loadFinished, function (args: webViewModule.LoadEventData) {
             if (errorReceived) {
                 return;
             }
diff --git a/apps/web-view-demo/app.ts b/apps/web-view-demo/app.ts
index 0f172a73b..63795916b 100644
--- a/apps/web-view-demo/app.ts
+++ b/apps/web-view-demo/app.ts
@@ -1,3 +1,8 @@
 import application = require("application");
 application.mainModule = "app/main-page";
+
+import trace = require("trace");
+trace.enable();
+trace.setCategories(trace.categories.concat(trace.categories.Debug));
+
 application.start();
\ No newline at end of file
diff --git a/apps/web-view-demo/main-page.ts b/apps/web-view-demo/main-page.ts
index 99c1f9139..4cfb1a204 100644
--- a/apps/web-view-demo/main-page.ts
+++ b/apps/web-view-demo/main-page.ts
@@ -47,6 +47,8 @@ export function onPageLoaded(args: observableModule.EventData) {
     //viewModel.url = "alabala://www.nemadastane.com" // Error
     //viewModel.url = "sdfsdf://sdfwerfd";
     //viewModel.url = "http://www.sdfsdfsdfsdf.com/";
+
+    //viewModel.url = "https://api.instagram.com/oauth/authorize/?client_id=4e0171f9fcfc4015bb6300ed91fbf719&redirect_uri=http://localhost:2000/oauth&response_type=code";
     
     backButton.isEnabled = false;
     forwardButton.isEnabled = false;
@@ -67,7 +69,12 @@ export function onReloadButtonTap(args: observableModule.EventData) {
     webView.reload();
 }
 
-export function onWebViewFinished(args: webViewModule.FinishedEventData) {
+export function onWebViewStartedLoading(args: webViewModule.LoadEventData) {
+    console.log("startedLoading: " + args.url);
+}
+
+export function onWebViewFinishedLoading(args: webViewModule.LoadEventData) {
+    console.log("finishedLoading: " + args.url);
     backButton.isEnabled = webView.canGoBack;
     forwardButton.isEnabled = webView.canGoForward;
     reloadButton.isEnabled = true;
diff --git a/apps/web-view-demo/main-page.xml b/apps/web-view-demo/main-page.xml
index aacf3696f..2df71d9d6 100644
--- a/apps/web-view-demo/main-page.xml
+++ b/apps/web-view-demo/main-page.xml
@@ -4,6 +4,6 @@
     <Button text="→" col="1" tap="onForwardButtonTap" id="forwardButton"/>
     <TextField col="2" id="urlTextField" text="{{ url }}" />
     <Button text="↻" col="3" tap="onReloadButtonTap" id="reloadButton"/>
-    <WebView colSpan="4" row="2" id="webView" finished="onWebViewFinished" url="{{ url }}"/>
+    <WebView colSpan="4" row="2" id="webView" finishedLoading="onWebViewFinishedLoading" startedLoading="onWebViewStartedLoading" url="{{ url }}"/>
   </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/ui/web-view/web-view-common.ts b/ui/web-view/web-view-common.ts
index be4c6269d..b99665264 100644
--- a/ui/web-view/web-view-common.ts
+++ b/ui/web-view/web-view-common.ts
@@ -4,7 +4,8 @@ import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
 
 export module knownEvents {
-    export var finished: string = "finished";
+    export var loadFinished: string = "loadFinished";
+    export var loadStarted: string = "loadStarted";
 }
 var urlProperty = new dependencyObservable.Property(
     "url",
@@ -43,14 +44,14 @@ export class WebView extends view.View implements definition.WebView {
         this._setValue(WebView.urlProperty, value);
     }
 
-    public _onFinished(url: string, error?: string) {
+    public _onLoadFinished(url: string, error?: string) {
 
         this._suspendLoading = true;
         this.url = url;
         this._suspendLoading = false;
 
-        var args = <definition.FinishedEventData>{
-            eventName: knownEvents.finished,
+        var args = <definition.LoadEventData>{
+            eventName: knownEvents.loadFinished,
             object: this,
             url: url,
             error: error
@@ -59,6 +60,17 @@ export class WebView extends view.View implements definition.WebView {
         this.notify(args);
     }
 
+    public _onLoadStarted(url: string) {
+        var args = <definition.LoadEventData>{
+            eventName: knownEvents.loadStarted,
+            object: this,
+            url: url,
+            error: undefined
+        };
+
+        this.notify(args);
+    }
+
     public _loadUrl(url: string) {
         throw new Error("This member is abstract.");
     }
diff --git a/ui/web-view/web-view.android.ts b/ui/web-view/web-view.android.ts
index fb778266b..a11e68719 100644
--- a/ui/web-view/web-view.android.ts
+++ b/ui/web-view/web-view.android.ts
@@ -24,6 +24,7 @@ class WebViewClientClass extends android.webkit.WebViewClient {
 
         if (this._view) {
             trace.write("WebViewClientClass.onPageStarted(" + url + ", " + favicon + ")", trace.categories.Debug);
+            this._view._onLoadStarted(url);
         }
     }
 
@@ -32,7 +33,7 @@ class WebViewClientClass extends android.webkit.WebViewClient {
 
         if (this._view) {
             trace.write("WebViewClientClass.onPageFinished(" + url + ")", trace.categories.Debug);
-            this._view._onFinished(url, undefined);
+            this._view._onLoadFinished(url, undefined);
         }
     }
 
@@ -41,7 +42,7 @@ class WebViewClientClass extends android.webkit.WebViewClient {
 
         if (this._view) {
             trace.write("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", trace.categories.Debug);
-            this._view._onFinished(failingUrl, description + "(" + errorCode + ")");
+            this._view._onLoadFinished(failingUrl, description + "(" + errorCode + ")");
         }
     }
 };
diff --git a/ui/web-view/web-view.d.ts b/ui/web-view/web-view.d.ts
index fd789040b..76e0762d5 100644
--- a/ui/web-view/web-view.d.ts
+++ b/ui/web-view/web-view.d.ts
@@ -11,9 +11,14 @@ declare module "ui/web-view" {
      */
     export module knownEvents {
         /**
-         * Raised when web-view is completely loaded.
+         * Raised when the web-view has completely loaded an url.
          */
-        export var finished: string;
+        export var loadFinished: string;
+        
+        /**
+         * Raised when the web-view starts loading an url.
+         */
+        export var loadStarted: string;
     }
 
     /**
@@ -67,13 +72,14 @@ declare module "ui/web-view" {
         reload();
 
         on(event: string, callback: (data: observable.EventData) => void);
-        on(event: "finished", callback: (args: FinishedEventData) => void);
+        on(event: "loadFinished", callback: (args: LoadEventData) => void);
+        on(event: "loadStarted", callback: (args: LoadEventData) => void);
     }
 
     /**
-     * Event data containing information for the finished event.
+     * Event data containing information for the loading events of a WebView.
      */
-    export interface FinishedEventData extends observable.EventData {
+    export interface LoadEventData extends observable.EventData {
         /**
          * Gets the url of the web-view.
          */
diff --git a/ui/web-view/web-view.ios.ts b/ui/web-view/web-view.ios.ts
index 4fa2e0e8f..64b9148db 100644
--- a/ui/web-view/web-view.ios.ts
+++ b/ui/web-view/web-view.ios.ts
@@ -18,13 +18,22 @@ class UIWebViewDelegateImpl extends NSObject implements UIWebViewDelegate {
         return this;
     }
     
+    public webViewShouldStartLoadWithRequestNavigationType(webView: UIWebView, request: NSURLRequest, navigationType: number) {
+        if (request.URL) {
+            trace.write("UIWebViewDelegateClass.webViewShouldStartLoadWithRequestNavigationType(" + request.URL.absoluteString + ", " + navigationType + ")", trace.categories.Debug);
+            this._owner._onLoadStarted(request.URL.absoluteString);
+        }
+        
+        return true;
+    }
+    
     public webViewDidStartLoad(webView: UIWebView) {
-        trace.write("UIWebViewDelegateClass.webViewDidStartLoad()", trace.categories.Debug);
+        trace.write("UIWebViewDelegateClass.webViewDidStartLoad(" + webView.request.URL + ")", trace.categories.Debug);
     }
 
     public webViewDidFinishLoad(webView: UIWebView) {
         trace.write("UIWebViewDelegateClass.webViewDidFinishLoad(" + webView.request.URL + ")", trace.categories.Debug);
-        this._owner._onFinished(webView.request.URL.absoluteString);
+        this._owner._onLoadFinished(webView.request.URL.absoluteString);
     }
 
     public webViewDidFailLoadWithError(webView: UIWebView, error: NSError) {
@@ -34,7 +43,7 @@ class UIWebViewDelegateImpl extends NSObject implements UIWebViewDelegate {
         }
 
         trace.write("UIWebViewDelegateClass.webViewDidFailLoadWithError(" + error.localizedDescription + ")", trace.categories.Debug);
-        this._owner._onFinished(url, error.localizedDescription);
+        this._owner._onLoadFinished(url, error.localizedDescription);
     }
 }