From fbcaf153536210a7871650473fa7c53f105a0c3a Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Wed, 25 Aug 2010 20:37:25 -0700 Subject: [PATCH] Fix for merge problem. Tests passing again --- framework/src/com/phonegap/DroidGap.java | 2 +- updategap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index ff964f96..3c138e48 100755 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -272,7 +272,7 @@ public class DroidGap extends Activity { appView.addJavascriptInterface(mKey, "BackButton"); appView.addJavascriptInterface(audio, "GapAudio"); appView.addJavascriptInterface(callbackServer, "CallbackServer"); - //appView.addJavascriptInterface(new SplashScreen(this), "SplashScreen"); + appView.addJavascriptInterface(new SplashScreen(this), "SplashScreen"); if (android.os.Build.VERSION.RELEASE.startsWith("1.")) { diff --git a/updategap b/updategap index f930c44d..53db4a7e 100755 --- a/updategap +++ b/updategap @@ -52,7 +52,7 @@ class Build phonegapjs << "\n\n" end - File.open(File.join(@path, "assets", "www", "js", "phonegap.js"), 'w') {|f| f.write(phonegapjs) } + File.open(File.join(@path, "assets", "www", "phonegap.js"), 'w') {|f| f.write(phonegapjs) } end # end