support of pause/resume events

macdonst · Oct 7, 2011 · 8b35de9 · 8b35de9
1 parent c87bf09
commit 8b35de9
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 28 deletions.
diff --git a/framework/PGView.xaml.cs b/framework/PGView.xaml.cs
@@ -68,7 +68,7 @@ public PGView()
             StartupMode mode = PhoneApplicationService.Current.StartupMode;
             Debug.WriteLine("StartupMode mode =" + mode.ToString());
 
-            if (mode == StartupMode.Activate)
+            if (mode == StartupMode.Launch)
             {
                 PhoneApplicationService service = PhoneApplicationService.Current;
                 service.Activated += new EventHandler<Microsoft.Phone.Shell.ActivatedEventArgs>(AppActivated);
@@ -95,6 +95,15 @@ void AppClosing(object sender, ClosingEventArgs e)
         void AppDeactivated(object sender, DeactivatedEventArgs e)
         {
             Debug.WriteLine("AppDeactivated");
+
+            try
+            {
+                GapBrowser.InvokeScript("PhoneGapCommandResult", new string[] { "pause" });
+            }
+            catch (Exception)
+            {
+                Debug.WriteLine("Pause event error");
+            } 
         }
 
         void AppLaunching(object sender, LaunchingEventArgs e)
@@ -105,6 +114,15 @@ void AppLaunching(object sender, LaunchingEventArgs e)
         void AppActivated(object sender, Microsoft.Phone.Shell.ActivatedEventArgs e)
         {
             Debug.WriteLine("AppActivated");
+
+            try
+            {
+                GapBrowser.InvokeScript("PhoneGapCommandResult", new string[] { "resume" });
+            }
+            catch (Exception)
+            {
+                Debug.WriteLine("Resume event error");
+            }  
         }
 
         void GapBrowser_Loaded(object sender, RoutedEventArgs e)

diff --git a/framework/js/phonegap-1.1.0.js b/framework/js/phonegap-1.1.0.js
@@ -105,18 +105,20 @@ PhoneGap.exec = function(success, fail, service, action, args)
 
 PhoneGapCommandResult = function(status,callbackId,args,cast)
 {
-	if(status === "backbutton")
-	{
+	if(status === "backbutton") {
+
 		PhoneGap.fireEvent(document,"backbutton");
 		return "true";
-	}
-	else if(status === "resume")
-	{
+
+	} else if(status === "resume") {
+
 		PhoneGap.onResume.fire();
-	}
-	else if(status === "pause")
-	{
-		PhoneGap.onPause.fire();	
+		return "true";
+
+	} else if(status === "pause") {
+
+		PhoneGap.onPause.fire();
+		return "true";	
 	}
 
 	var safeStatus = parseInt(status);

diff --git a/framework/js/phonegap.js.base b/framework/js/phonegap.js.base
@@ -100,18 +100,20 @@ PhoneGap.exec = function(success, fail, service, action, args)
 
 PhoneGapCommandResult = function(status,callbackId,args,cast)
 {
-	if(status === "backbutton")
-	{
+	if(status === "backbutton") {
+
 		PhoneGap.fireEvent(document,"backbutton");
 		return "true";
-	}
-	else if(status === "resume")
-	{
+
+	} else if(status === "resume") {
+
 		PhoneGap.onResume.fire();
-	}
-	else if(status === "pause")
-	{
-		PhoneGap.onPause.fire();	
+		return "true";
+
+	} else if(status === "pause") {
+
+		PhoneGap.onPause.fire();
+		return "true";	
 	}
 
 	var safeStatus = parseInt(status);

diff --git a/tests/MobileSpecUnitTests/www/phonegap-1.1.0.js b/tests/MobileSpecUnitTests/www/phonegap-1.1.0.js
@@ -105,18 +105,20 @@ PhoneGap.exec = function(success, fail, service, action, args)
 
 PhoneGapCommandResult = function(status,callbackId,args,cast)
 {
-	if(status === "backbutton")
-	{
+	if(status === "backbutton") {
+
 		PhoneGap.fireEvent(document,"backbutton");
 		return "true";
-	}
-	else if(status === "resume")
-	{
+
+	} else if(status === "resume") {
+
 		PhoneGap.onResume.fire();
-	}
-	else if(status === "pause")
-	{
-		PhoneGap.onPause.fire();	
+		return "true";
+
+	} else if(status === "pause") {
+
+		PhoneGap.onPause.fire();
+		return "true";	
 	}
 
 	var safeStatus = parseInt(status);