Back|Forward|Close

macdonst · Oct 13, 2011 · 1832031 · 1832031
1 parent 3788400
commit 1832031
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 22 deletions.
diff --git a/framework/Images/appbar.back.rest.png b/framework/Images/appbar.back.rest.png
diff --git a/framework/Images/appbar.close.rest.png b/framework/Images/appbar.close.rest.png
diff --git a/framework/Images/appbar.next.rest.png b/framework/Images/appbar.next.rest.png
diff --git a/framework/PhoneGap/Commands/ChildBrowserCommand.cs b/framework/PhoneGap/Commands/ChildBrowserCommand.cs
@@ -30,6 +30,8 @@ public class ChildBrowserCommand : BaseCommand
     {
 
         private static WebBrowser browser;
+        private static ApplicationBarIconButton backButton;
+        private static ApplicationBarIconButton fwdButton;
 
         // Display an inderminate progress indicator
         public void showWebPage(string options)
@@ -59,6 +61,8 @@ public void showWebPage(string options)
                                 browser = new WebBrowser();
                                 browser.Navigate(loc);
 
+                                browser.LoadCompleted += new System.Windows.Navigation.LoadCompletedEventHandler(browser_LoadCompleted);
+
                                 browser.Navigating += new EventHandler<NavigatingEventArgs>(browser_Navigating);
                                 browser.NavigationFailed += new System.Windows.Navigation.NavigationFailedEventHandler(browser_NavigationFailed);
                                 browser.Navigated += new EventHandler<System.Windows.Navigation.NavigationEventArgs>(browser_Navigated);
@@ -70,32 +74,78 @@ public void showWebPage(string options)
                             ApplicationBar bar = new ApplicationBar();
                             bar.BackgroundColor = Colors.Black;
                             bar.IsMenuEnabled = false;
+
+                            backButton = new ApplicationBarIconButton();
+                            backButton.Text = "Back";
+                            backButton.IconUri = new Uri("/Images/appbar.back.rest.png", UriKind.Relative);
+                            backButton.Click += new EventHandler(backButton_Click);
+                            backButton.IsEnabled = false;
+                            bar.Buttons.Add(backButton);
+
+
+                            fwdButton = new ApplicationBarIconButton();
+                            fwdButton.Text = "Forward";
+                            fwdButton.IconUri = new Uri("/Images/appbar.next.rest.png", UriKind.Relative);
+                            fwdButton.Click += new EventHandler(fwdButton_Click);
+                            fwdButton.IsEnabled = false;
+                            bar.Buttons.Add(fwdButton);
+
                             ApplicationBarIconButton closeBtn = new ApplicationBarIconButton();
                             closeBtn.Text = "Close";
-                            closeBtn.IconUri = new Uri("/Images/appbar_button1.png", UriKind.Relative);
+                            closeBtn.IconUri = new Uri("/Images/appbar.close.rest.png", UriKind.Relative);
                             closeBtn.Click += new EventHandler(closeBtn_Click);
                             bar.Buttons.Add(closeBtn);
 
                             page.ApplicationBar = bar;
                         }
 
+                    }
+                }
+            });
+        }
+
+        void browser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e)
+        {
+
+        }
 
+        void fwdButton_Click(object sender, EventArgs e)
+        {
+            if (browser != null)
+            {
+                try
+                {
+                    browser.InvokeScript("execScript", "history.forward();");
+                }
+                catch(Exception)
+                {
 
+                }
+            }
+        }
 
+        void backButton_Click(object sender, EventArgs e)
+        {
+            if (browser != null)
+            {
+                try
+                {
+                    browser.InvokeScript("execScript", "history.back();");
+                }
+                catch (Exception)
+                {
 
-                        
-                    }
                 }
-            });
+            }
         }
 
         void closeBtn_Click(object sender, EventArgs e)
         {
-            this.close("");
+            this.close();
         }
 
 
-        public void close(string options)
+        public void close(string options="")
         {
             if (browser != null)
             {

diff --git a/framework/WP7GapClassLib.csproj b/framework/WP7GapClassLib.csproj
@@ -111,9 +111,18 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Images\appbar.back.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\appbar.close.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\appbar.feature.video.rest.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\appbar.next.rest.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\appbar.stop.rest.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/tests/MobileSpecUnitTests/www/ChildBrowser.js b/tests/MobileSpecUnitTests/www/ChildBrowser.js
@@ -45,12 +45,12 @@ ChildBrowser.prototype.showWebPage = function(loc,geolocationEnabled)
 {
   var success = function(msg)
   {
-     console.log("showWebPage success :: " + msg);
+     console.log("ChildBrowser.showWebPage success :: " + msg);
   };
 
   var error = function(e)
   {
-     console.log("showWebPage error :: " + msg);
+     console.log("ChildBrowser.showWebPage error :: " + e);
   };
 
   var options = 

diff --git a/tests/MobileSpecUnitTests/www/childBrowser.html b/tests/MobileSpecUnitTests/www/childBrowser.html
@@ -2,8 +2,11 @@
 <html>
   <head>
     <!-- meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=2.0, maximum-scale=4.0, minimum-scale=1.0" / -->
+
     <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
+
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+
     <title>PhoneGap - ChildBrowser</title>
     <link rel="stylesheet" href="master.css" type="text/css" media="screen"/>
 
@@ -29,52 +32,60 @@
 
 <script type="text/javascript" charset="utf-8">
 
+  var childBrowser;
+
   function onDeviceReady(e)
   {
-      var cb = ChildBrowser.install();
-      if(cb != null)
-      {
-        cb.onLocationChange = function(loc){locChanged(loc); };
-        cb.onClose = function(){onCloseBrowser()};
-        cb.onOpenExternal = function(){onOpenExternal();};
+      childBrowser = ChildBrowser.install();
+
+  }
 
-        window.plugins.childBrowser.showWebPage("http://google.com");
+  function openAppHub()
+  {
+      if(childBrowser != null)
+      {
+        childBrowser.onLocationChange = function(loc){locChanged(loc); };
+        childBrowser.onClose = function(){onCloseBrowser()};
+        childBrowser.onOpenExternal = function(){onOpenExternal();};
+        childBrowser.showWebPage("http://create.msdn.com");
 
       }
   }
 
   function onCloseBrowser()
   {
-    console.log("In index.html child browser closed");
+    console.log("onCloseBrowser");
   }
 
   function locChanged(loc)
   {
-    console.log("In index.html new loc = " + loc);
+    console.log("locChanged = " + loc);
   }
 
   function onOpenExternal()
   {
-    console.log("In index.html onOpenExternal");
+    console.log("onOpenExternal In index.html onOpenExternal");
   }
 
 
 
   /**
   * Function called when page has finished loading.
   */
-  function init() {
-
-  document.addEventListener("deviceready",onDeviceReady, false);
+  function init() 
+  {
+    document.addEventListener("deviceready",onDeviceReady, false);
   }
 
 </script>
 
 
   </head>
+
   <body onLoad="init();" id="stage" class="theme">
 
+    <div class="btn large" onclick="openAppHub();">Open AppHub</div>
 
-  <a href="index.html" class="backBtn">Back</a>
+    <a href="index.html" class="backBtn">Back</a>
   </body>
 </html>