From fb2b8345d15e821b14bb8d735c7ca2950dd20696 Mon Sep 17 00:00:00 2001
From: Dave Johnson <davejohnson@dave-johnsons-macbook-pro.local>
Date: Wed, 25 Aug 2010 22:52:37 -0700
Subject: [PATCH] One last fix for a merge problem

---
 framework/assets/js/phonegap.js.base     | 16 +++++++---------
 framework/src/com/phonegap/DroidGap.java |  6 ++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base
index 2d5a9c4d..2ec3a1e2 100755
--- a/framework/assets/js/phonegap.js.base
+++ b/framework/assets/js/phonegap.js.base
@@ -203,20 +203,18 @@ document.addEventListener('DOMContentLoaded', function() {
 
 
 // Intercept calls to document.addEventListener and watch for deviceready
-PhoneGap._document_addEventListener = document.addEventListener;
+PhoneGap.m_document_addEventListener = document.addEventListener;
 
 document.addEventListener = function(evt, handler, capture) {
-    if (evt.toLowerCase() == 'deviceready') {
+	var e = evt.toLowerCase();
+    if (e == 'deviceready') {
         PhoneGap.onDeviceReady.subscribeOnce(handler);
-    }
-    else if (evt.toLowerCase() == 'onresume') {
+    } else if (e == 'resume') {
         PhoneGap.onResume.subscribe(handler);
-    }
-    else if (evt.toLowerCase() == 'onpause') {
+    } else if (e == 'pause') {
         PhoneGap.onPause.subscribe(handler);
-    } 
-    else {
-        PhoneGap._document_addEventListener.call(document, evt, handler);
+    } else {
+        PhoneGap.m_document_addEventListener.call(document, evt, handler);
     }
 };
 
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 1fd9fd56..833ab91e 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -102,6 +102,7 @@ public class DroidGap extends Activity {
         root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
         		ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
 
+        /*
         splashScreen = new ImageView(this);
         splashScreen.setLayoutParams(new LinearLayout.LayoutParams(
         		ViewGroup.LayoutParams.FILL_PARENT,
@@ -109,8 +110,9 @@ public class DroidGap extends Activity {
         		1.0F));
         splashScreen.setImageResource(R.drawable.splash);
       
-        // root.addView(splashScreen);
- 
+        root.addView(splashScreen);
+ 		*/
+
         initWebView();
         
         root.addView(appView);