Merge pull request #8 from purplecabbage/prep1.5.0

Prep1.5.0
diff --git a/CordovaCustom.zip b/Cordova-1.4.1-Custom.zip
similarity index 100%
rename from CordovaCustom.zip
rename to Cordova-1.4.1-Custom.zip
Binary files differ
diff --git a/CordovaStarter.zip b/Cordova-1.4.1-Starter.zip
similarity index 100%
rename from CordovaStarter.zip
rename to Cordova-1.4.1-Starter.zip
Binary files differ
diff --git a/Cordova-1.5.0-Custom.zip b/Cordova-1.5.0-Custom.zip
new file mode 100644
index 0000000..34434f9
--- /dev/null
+++ b/Cordova-1.5.0-Custom.zip
Binary files differ
diff --git a/Cordova-1.5.0-Starter.zip b/Cordova-1.5.0-Starter.zip
new file mode 100644
index 0000000..943e4a2
--- /dev/null
+++ b/Cordova-1.5.0-Starter.zip
Binary files differ
diff --git a/README.md b/README.md
index 7f583a0..8e39be8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-PhoneGap/WP7 Mango
+Cordova for WP7 Mango
 ===
 
-PhoneGap WP7 is a .net application library that lets you create PhoneGap applications targeting WP7 Mango devices.
-PhoneGap based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
+Cordova WP7 is a .net application library that lets you create Cordova applications targeting WP7 Mango devices.
+Cordova based applications are, at the core, an application written with web technology: HTML, CSS and JavaScript.
 
 Requires
 ---
@@ -10,16 +10,18 @@
 - Windows Phone SDK 7.1 [http://create.msdn.com/en-us/home/getting_started]
 
 
-Getting Started (Hey, not too rough)
+Getting Started
 ---
 
-- copy the file GapAppStarter.zip to the folder : \My Documents\Visual Studio 2010\Templates\ProjectTemplates\
+- copy the file Cordova-1.5.0-Starter.zip to the folder : \My Documents\Visual Studio 2010\Templates\ProjectTemplates\
+-- if you have just installed VisualStudio, you should launch it once to create this folder
+-- if you prefer, you may add the project instead to the "Silverlight for Windows Phone" subfolder of "Visual C#".  This is up to you, and only affects where the project template is shown when creating a new project. You may need to create this folder.
 - Launch Visual Studio 2010 and select to create a new project
--- GapAppStarter should be listed as an option, give it a name
+-- Cordova-1.5.0-Starter should be listed as an option, give your new project a name
 -- If you do not see it, you may have to select the top level 'Visual C#' to see it
 - Build and Run it!
 
--- Also, if you prefer, you may add the project instead to the "Silverlight for Windows Phone" subfolder of "Visual C#".  This is up to you, and only affects where the GapAppStarter template is shown when creating a new project.
+
 
 Note!!!
 ---
@@ -27,24 +29,9 @@
 When you add or remove files/folders in the www folder you will need to do the following
 
 - ensure the new item is included in the project ( Content ) This includes ALL images/css/html/js/* and anything that you want available at runtime.
--- Do not modify the GapSourceDictionary.xml file which is included in the project, it is auto-generated for you when you build.
+-- Do not modify the CordovaSourceDictionary.xml file which is included in the project, it is auto-generated for you when you build.
 
 
-Getting Started ( Ultra-Violence ! aka for contributors )
----
-
-- make sure you have the 7.1 SDK installed
-- fork/git or download/unzip the repo to your harddrive
-- copy the file GapAppStarter.zip to the folder : \My Documents\Visual Studio 2010\Templates\ProjectTemplates\
-- Launch Visual Studio 2010 and select to create a new project
--- GapAppStarter should be listed as an option, give it a name
-- Right-Click on the solution and select Add->Existing Project, and add the project :
- framework\WP7GapClassLib.csproj from the downloaded repo
-- Right-Click your main project and "Add Reference" to the WP7GapClassLib project
-- build and run!
-
-  
-
 
 
 BUGS?
diff --git a/VERSION b/VERSION
index 13175fd..3e1ad72 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.1
\ No newline at end of file
+1.5.0
\ No newline at end of file
diff --git a/example/CordovaSourceDictionary.xml b/example/CordovaSourceDictionary.xml
index 0183771..f191da9 100644
--- a/example/CordovaSourceDictionary.xml
+++ b/example/CordovaSourceDictionary.xml
@@ -9,7 +9,8 @@
     <FilePath Value="www\capture.html"/>
     <FilePath Value="www\compass.html"/>
     <FilePath Value="www\contacts.html"/>
-    <FilePath Value="www\cordova-1.4.1.js"/>
+    <FilePath Value="www\cordova-1.5.0.js"/>
+    <FilePath Value="www\cordova.js"/>
     <FilePath Value="www\events.html"/>
     <FilePath Value="www\file.html"/>
     <FilePath Value="www\index.html"/>
diff --git a/example/GapExample.csproj b/example/GapExample.csproj
index 25ed472..37698bc 100644
--- a/example/GapExample.csproj
+++ b/example/GapExample.csproj
@@ -104,7 +104,8 @@
     <Content Include="www\contacts.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="www\cordova-1.4.1.js" />

+    <Content Include="www\cordova-1.5.0.js" />

+    <Content Include="www\cordova.js" />

     <Content Include="www\events.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

diff --git a/example/www/accelerometer.html b/example/www/accelerometer.html
index c976fd4..c72aea7 100644
--- a/example/www/accelerometer.html
+++ b/example/www/accelerometer.html
@@ -24,7 +24,7 @@
 	</script>
     
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>      
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>      
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/accelerometer2.html b/example/www/accelerometer2.html
index 5c7721b..0d8dec4 100644
--- a/example/www/accelerometer2.html
+++ b/example/www/accelerometer2.html
@@ -24,7 +24,7 @@
 	</script>
     
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>      
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>      
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/audio.html b/example/www/audio.html
index b2c748d..1c8cf9b 100644
--- a/example/www/audio.html
+++ b/example/www/audio.html
@@ -7,7 +7,7 @@
     <title>Cordova</title>
     <link rel="stylesheet" href="master.css" type="text/css" media="screen">
 
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>      
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>      
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/calculator.html b/example/www/calculator.html
index 16d7b05..86570dc 100644
--- a/example/www/calculator.html
+++ b/example/www/calculator.html
@@ -21,7 +21,7 @@
         console.log("Installed console ! ");
     </script>
    
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/camera.html b/example/www/camera.html
index ce8987a..318d279 100644
--- a/example/www/camera.html
+++ b/example/www/camera.html
@@ -21,7 +21,7 @@
         console.log("Installed console ! ");
     </script>
    
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>   
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>   
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/capture.html b/example/www/capture.html
index 167c2ae..5319270 100644
--- a/example/www/capture.html
+++ b/example/www/capture.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="master.css" type="text/css" media="screen"/>
 
    
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>   
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>   
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/compass.html b/example/www/compass.html
index a93deec..78c2e37 100644
--- a/example/www/compass.html
+++ b/example/www/compass.html
@@ -24,7 +24,7 @@
       </script>
       
       
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/contacts.html b/example/www/contacts.html
index 530385b..5bca8c8 100644
--- a/example/www/contacts.html
+++ b/example/www/contacts.html
@@ -22,7 +22,7 @@
       </script>
       
       
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
     
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/cordova-1.4.1.js b/example/www/cordova-1.5.0.js
similarity index 100%
rename from example/www/cordova-1.4.1.js
rename to example/www/cordova-1.5.0.js
diff --git a/example/www/cordova.js b/example/www/cordova.js
new file mode 100644
index 0000000..5a4ee14
--- /dev/null
+++ b/example/www/cordova.js
@@ -0,0 +1,2 @@
+
+document.write('<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>');
\ No newline at end of file
diff --git a/example/www/events.html b/example/www/events.html
index c422517..1da0a3c 100644
--- a/example/www/events.html
+++ b/example/www/events.html
@@ -21,7 +21,7 @@
     </script>
       
     <link rel="stylesheet" href="master.css" type="text/css" media="screen">
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>       
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>       
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/file.html b/example/www/file.html
index 981243e..50ba186 100644
--- a/example/www/file.html
+++ b/example/www/file.html
@@ -21,7 +21,7 @@
         console.log("Installed console ! ");
     </script>
    
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/example/www/index.html b/example/www/index.html
index 1133886..41cf03e 100644
--- a/example/www/index.html
+++ b/example/www/index.html
@@ -22,7 +22,7 @@
 		console.log("Installed console ! ");

     </script>

       

-      <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script> 

+      <script type="text/javascript" charset="utf-8" src="cordova.js"></script> 

        

       <script type="text/javascript">

 

diff --git a/example/www/location.html b/example/www/location.html
index 73d23e9..59a3670 100644
--- a/example/www/location.html
+++ b/example/www/location.html
@@ -23,7 +23,7 @@
       console.log("Installed console ! ");
     </script>
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>       
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>       
     
  
 
diff --git a/example/www/network.html b/example/www/network.html
index 4bf5610..863166f 100644
--- a/example/www/network.html
+++ b/example/www/network.html
@@ -22,7 +22,7 @@
       console.log("Installed console ! ");
     </script>
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script> 
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script> 
 
 
     <script type="text/javascript" charset="utf-8">
diff --git a/example/www/notification.html b/example/www/notification.html
index 08640b8..776f635 100644
--- a/example/www/notification.html
+++ b/example/www/notification.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
 
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
     <script type="text/javascript">
 
diff --git a/example/www/storage.html b/example/www/storage.html
index 54b7e71..55f5809 100644
--- a/example/www/storage.html
+++ b/example/www/storage.html
@@ -23,7 +23,7 @@
       console.log("Installed console ! ");
     </script>
     
-    <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>       
+    <script type="text/javascript" charset="utf-8" src="cordova.js"></script>       
 
       
 <script type="text/javascript" charset="utf-8">
diff --git a/framework/Cordova/Commands/Device.cs b/framework/Cordova/Commands/Device.cs
index ac55026..462771b 100644
--- a/framework/Cordova/Commands/Device.cs
+++ b/framework/Cordova/Commands/Device.cs
@@ -61,7 +61,7 @@
             get
             {
                 // TODO: should be able to dynamically read the Cordova version from somewhere...
-                return "1.4.1";
+                return "1.5.0";
             }
         }
 
diff --git a/framework/Properties/AssemblyInfo.cs b/framework/Properties/AssemblyInfo.cs
index 1414484..3874199 100644
--- a/framework/Properties/AssemblyInfo.cs
+++ b/framework/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.1")]
-[assembly: AssemblyFileVersion("1.4.1")]
+[assembly: AssemblyVersion("1.5.0")]
+[assembly: AssemblyFileVersion("1.5.0")]
diff --git a/framework/js/cordova-1.4.1-core.js b/framework/js/cordova-1.5.0-core.js
similarity index 100%
rename from framework/js/cordova-1.4.1-core.js
rename to framework/js/cordova-1.5.0-core.js
diff --git a/framework/js/cordova-1.4.1.js b/framework/js/cordova-1.5.0.js
similarity index 100%
rename from framework/js/cordova-1.4.1.js
rename to framework/js/cordova-1.5.0.js
diff --git a/templates/custom/GapAppProj.csproj b/templates/custom/GapAppProj.csproj
index 717751b..05b9942 100644
--- a/templates/custom/GapAppProj.csproj
+++ b/templates/custom/GapAppProj.csproj
@@ -79,8 +79,8 @@
   <ItemGroup>
     <Content Include="BuildManifestProcessor.js" />
     <Content Include="CordovaSourceDictionary.xml" />
-    <Content Include="www\cordova-1.4.1-core.js" />
-    <Content Include="www\cordova-1.4.1.js" />
+    <Content Include="www\cordova-1.5.0-core.js" />
+    <Content Include="www\cordova-1.5.0.js" />
     <Content Include="www\index.html">
       <SubType>Designer</SubType>
     </Content>
diff --git a/templates/custom/www/cordova-1.4.1-core.js b/templates/custom/www/cordova-1.5.0-core.js
similarity index 100%
rename from templates/custom/www/cordova-1.4.1-core.js
rename to templates/custom/www/cordova-1.5.0-core.js
diff --git a/templates/custom/www/cordova-1.4.1.js b/templates/custom/www/cordova-1.5.0.js
similarity index 100%
rename from templates/custom/www/cordova-1.4.1.js
rename to templates/custom/www/cordova-1.5.0.js
diff --git a/templates/custom/www/index.html b/templates/custom/www/index.html
index 9dcb0f4..d98eca5 100644
--- a/templates/custom/www/index.html
+++ b/templates/custom/www/index.html
@@ -9,13 +9,13 @@
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
             
       <!-- 
-        Note: If you want to support more device APIs, you will need to include the full cordova-1.4.1.js -jm 
+        Note: If you want to support more device APIs, you will need to include the full cordova-1.5.0.js -jm 
       -->
       <!-- 
-      <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
       -->
       
-      <script type="text/javascript" charset="utf-8" src="cordova-1.4.1-core.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.5.0-core.js"></script>
        
       <script type="text/javascript">
 
@@ -24,7 +24,7 @@
         // once the device ready event fires, you can safely do your thing! -jm
         function onDeviceReady()
         {
-            document.getElementById("welcomeMsg").innerHTML += "Cordova is ready! version=" + window.device.cordova;
+            document.getElementById("welcomeMsg").innerHTML = "Cordova is ready! version=" + window.device.cordova;
             console.log("onDeviceReady. You should see this message in Visual Studio's output window.");
             
         }
@@ -37,6 +37,6 @@
   </head>
   <body>
     <h1>Hello Cordova</h1>
-    <div id="welcomeMsg"></div>
+    <div id="welcomeMsg">Loading...</div>
   </body>
 </html>
diff --git a/templates/description.txt b/templates/description.txt
index d06c192..ef6d904 100644
--- a/templates/description.txt
+++ b/templates/description.txt
@@ -1,9 +1,8 @@
 CordovaStarter
 
-Starter project for building a Cordova app for Windows Phone v1.4.1 ( formerly PhoneGap )
+Starter project for building a Cordova app for Windows Phone v1.5.0 ( formerly PhoneGap )
 
 
 CordovaCustom
 
-Starter project for building a Cordova app for Windows Phone v1.4.1 ( formerly PhoneGap )
-Note: You will need to link to the framework manually.
+Starter project for building a Cordova app for Windows Phone v1.5.0 ( formerly PhoneGap ) Note: You will need to link to the framework manually.
diff --git a/templates/full/CordovaSourceDictionary.xml b/templates/full/CordovaSourceDictionary.xml
index afd4c6d..5bc9602 100644
--- a/templates/full/CordovaSourceDictionary.xml
+++ b/templates/full/CordovaSourceDictionary.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file is auto-generated, do not edit! -jm -->
 <CordovaSourceDictionary>
-    <FilePath Value="www\cordova-1.4.1.js"/>
-    <FilePath Value="www\index.html"/>
-    <FilePath Value="www\master.css"/>
+
 </CordovaSourceDictionary>
diff --git a/templates/full/GapAppProj.csproj b/templates/full/GapAppProj.csproj
index b168351..6b2c35c 100644
--- a/templates/full/GapAppProj.csproj
+++ b/templates/full/GapAppProj.csproj
@@ -56,7 +56,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
     <Reference Include="System.Xml" />
-    <Reference Include="WP7CordovaClassLib, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="WP7CordovaClassLib, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -79,9 +79,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="CordovaSourceDictionary.xml" />
-    <Content Include="GapLib\WP7CordovaClassLib.dll" />
     <None Include="BuildManifestProcessor.js" />
-    <Content Include="www\cordova-1.4.1.js" />
+    <Content Include="GapLib\WP7CordovaClassLib.dll" />
+    <Content Include="www\cordova-1.5.0.js" />
     <Content Include="www\index.html">
       <SubType>Designer</SubType>
     </Content>
diff --git a/templates/full/GapLib/WP7CordovaClassLib.dll b/templates/full/GapLib/WP7CordovaClassLib.dll
index 164bd58..a9ba3c7 100644
--- a/templates/full/GapLib/WP7CordovaClassLib.dll
+++ b/templates/full/GapLib/WP7CordovaClassLib.dll
Binary files differ
diff --git a/templates/full/www/cordova-1.4.1.js b/templates/full/www/cordova-1.5.0.js
similarity index 100%
rename from templates/full/www/cordova-1.4.1.js
rename to templates/full/www/cordova-1.5.0.js
diff --git a/templates/full/www/index.html b/templates/full/www/index.html
index 5061b1a..5631d2b 100644
--- a/templates/full/www/index.html
+++ b/templates/full/www/index.html
@@ -8,7 +8,7 @@
     
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
             
-      <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
        
       <script type="text/javascript">
 
diff --git a/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml b/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
index baa5383..e8f13ef 100644
--- a/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
+++ b/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file is auto-generated, do not edit! -jm -->
 <CordovaSourceDictionary>
-    <FilePath Value="www\cordova-1.4.1.js"/>
+    <FilePath Value="www\cordova-1.5.0.js"/>
     <FilePath Value="www\index.html"/>
     <FilePath Value="www\master.css"/>
     <FilePath Value="www\autotest\index.html"/>
diff --git a/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj b/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
index c5c19c8..f360fd8 100644
--- a/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
+++ b/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
@@ -89,7 +89,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <Content Include="CordovaSourceDictionary.xml" />

-    <Content Include="www\cordova-1.4.1.js" />

     <None Include="ManifestProcessor.js" />

     <Content Include="SplashScreenImage.jpg" />

     <Content Include="www\autotest\index.html">

@@ -113,6 +112,7 @@
     <Content Include="www\autotest\tests\orientation.tests.js" />

     <Content Include="www\autotest\tests\storage.tests.js" />

     <Content Include="www\autotest\tests\system.tests.js" />

+    <Content Include="www\cordova-1.5.0.js" />

     <Content Include="www\index.html">

       <SubType>Designer</SubType>

     </Content>

diff --git a/tests/MobileSpecUnitTests/www/autotest/index.html b/tests/MobileSpecUnitTests/www/autotest/index.html
index 1e133a6..b724f59 100644
--- a/tests/MobileSpecUnitTests/www/autotest/index.html
+++ b/tests/MobileSpecUnitTests/www/autotest/index.html
@@ -40,7 +40,7 @@
 

     

     <!-- Source -->

-    <script type="text/javascript" src="../cordova-1.4.1.js"></script>

+    <script type="text/javascript" src="../cordova-1.5.0.js"></script>

     

     <!-- Load Test Runner -->

     <script type="text/javascript" src="test-runner.js"></script>

@@ -49,34 +49,34 @@
     

     <!-- Individual Tests -->

 

-    <!--<script type="text/javascript" src="tests/accelerometer.tests.js"></script>

+    <script type="text/javascript" src="tests/accelerometer.tests.js"></script>

     <script type="text/javascript" src="tests/camera.tests.js"></script>

     <script type="text/javascript" src="tests/capture.tests.js"></script>

 

     <script type="text/javascript" src="tests/notification.tests.js"></script>

     <script type="text/javascript" src="tests/network.tests.js"></script>

-    <script type="text/javascript" src="tests/geolocation.tests.js"></script>-->

+    <script type="text/javascript" src="tests/geolocation.tests.js"></script>

 

-    <script type="text/javascript" src="tests/compass.tests.js"></script>

+    <!--<script type="text/javascript" src="tests/compass.tests.js"></script>-->

 

 

 

-    <!--<script type="text/javascript" src="tests/contacts.tests.js"></script>

+    <script type="text/javascript" src="tests/contacts.tests.js"></script>

     <script type="text/javascript" src="tests/file.tests.js"></script>

     <script type="text/javascript" src="tests/filetransfer.tests.js"></script>

     <script type="text/javascript" src="tests/media.tests.js"></script>

 

 

-    <script type="text/javascript" src="tests/storage.tests.js"></script>-->

+    <script type="text/javascript" src="tests/storage.tests.js"></script>

     

-    <!--

+    

     

      

     <script type="text/javascript" src="tests/device.tests.js"></script>

     

 

-    <script type="text/javascript" src="tests/orientation.tests.js"></script>

-    -->

+    <!--<script type="text/javascript" src="tests/orientation.tests.js"></script>  -->

+    

     

     

     

diff --git a/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js b/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
index 537aeda..8a8d1cf 100644
--- a/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
+++ b/tests/MobileSpecUnitTests/www/autotest/tests/device.tests.js
@@ -28,9 +28,9 @@
 			ok(window.device.uuid > 0, "window.device.uuid, as a number, should be greater than 0. (should it, even?)")
 		}
 	});
-	test("should contain a phonegap specification that is a string", function() {
+	test("should contain a cordova version that is a string", function() {
 		expect(2);
-		ok(typeof window.device.phonegap != 'undefined' && window.device.phonegap != null, "window.device.phonegap should not be null.")
-		ok((new String(window.device.phonegap)).length > 0, "window.device.phonegap should contain some kind of description.")
+		ok(typeof window.device.cordova != 'undefined' && window.device.cordova != null, "window.device.cordova should not be null.")
+		ok((new String(window.device.cordova)).length > 0, "window.device.cordova should contain some kind of string value.")
 	});
 };
\ No newline at end of file
diff --git a/tests/MobileSpecUnitTests/www/cordova-1.4.1.js b/tests/MobileSpecUnitTests/www/cordova-1.4.1.js
deleted file mode 100644
index 68237f5..0000000
--- a/tests/MobileSpecUnitTests/www/cordova-1.4.1.js
+++ /dev/null
@@ -1,3832 +0,0 @@
-/* 
-	This is a machine generated file, do not edit directly.  -jm
-*/
-
-
-
-
-/**
- * The order of events during page load and Cordova startup is as follows:
- *
- * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
- * window.onload              Body onload event.
- * onNativeReady              Internal event that indicates the Cordova native side is ready.
- * onCordovaInit             Internal event that kicks off creation of all Cordova JavaScript objects (runs constructors).
- * onCordovaReady            Internal event fired when all Cordova JavaScript objects have been created
- * onCordovaInfoReady        Internal event fired when device properties are available
- * onDeviceReady              User event fired to indicate that Cordova is ready
- * onResume                   User event fired to indicate a start/resume lifecycle event
- * onPause                    User event fired to indicate a pause lifecycle event
- * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
- *
- * The only Cordova events that user code should register for are:
- *      onDeviceReady
- *      onResume
- *
- * Listeners can be registered as:
- *      document.addEventListener("deviceready", myDeviceReadyListener, false);
- *      document.addEventListener("resume", myResumeListener, false);
- *      document.addEventListener("pause", myPauseListener, false);
- */
- 
- if (typeof(DeviceInfo) !== 'object') {
-    var DeviceInfo = {};
-}
-
-var Cordova = {
-	    queue: {
-        ready: true,
-        commands: [],
-        timer: null
-    },
-	available:false,
-	callbackId:0,
-	callbacks:{},
-	resources:{}
-};
-
-Cordova.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-};
-
-/**
- * Determine if resource has been loaded by Cordova
- *
- * @param name
- * @return
- */
-Cordova.hasResource = function(name) {
-    return Cordova.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by Cordova
- *
- * @param name
- */
-Cordova.addResource = function(name) {
-    Cordova.resources[name] = true;
-};
-
-Cordova.exec = function(success, fail, service, action, args)
-{
-	
-	var callbackId = service + Cordova.callbackId++;
-    if (typeof success == "function" || typeof fail == "function") 
-	{
-        Cordova.callbacks[callbackId] = {success:success, fail:fail};
-    }
-
-	 // generate a new command string, ex. DebugConsole/log/DebugConsole23/{"message":"wtf dude?"}
-     var command = service + "/" + action + "/" + callbackId + "/" + JSON.stringify(args);
-        // pass it on to Notify
-     window.external.Notify(command);
-};
-
-CordovaCommandResult = function(status,callbackId,args,cast)
-{
-	if(status === "backbutton") {
-
-		Cordova.fireEvent(document,"backbutton");
-		return "true";
-
-	} else if(status === "resume") {
-
-		Cordova.onResume.fire();
-		return "true";
-
-	} else if(status === "pause") {
-
-		Cordova.onPause.fire();
-		return "true";	
-	}
-	
-	var safeStatus = parseInt(status);
-	if(safeStatus === Cordova.callbackStatus.NO_RESULT ||
-	   safeStatus === Cordova.callbackStatus.OK) {
-		Cordova.CallbackSuccess(callbackId,args,cast);
-	}
-	else
-	{
-		Cordova.CallbackError(callbackId,args,cast);
-	}
-};
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- * @param cast
- */
-Cordova.CallbackSuccess = function(callbackId, args, cast) 
-{
-
-	var commandResult;
-	try
-	{
-	    commandResult = JSON.parse(args);
-
-	    if (typeof cast !== 'undefined') 
-        {
-	        eval('commandResult = ' + cast + '(commandResult);');
-        }
-
-	}
-	catch(exception)
-	{
-		return exception.message;
-    }
-	
-    if (Cordova.callbacks[callbackId] ) {
-
-        // If result is to be sent to callback
-        if (commandResult.status === Cordova.callbackStatus.OK) {
-            try {
-                if (Cordova.callbacks[callbackId].success) {
-                    result = Cordova.callbacks[callbackId].success(commandResult.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = " + e.message);
-            }
-        }
-
-        // Clear callback if not expecting any more results
-        if (!commandResult.keepCallback) {
-            delete Cordova.callbacks[callbackId];
-        }
-    }
-	// Note that in WP7, this method can return a value to the native calling code
-	return "";
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- * @param cast - not supported
- */
-Cordova.CallbackError = function (callbackId, args, cast) {
-	
-	var commandResult;
-	try
-	{
-		commandResult  = JSON.parse(args);
-	}
-	catch(exception)
-	{
-		return exception.message;
-	}
-	
-    if (Cordova.callbacks[callbackId]) {
-        try {
-            if (Cordova.callbacks[callbackId].fail) {
-                Cordova.callbacks[callbackId].fail(commandResult.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete Cordova.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Create a UUID
- *
- * @return {String}
- */
-Cordova.createUUID = function() {
-    return Cordova.UUIDcreatePart(4) + '-' +
-        Cordova.UUIDcreatePart(2) + '-' +
-        Cordova.UUIDcreatePart(2) + '-' +
-        Cordova.UUIDcreatePart(2) + '-' +
-        Cordova.UUIDcreatePart(6);
-};
-
-Cordova.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    var i, uuidchar;
-    for (i=0; i<length; i++) {
-        uuidchar = parseInt((Math.random() * 256),0).toString(16);
-        if (uuidchar.length === 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return {Object}
- */
-Cordova.clone = function(obj) {
-    var i, retVal;
-    if(!obj) { 
-        return obj;
-    }
-    
-    if(obj instanceof Array){
-        retVal = [];
-        for(i = 0; i < obj.length; ++i){
-            retVal.push(Cordova.clone(obj[i]));
-        }
-        return retVal;
-    }
-    
-    if (typeof obj === "function") {
-        return obj;
-    }
-    
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-    
-    retVal = {};
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] !== obj[i]) {
-            retVal[i] = Cordova.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-/*Clones object, but catches exception*/
-Cordova.safeClone = function(obj)
-{
-	try
-	{
-		return Cordova.clone(obj);
-	}
-	catch(e)
-	{
-		console.log("CloneError::" + e.message);
-	}
-	return null;
-};
-
-
-/**
- * Custom pub-sub channel that can have functions subscribed to it
- * @constructor
- */	
-Cordova.Channel = function(type)
-{
-    this.type = type;
-    this.handlers = {};
-    this.guid = 0;
-    this.fired = false;
-    this.enabled = true;	
-};
-
-/**
- * Subscribes the given function to the channel. Any time that
- * Channel.fire is called so too will the function.
- * Optionally specify an execution context for the function
- * and a guid that can be used to stop subscribing to the channel.
- * Returns the guid.
- */
-Cordova.Channel.prototype.subscribe = function(f, c, g) {
-    // need a function to call
-    if (f === null) { return; }
-
-    var func = f;
-    if (typeof c === "object" && typeof f === "function") { func = Cordova.close(c, f); }
-
-    g = g || func.observer_guid || f.observer_guid || this.guid++;
-    func.observer_guid = g;
-    f.observer_guid = g;
-    this.handlers[g] = func;
-    return g;
-};
-
-/**
- * Like subscribe but the function is only called once and then it
- * auto-unsubscribes itself.
- */
-Cordova.Channel.prototype.subscribeOnce = function(f, c) {
-    var g = null;
-    var _this = this;
-    var m = function() {
-        f.apply(c || null, arguments);
-        _this.unsubscribe(g);
-    };
-    if (this.fired) {
-        if (typeof c === "object" && typeof f === "function") { f = Cordova.close(c, f); }
-        f.apply(this, this.fireArgs);
-    } else {
-        g = this.subscribe(m);
-    }
-    return g;
-};
-
-/**
- * Unsubscribes the function with the given guid from the channel.
- */
-Cordova.Channel.prototype.unsubscribe = function(g) {
-    if (typeof g === "function") { g = g.observer_guid; }
-    this.handlers[g] = null;
-    delete this.handlers[g];
-};
-
-/**
- * Calls all functions subscribed to this channel.
- */
-Cordova.Channel.prototype.fire = function(e) {
-    if (this.enabled) {
-        var fail = false;
-        var item, handler, rv;
-        for (item in this.handlers) {
-            if (this.handlers.hasOwnProperty(item)) {
-                handler = this.handlers[item];
-                if (typeof handler === "function") {
-                    rv = (handler.apply(this, arguments) === false);
-                    fail = fail || rv;
-                }
-            }
-        }
-        this.fired = true;
-        this.fireArgs = arguments;
-        return !fail;
-    }
-    return true;
-};
-
-/**
- * Calls the provided function only after all of the channels specified
- * have been fired.
- */
-Cordova.Channel.join = function(h, c) {
-    var i = c.length;
-    var f = function() {
-        if (!(--i)) {
-            h();
-        }
-    };
-    var len = i;
-    var j;
-    for (j=0; j<len; j++) {
-        if (!c[j].fired) {
-            c[j].subscribeOnce(f);
-        }
-        else {
-            i--;
-        }
-    }
-    if (!i) {
-        h();
-    }
-};
-
-/**
- * Boolean flag indicating if the Cordova API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-Cordova.available = DeviceInfo.uuid !== undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once Cordova has been initialized.
- * @param {Function} func The function callback you want run once Cordova is initialized
- */
-Cordova.addConstructor = function(func) 
-{
-    Cordova.onCordovaInit.subscribeOnce(function() {
-        try {
-            func();
-        } catch(e) {
-            console.log("Failed to run constructor: " + e);
-        }
-    });
-};
-
-/**
- * Plugins object
- */
-if (!window.plugins) {
-    window.plugins = {};
-};
-
-/**
- * Adds a plugin object to window.plugins.
- * The plugin is accessed using window.plugins.<name>
- *
- * @param name          The plugin name
- * @param obj           The plugin object
- */
-Cordova.addPlugin = function(name, obj) {
-    if (!window.plugins[name]) {
-        window.plugins[name] = obj;
-    }
-    else {
-        console.log("Error: Plugin "+name+" already exists.");
-    }
-};
-
-/**
- * onDOMContentLoaded channel is fired when the DOM content
- * of the page has been parsed.
- */
-Cordova.onDOMContentLoaded = new Cordova.Channel('onDOMContentLoaded');
-
-/**
- * onNativeReady channel is fired when the Cordova native code
- * has been initialized.
- */
-Cordova.onNativeReady = new Cordova.Channel('onNativeReady');
-
-/**
- * onCordovaInit channel is fired when the web page is fully loaded and
- * Cordova native code has been initialized.
- */
-Cordova.onCordovaInit = new Cordova.Channel('onCordovaInit');
-
-/**
- * onCordovaReady channel is fired when the JS Cordova objects have been created.
- */
-Cordova.onCordovaReady = new Cordova.Channel('onCordovaReady');
-
-/**
- * onCordovaInfoReady channel is fired when the Cordova device properties
- * has been set.
- */
-Cordova.onCordovaInfoReady = new Cordova.Channel('onCordovaInfoReady');
-
-/**
- * onCordovaConnectionReady channel is fired when the Cordova connection properties
- * has been set.
- */
-Cordova.onCordovaConnectionReady = new Cordova.Channel('onCordovaConnectionReady');
-
-/**
- * onResume channel is fired when the Cordova native code
- * resumes.
- */
-Cordova.onResume = new Cordova.Channel('onResume');
-
-/**
- * onPause channel is fired when the Cordova native code
- * pauses.
- */
-Cordova.onPause = new Cordova.Channel('onPause');
-
-/**
- * onDestroy channel is fired when the Cordova native code
- * is destroyed.  It is used internally.
- * Window.onunload should be used by the user.
- */
-Cordova.onDestroy = new Cordova.Channel('onDestroy');
-Cordova.onDestroy.subscribeOnce(function() {
-    Cordova.shuttingDown = true;
-});
-Cordova.shuttingDown = false;
-
-// _nativeReady is global variable that the native side can set
-// to signify that the native code is ready. It is a global since
-// it may be called before any Cordova JS is ready.
-if (typeof _nativeReady !== 'undefined') { Cordova.onNativeReady.fire(); }
-
-/**
- * onDeviceReady is fired only after all Cordova objects are created and
- * the device properties are set.
- */
-Cordova.onDeviceReady = new Cordova.Channel('onDeviceReady');
-
-
-// Array of channels that must fire before "deviceready" is fired
-Cordova.deviceReadyChannelsArray = [ Cordova.onCordovaReady, Cordova.onCordovaInfoReady, Cordova.onCordovaConnectionReady];
-
-// Hashtable of user defined channels that must also fire before "deviceready" is fired
-Cordova.deviceReadyChannelsMap = {};
-
-/**
- * Indicate that a feature needs to be initialized before it is ready to be used.
- * This holds up Cordova's "deviceready" event until the feature has been initialized
- * and Cordova.initComplete(feature) is called.
- *
- * @param feature {String}     The unique feature name
- */
-Cordova.waitForInitialization = function(feature) {
-    if (feature) {
-        var channel = new Cordova.Channel(feature);
-        Cordova.deviceReadyChannelsMap[feature] = channel;
-        Cordova.deviceReadyChannelsArray.push(channel);
-    }
-};
-
-/**
- * Indicate that initialization code has completed and the feature is ready to be used.
- *
- * @param feature {String}     The unique feature name
- */
-Cordova.initializationComplete = function(feature) {
-    var channel = Cordova.deviceReadyChannelsMap[feature];
-    if (channel) {
-        channel.fire();
-    }
-};
-
-/**
- * Create all Cordova objects once page has fully loaded and native side is ready.
- */
-Cordova.Channel.join(
-	function() 
-	{
-		
-		setTimeout(function() 
-		{
-			
-		    Cordova.UsePolling = false;
-		    //Cordova.JSCallback();
-		},1);
-		
-	    // Run Cordova constructors
-	    Cordova.onCordovaInit.fire();
-	
-	    // Fire event to notify that all objects are created
-	    Cordova.onCordovaReady.fire();
-	
-	    // Fire onDeviceReady event once all constructors have run and Cordova info has been
-	    // received from native side, and any user defined initialization channels.
-	    Cordova.Channel.join(function() {
-	        Cordova.onDeviceReady.fire();
-	
-	        // Fire the onresume event, since first one happens before JavaScript is loaded
-	        Cordova.onResume.fire();
-	    }, Cordova.deviceReadyChannelsArray);
-	
-	}, 
-	[ Cordova.onDOMContentLoaded ]);
-
-
-
-// Listen for DOMContentLoaded and notify our channel subscribers
-document.addEventListener('DOMContentLoaded', function() {
-    Cordova.onDOMContentLoaded.fire();
-}, false);
-
-Cordova.m_document_addEventListener = document.addEventListener;
-document.addEventListener = function(evt, handler, capture) 
-{
-	console.log("document.addEventListener event named " + evt);
-	
-    var e = evt.toLowerCase();
-    if (e === 'deviceready') 
-	{
-		Cordova.onDeviceReady.subscribeOnce(handler);
-	}
-    else if (e === 'resume') 
-	{
-        Cordova.onResume.subscribe(handler);
-        if (Cordova.onDeviceReady.fired) 
-		{
-			Cordova.onResume.fire();
-		}
-    } 
-	else if (e === 'pause') 
-	{
-		Cordova.onPause.subscribe(handler);
-	}
-    else 
-	{
-		
-        if (e === 'backbutton') 
-		{
-			Cordova.exec(null, null, "CoreEvents", "overrideBackbutton", [true]);
-		}
-        Cordova.m_document_addEventListener.call(document, evt, handler, capture);
-    }
-};
-
-Cordova.m_document_removeEventListener = document.removeEventListener;
-document.removeEventListener = function(evt, handler, capture) 
-{
-	console.log("document.removeEventListener event named " + evt);
-	
-    var e = evt.toLowerCase();
-	
-	if (e === 'backbutton') 
-	{
-		Cordova.exec(null, null, "CoreEvents", "overrideBackbutton", [false]);
-	}
-	Cordova.m_document_removeEventListener.call(document, evt, handler, capture);
-	
-}
-
-
-Cordova.fireEvent = function(_targ,evtName)
-{
-    var target = _targ || window;
-    var eventObj = document.createEvent('MouseEvents');
-      	eventObj.initEvent( evtName, true, false );
-	target.dispatchEvent( eventObj );
-}
-	
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("accelerometer")) 
-{
-Cordova.addResource("accelerometer");
-
-/** @constructor */
-var Acceleration = function(x, y, z) {
-  this.x = x;
-  this.y = y;
-  this.z = z;
-  this.timestamp = new Date().getTime();
-};
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-var Accelerometer = function() {
-
-    /**
-     * The last known acceleration.  type=Acceleration()
-     */
-    this.lastAcceleration = null;
-
-    /**
-     * List of accelerometer watch timers
-     */
-    this.timers = {};
-};
-
-Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current acceleration.
- *
- * @param {Function} successCallback    The function to call when the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-	
-	var self = this;
-	
-	var onSuccess = function(result)
-	{
-		var accResult = JSON.parse(result);
-		self.lastAcceleration = new Acceleration(accResult.x,accResult.y,accResult.z);
-		successCallback(self.lastAcceleration);
-	}
-	
-	var onError = function(err)
-	{
-		errorCallback(err);
-	}
-
-    // Get acceleration
-    Cordova.exec(onSuccess, onError, "Accelerometer", "getAcceleration",options);
-};
-
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) 
-{
-	var self = this;
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-	
-    var onSuccess = function (result) {
-        var accResult = JSON.parse(result);
-        self.lastAcceleration = new Acceleration(accResult.x, accResult.y, accResult.z);
-        successCallback(self.lastAcceleration);
-    }
-
-    var onError = function (err) {
-        errorCallback(err);
-    }
-
-    var id = Cordova.createUUID();
-
-    var params = new Object();
-    params.id = id;
-    // Default interval (10 sec)
-    params.frequency = (options && options.frequency) ? options.frequency : 10000;
-
-    Cordova.exec(onSuccess, onError, "Accelerometer", "startWatch", params);
-
-    return id; 
-};
-
-/**
- * Clears the specified accelerometer watch.
- *
- * @param {String} id       The id of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(id) {
-
-    Cordova.exec(null, null, "Accelerometer", "stopWatch", { id: id });
-};
-
-Cordova.onCordovaInit.subscribeOnce(
-function()
-{
-    if (!navigator.accelerometer) 
-	{
-        navigator.accelerometer = new Accelerometer();
-    }
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("camera")) {
-Cordova.addResource("camera");
-
-/**
- * This class provides access to the device camera.
- *
- * @constructor
- */
-var Camera = function() {
-    this.successCallback = null;
-    this.errorCallback = null;
-    this.options = null;
-};
-
-/**
- * Format of image that returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri (content://media/external/images/media/2 for Android)
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Encoding of image returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.CAMERA,
- *                encodingType: Camera.EncodingType.PNG})
-*/
-Camera.EncodingType = {
-    JPEG: 0,                    // Return JPEG encoded image
-    PNG: 1                      // Return PNG encoded image
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library (same as PHOTOLIBRARY for Android)
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-    console.log("Camera.prototype.getPicture");
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-
-    this.options = options;
-
-// TODO: This is duplicate - default values initialization exists in native C# code
-//    var quality = 80;
-//    if (options.quality) {
-//        quality = this.options.quality;
-//    }
-//    
-//    var maxResolution = 0;
-//    if (options.maxResolution) {
-//    	maxResolution = this.options.maxResolution;
-//    }
-//    
-//    var destinationType = Camera.DestinationType.DATA_URL;
-//    if (this.options.destinationType) {
-//        destinationType = this.options.destinationType;
-//    }
-//    var sourceType = Camera.PictureSourceType.CAMERA;
-//    if (typeof this.options.sourceType === "number") {
-//        sourceType = this.options.sourceType;
-//    }
-//    var encodingType = Camera.EncodingType.JPEG;
-//    if (typeof options.encodingType == "number") {
-//        encodingType = this.options.encodingType;
-//    }
-//    
-//    var targetWidth = -1;
-//    if (typeof options.targetWidth == "number") {
-//        targetWidth = options.targetWidth;
-//    } else if (typeof options.targetWidth == "string") {
-//        var width = new Number(options.targetWidth);
-//        if (isNaN(width) === false) {
-//            targetWidth = width.valueOf();
-//        }
-//    }
-
-//    var targetHeight = -1;
-//    if (typeof options.targetHeight == "number") {
-//        targetHeight = options.targetHeight;
-//    } else if (typeof options.targetHeight == "string") {
-//        var height = new Number(options.targetHeight);
-//        if (isNaN(height) === false) {
-//            targetHeight = height.valueOf();
-//        }
-//    }
-
-    Cordova.exec(successCallback, errorCallback, "Camera", "getPicture", this.options);
-};
-
-Cordova.onCordovaInit.subscribeOnce(function() {
-    if (typeof navigator.camera === "undefined") {
-        navigator.camera = new Camera();
-    }
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("capture")) {
-Cordova.addResource("capture");
-	
-/**
- * Represents a single file.
- *
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || null;
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
-};
-
-/**
- * Get file meta information
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback){
-	Cordova.exec(successCallback, errorCallback, "Capture", "getFormatData", {fullPath: this.fullPath, type: this.type});
-};
-
-
-/**
- * Open file in device media player
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.play = function(successCallback, errorCallback){
-	Cordova.exec(successCallback, errorCallback, "Capture", "play", this);
-};
-
-
-/**
- * MediaFileData encapsulates format information of a media file.
- *
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
-};
-
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-var CaptureError = function(){
-	this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-var Capture = function(){
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
-	Cordova.exec(successCallback, errorCallback, "Capture", "captureAudio", options);
-};
-
-/**
- * Launch camera application for taking image(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function (successCallback, errorCallback, options) {
-    Cordova.exec(successCallback, errorCallback, "Capture", "captureImage", options);
-};
-
-/**
- * Launch device camera application for recording video(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
-	Cordova.exec(successCallback, errorCallback, "Capture", "captureVideo", options);
-};
-
-/**
-* This function returns and array of MediaFiles.  It is required as we need to convert raw
-* JSON objects into MediaFile objects. 
-*/
-Capture.prototype._castMediaFile = function(pluginResult){
-	var mediaFiles = [];
-	var i;
-	for (i = 0; i < pluginResult.message.length; i++) {
-		var mediaFile = new MediaFile();
-		mediaFile.name = pluginResult.message[i].name;
-		mediaFile.fullPath = pluginResult.message[i].fullPath;
-		mediaFile.type = pluginResult.message[i].type;
-		mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-		mediaFile.size = pluginResult.message[i].size;
-		mediaFiles.push(mediaFile);
-	}
-	pluginResult.message = mediaFiles;
-	return pluginResult;
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-var ConfigurationData = function(){
-	// The ASCII-encoded string in lower case representing the media type. 
-	this.type = null;
-	// The height attribute represents height of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0. 
-	this.height = 0;
-	// The width attribute represents width of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0
-	this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
-};
-Cordova.onCordovaInit.subscribeOnce(function () {
-	if (typeof navigator.device === "undefined") {
-		navigator.device = window.device = new Device();
-	}
-    if (typeof navigator.device.capture === "undefined") {
-        console.log("Installing capture");
-		navigator.device.capture = window.device.capture = new Capture();
-	}
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("compass")) {
-Cordova.addResource("compass");
-
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-var Compass = function() {
-    /**
-     * The last known Compass position.
-     */
-    this.lastHeading = null;
-	this.isCompassSupported = true; // default assumption
-};
-
-// Capture error codes
-CompassError = {
-	COMPASS_INTERNAL_ERR:0,
-	COMPASS_NOT_SUPPORTED:20
-}
-
-/**
- * Asynchronously aquires the current heading.
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {PositionOptions} options The options for getting the heading data such as timeout. (OPTIONAL)
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        //return;
-		
-		errorCallback = function(){};
-    }
-	
-	if(this.isCompassSupported)
-	{	
-		var self = this;
-		var onSuccess = function(result)
-		{
-			var compassResult = JSON.parse(result);
-			//console.log("compassResult = " + result);
-			self.lastHeading = compassResult;
-			successCallback(self.lastHeading);
-		}
-		
-		var onError = function(res)
-		{
-			var err = JSON.parse(res);
-			if(err.code == CompassError.COMPASS_NOT_SUPPORTED)
-			{
-				self.isCompassSupported = false;	
-			}
-			errorCallback(err);
-		}
-	
-		// Get heading
-		Cordova.exec(onSuccess, onError, "Compass", "getHeading", []);
-	}
-	else
-	{
-		var funk = function()
-		{
-			errorCallback({code:CompassError.COMPASS_NOT_SUPPORTED});
-		};
-		window.setTimeout(funk,0); // async
-	}
-};
-
-/**
- * Asynchronously aquires the heading repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the heading data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {HeadingOptions} options      The options for getting the heading data such as timeout and the frequency of the watch. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
-
-    // Default interval (100 msec)
-    
-	var self = this;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return -1; // in case caller later calls clearWatch with this id
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return -1; // in case caller later calls clearWatch with this id
-    }
-	
-	if(this.isCompassSupported)
-	{	
-		var onSuccess = function (result) {
-			var compassResult = JSON.parse(result);
-			self.lastHeading = compassResult;
-			successCallback(self.lastHeading);
-		}
-	
-		var onError = function (res) {
-			var err = JSON.parse(res);
-			if(err.code == CompassError.COMPASS_NOT_SUPPORTED)
-			{
-				self.isCompassSupported = false;	
-			}
-	
-			errorCallback(err);
-		}
-	
-		var id = Cordova.createUUID();
-	
-		var params = {id:id,frequency:((options && options.frequency) ? options.frequency : 100)};
-	
-		Cordova.exec(onSuccess, onError, "Compass", "startWatch", params);
-	
-		return id; 
-	}
-	else
-	{
-		var funk = function()
-		{
-			errorCallback({code:CompassError.COMPASS_NOT_SUPPORTED});
-		};
-		window.setTimeout(funk,0); // async
-		return -1;
-	}
-
-};
-
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) {
-
-	Cordova.exec(null, null, "Compass", "stopWatch", { id: id });
-
-};
-
-Cordova.onCordovaInit.subscribeOnce(
-function()
-{
-    if (!navigator.compass) 
-	{
-        navigator.compass = new Compass();
-    }
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("contact")) {
-Cordova.addResource("contact");
-
-/**
-* Contains information about a single contact.
-* @constructor
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {Array.<ContactField>} phoneNumbers array of phone numbers
-* @param {Array.<ContactField>} emails array of email addresses
-* @param {Array.<ContactAddress>} addresses array of addresses
-* @param {Array.<ContactField>} ims instant messaging user ids
-* @param {Array.<ContactOrganization>} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {Array.<ContactField>} photos
-* @param {Array.<ContactField>} categories
-* @param {Array.<ContactField>} urls contact's web sites
-*/
-var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.rawId = null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null;
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; // ContactField[]
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurreds
- * @constructor
- */
-var ContactError = function(errCode) {
-    this.code=errCode;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.remove = function(successCB, errorCB) 
-{
-    if (!this.id) 
-	{
-        var errorObj = new ContactError(ContactError.UNKNOWN_ERROR);
-		setTimeout(function(){
-        errorCB(errorObj);
-		},0);
-		return ContactError.UNKNOWN_ERROR;
-    }
-    else 
-	{
-        Cordova.exec(successCB, errorCB, "Contacts", "remove",this.id);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = Cordova.safeClone(this);
-    var i;
-    clonedContact.id = null;
-    clonedContact.rawId = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-	var myArrayProps = ["phoneNumbers","emails","addresses","ims","organizations","tags","photos","urls"];
-	
-	for(var n=0, pLen=myArrayProps.length;n < pLen; n++)
-	{
-		var arr = clonedContact[myArrayProps[n]];
-		if (arr && arr.length)
-		{
-			for(var i=0,len=arr.length; i<len;i++)
-			{
-				arr[i].id = null;
-			}
-		}
-	}
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.save = function(successCB, errorCB) 
-{
-	var self = this;
-	function onSuccess(res)
-	{
-		setTimeout(function()
-		{
-			successCB(self);
-		},0);
-	}
-    Cordova.exec(onSuccess, errorCB, "Contacts", "save", this);
-};
-
-/**
-* Contact name.
-* @constructor
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted || null;
-    this.familyName = familyName || null;
-    this.givenName = givenName || null;
-    this.middleName = middle || null;
-    this.honorificPrefix = prefix || null;
-    this.honorificSuffix = suffix || null;
-};
-
-/**
-* Generic contact field.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param type
-* @param value
-* @param pref
-*/
-var ContactField = function(type, value, pref) {
-	this.id = null;
-    this.type = type || null;
-    this.value = value || null;
-    this.pref = pref || null;
-};
-
-/**
-* Contact address.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.formatted = formatted || null;
-    this.streetAddress = streetAddress || null;
-    this.locality = locality || null;
-    this.region = region || null;
-    this.postalCode = postalCode || null;
-    this.country = country || null;
-};
-
-/**
-* Contact organization.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param name
-* @param dept
-* @param title
-* @param startDate
-* @param endDate
-* @param location
-* @param desc
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.name = name || null;
-    this.department = dept || null;
-    this.title = title || null;
-};
-
-/**
-* Represents a group of Contacts.
-* @constructor
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = [];
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-    if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-        if (typeof errorCB === "function") 
-		{
-			// escape this scope before we call the errorCB
-			setTimeout(function() {
-            errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-			},0);
-        }
-		console.log("Contacts.find::ContactError::INVALID_ARGUMENT_ERROR");
-    } 
-	else 
-	{
-		var onSuccess = function(res)
-		{
-			setTimeout(function()
-			{
-				successCB(res);
-			},0);
-		}
-        Cordova.exec(onSuccess, errorCB, "Contacts", "search", {"fields":fields,"options":options});        
-    }
-};
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-	var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.contacts.find but before the find methods success call back.
-*
-* @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
-* @returns an array of Contact objects
-*/
-Contacts.prototype.cast = function(pluginResult) {
-	var contacts = [];
-	var i;
-	for (i=0; i<pluginResult.message.length; i++) {
-		contacts.push(navigator.contacts.create(pluginResult.message[i]));
-	}
-	pluginResult.message = contacts;
-	return pluginResult;
-};
-
-/**
- * ContactFindOptions.
- * @constructor
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- * Add the contact interface into the browser.
- */
-Cordova.onCordovaInit.subscribeOnce(function() {
-    if(typeof navigator.contacts === "undefined") {
-        navigator.contacts = new Contacts();
-    }
-});
-}
-
-/*
- * Cordova is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010-2011, IBM Corporation
- * Copyright (c) 2011, Microsoft Corporation
- */
-
-if (!Cordova.hasResource("debugConsole")) {
-Cordova.addResource("debugConsole");
-
-var debugConsole = 
-{
-	log:function(msg){
-		Cordova.exec(null,null,"DebugConsole","log",msg);
-	},
-	warn:function(msg){
-		Cordova.exec(null,null,"DebugConsole","warn",msg);
-	},
-	error:function(msg){
-		Cordova.exec(null,null,"DebugConsole","error",msg);
-	}	
-};
-
-
-if(typeof window.console == "undefined")
-{
-	window.console = {
-		log:function(str){
-			if(navigator.debugConsole){
-				navigator.debugConsole.log(str);
-			}
-			else
-			{// In case log messages are received before device ready
-				window.external.Notify("Info:" + str);
-			}
-		}
-	};
-}
-
-// output any errors to console log, created above.
-window.onerror=function(e)
-{
-	if(navigator.debugConsole)
-	{
-		navigator.debugConsole.error(JSON.stringify(e));
-	}
-	else
-	{// In case errors occur before device ready
-		window.external.Notify("Error:" + JSON.stringify(e));	
-	}
-};
-
-
-
-Cordova.onCordovaInit.subscribeOnce(function() {
-	navigator.debugConsole = debugConsole;
-});
-
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("device")) {
-Cordova.addResource("device");
-
-/**
- * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-var Device = function() {
-    this.available = Cordova.available;
-    this.platform = null;
-    this.version = null;
-    this.name = null;
-    this.uuid = null;
-    this.phonegap = null;
-
-    var me = this;
-    this.getInfo(
-        function (res) {
-            var info = JSON.parse(res);
-            console.log("GotDeviceInfo :: " + info.version);
-            me.available = true;
-            me.platform = info.platform;
-            me.version = info.version;
-            me.name = info.name;
-            me.uuid = info.uuid;
-            me.phonegap = info.phonegap;
-
-            Cordova.onCordovaInfoReady.fire();
-        },
-        function(e) {
-            me.available = false;
-            console.log("Error initializing Cordova: " + e);
-        });
-};
-
-/**
- * Get device info
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- */
-Device.prototype.getInfo = function(successCallback, errorCallback) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Device Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Device Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get info
-    Cordova.exec(successCallback, errorCallback, "Device", "Get");
-};
-
-Cordova.onCordovaInit.subscribeOnce(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-    });
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-// this is a WP7 Only implementation of the Storage API for use in webpages loaded from the local file system
-// inside phonegap application.
-// there is a native implementation which is backing this and providing the persistance of values.
-// webpages loaded from a domain will not need to use this as IE9 has support for WebStorage
-// Javascript Interface is as defined here : http://dev.w3.org/html5/webstorage/#storage-0
-// 
-
-if(!window.localStorage)
-{(function()
-{
-    "use strict";
-
-    var DOMStorage = function(type)
-    {
-        // default type is local
-        if(type == "sessionStorage")
-        {
-            this._type = type;
-        }
-        Object.defineProperty( this, "length", 
-        {
-            configurable: true,
-            get: function(){ return this.getLength() }
-        });
-
-    };
-
-    DOMStorage.prototype = 
-    {
-        _type:"localStorage",
-        _result:null,
-        keys:null,
-    
-        onResult:function(key,valueStr)
-        {
-            if(!this.keys)
-            {
-                this.keys = [];
-            }
-            this._result = valueStr;
-        },
-
-        onKeysChanged:function(jsonKeys)
-        {
-            this.keys = JSON.parse(jsonKeys);
-
-            var key;
-            for(var n = 0,len =this.keys.length; n < len; n++)
-            {
-                key = this.keys[n];
-                if(!this.hasOwnProperty(key))
-                {
-                    Object.defineProperty( this, key, 
-                    {
-
-                        configurable: true,
-                        get: function(){ return this.getItem(key); },
-                        set: function(val){ return this.setItem(key,val); }
-                    });
-                }
-            }
-
-        },
-
-        initialize:function()
-        {
-            window.external.Notify("DOMStorage/" + this._type + "/load/keys");
-        },
-
-    /*
-        The length attribute must return the number of key/value pairs currently present in the list associated with the object.
-    */
-        getLength:function()
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-            return this.keys.length;
-        },
-
-    /*
-        The key(n) method must return the name of the nth key in the list. 
-        The order of keys is user-agent defined, but must be consistent within an object so long as the number of keys doesn't change. 
-        (Thus, adding or removing a key may change the order of the keys, but merely changing the value of an existing key must not.) 
-        If n is greater than or equal to the number of key/value pairs in the object, then this method must return null. 
-    */
-        key:function(n)
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-
-            if(n >= this.keys.length)
-            {
-                return null;
-            }
-            else
-            {
-                return this.keys[n];
-            }
-        },
-
-    /*
-        The getItem(key) method must return the current value associated with the given key. 
-        If the given key does not exist in the list associated with the object then this method must return null.
-    */
-        getItem:function(key)
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-
-            var retVal = null;
-            if(this.keys.indexOf(key) > -1)
-            {
-                window.external.Notify("DOMStorage/" + this._type + "/get/" + key);
-                retVal = this._result;
-                this._result = null;
-            }
-            return retVal;
-        },
-    /*
-        The setItem(key, value) method must first check if a key/value pair with the given key already exists 
-        in the list associated with the object.
-        If it does not, then a new key/value pair must be added to the list, with the given key and with its value set to value.
-        If the given key does exist in the list, then it must have its value updated to value.
-        If it couldn't set the new value, the method must raise an QUOTA_EXCEEDED_ERR exception. 
-        (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)
-    */
-        setItem:function(key,value)
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-            window.external.Notify("DOMStorage/" + this._type + "/set/" + key + "/" + value);
-        },
-
-    /*
-        The removeItem(key) method must cause the key/value pair with the given key to be removed from the list 
-        associated with the object, if it exists. 
-        If no item with that key exists, the method must do nothing.
-    */
-        removeItem:function(key)
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-            var index = this.keys.indexOf(key);
-            if(index > -1)
-            {
-                this.keys.splice(index,1);
-                // TODO: need sanity check for keys ? like 'clear','setItem', ...
-                window.external.Notify("DOMStorage/" + this._type + "/remove/" + key);
-                delete this[key];
-            }
-            
-        },
-
-    /*
-        The clear() method must atomically cause the list associated with the object to be emptied of all 
-        key/value pairs, if there are any. 
-        If there are none, then the method must do nothing.
-    */
-        clear:function()
-        {
-            if(!this.keys)
-            {
-                this.initialize();
-            }
-
-            for(var n=0,len=this.keys.length; n < len;n++)
-            {
-                // TODO: do we need a sanity check for keys ? like 'clear','setItem', ...
-                delete this[this.keys[n]];
-            }
-            this.keys = [];
-            window.external.Notify("DOMStorage/" + this._type + "/clear/");
-        }
-    };
-
-    // initialize DOMStorage
-    
-    Object.defineProperty( window, "localStorage", 
-    {
-        writable: false,
-        configurable: false,
-        value:new DOMStorage("localStorage")
-    });
-    window.localStorage.initialize();
-
-    Object.defineProperty( window, "sessionStorage", 
-    {
-        writable: false,
-        configurable: false,
-        value:new DOMStorage("sessionStorage")
-    });
-    window.sessionStorage.initialize();
-
-
-})();};
-
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("file")) {
-Cordova.addResource("file");
-
-/**
- * Represents a single file.
- *
- * @constructor
- * @param name {DOMString} name of the file, without path information
- * @param fullPath {DOMString} the full path of the file, including the name
- * @param type {DOMString} mime type
- * @param lastModifiedDate {Date} last modified date
- * @param size {Number} size of the file in bytes
- */
-var File = function(name, fullPath, type, lastModifiedDate, size) {
-	this.name = name || null;
-    this.fullPath = fullPath || null;
-	this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-};
-
-/** @constructor */
-var FileError = function() {
-   this.code = null;
-};
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File manager
-//-----------------------------------------------------------------------------
-
-/** @constructor */
-var FileMgr = function() {
-};
-
-FileMgr.prototype.getFileBasePaths = function() {
-};
-
-FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
-    return Cordova.exec(successCallback, errorCallback, "File", "testFileExists", {fileName: fileName});
-};
-
-FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
-    return Cordova.exec(successCallback, errorCallback, "File", "testDirectoryExists", {dirName: dirName});
-};
-
-FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
-    return Cordova.exec(successCallback, errorCallback, "File", "getFreeDiskSpace");
-};
-
-FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "write", {fileName: fileName, data: data, position: position});
-};
-
-FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "truncate", {fileName: fileName, size: size});
-};
-
-FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "readAsText", {fileName: fileName, encoding: encoding});
-};
-
-FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "readAsDataURL", {fileName: fileName});
-};
-
-Cordova.addConstructor(function() {
-    if (typeof navigator.fileMgr === "undefined") {
-        navigator.fileMgr = new FileMgr();
-    }
-});
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-// TODO: All other FileMgr function operate on the SD card as root.  However,
-//       for FileReader & FileWriter the root is not SD card.  Should this be changed?
-
-/**
- * This class reads the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To read from the SD card, the file name is "sdcard/my_file.txt"
- * @constructor
- */
-var FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-};
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        this.onloadend({"type":"loadend", "target":this});
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          {File} File object containing file properties
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-	if (typeof file.fullPath === "undefined") {
-		this.fileName = file;
-	} else {
-		this.fileName = file.fullPath;
-	}
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsText(this.fileName, enc,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-		    me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }
-        );
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-	this.fileName = "";
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsDataURL(this.fileName,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }
-        );
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To write to the SD card, the file name is "sdcard/my_file.txt"
- *
- * @constructor
- * @param file {File} File object containing file properties
- * @param append if true write to the end of the file, otherwise overwrite the file
- */
-var FileWriter = function (file) {
-    this.fileName = "";
-    this.length = 0;
-    if (file) {
-        this.fileName = file.fullPath || file;
-        this.length = file.size || 0;
-    }
-    // default is to write at the beginning of the file
-    this.position = 0;
-
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null; // When writing starts
-    this.onprogress = null; 	// While writing the file, and reporting partial file data
-    this.onwrite = null; 	// When the write has successfully completed.
-    this.onwriteend = null; 	// When the request has completed (either in success or failure).
-    this.onabort = null; 	// When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null; 	// When the write has failed (see errors).
-};
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend == "function") {
-        this.onwriteend({"type":"writeend", "target":this});
-    }
-};
-
-/**
- * Writes data to the file
- *
- * @param text to be written
- */
-FileWriter.prototype.write = function (text) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({ "type": "writestart", "target": me });
-    }
-
-    // Write file
-    navigator.fileMgr.write(this.fileName, text, this.position,
-
-    // Success callback
-        function (r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-            // The length of the file is now where we are done writing.
-            me.length = me.position;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({ "type": "write", "target": me });
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({ "type": "writeend", "target": me });
-            }
-        },
-
-    // Error callback
-        function (e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({ "type": "error", "target": me });
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({ "type": "writeend", "target": me });
-            }
-        }
-        );
-
-};
-
-/**
- * Moves the file pointer to the location specified.
- *
- * If the offset is a negative number the position of the file
- * pointer is rewound.  If the offset is greater than the file
- * size the position is set to the end of the file.
- *
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-
-    // See back from end of file.
-    if (offset < 0) {
-		this.position = Math.max(offset + this.length, 0);
-	}
-    // Offset is bigger then file size so set position
-    // to the end of the file.
-	else if (offset > this.length) {
-		this.position = this.length;
-	}
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-	else {
-		this.position = offset;
-	}
-};
-
-/**
- * Truncates the file to the size specified.
- *
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({"type":"writestart", "target":this});
-    }
-
-    // Write file
-    navigator.fileMgr.truncate(this.fileName, size,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({"type":"write", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        }
-    );
-};
-
-/**
- * Information about the state of the file or directory
- *
- * @constructor
- * {Date} modificationTime (readonly)
- */
-var Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- *
- * @constructor
- * @param {boolean} create file or directory if it doesn't exist
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-var Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- *
- * @constructor
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-var FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- * @constructor
- */
-var DirectoryReader = function(fullPath){
-    this.fullPath = fullPath || null;
-};
-
-/**
- * Returns a list of entries from a directory.
- *
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "readEntries", {fullPath: this.fullPath});
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "copyTo", {fullPath: this.fullPath, parent:parent, newName: newName});
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getMetadata", {fullPath: this.fullPath});
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getParent", {fullPath: this.fullPath});
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "moveTo", {fullPath: this.fullPath, parent: parent, newName: newName});
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "remove", {fullPath: this.fullPath});
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-DirectoryEntry.prototype.toURI = function(mimeType) {
-    
-    return encodeURI("file://" + this.fullPath);
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function (path, options, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getDirectory", { fullPath: this.fullPath, path: path, options: options });
-};
-
-/**
- * Creates or looks up a file
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function (path, options, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getFile", { fullPath: this.fullPath, path: path, options: options });
-};
-
-/**
- * Deletes a directory and all of it's contents
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "removeRecursively", {fullPath: this.fullPath});
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "copyTo", {fullPath: this.fullPath, parent: parent, newName: newName});
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getMetadata", {fullPath: this.fullPath});
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getParent", {fullPath: this.fullPath});
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "moveTo", {fullPath: this.fullPath, parent: parent, newName: newName});
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "remove", {fullPath: this.fullPath});
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-FileEntry.prototype.toURI = function(mimeType) {
-    return encodeURI("file://" + this.fullPath);
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function (successCallback, errorCallback) {
-    this.file(function (filePointer) {
-        var writer = new FileWriter(filePointer);
-
-        if (writer.fileName === null || writer.fileName === "") {
-            if (typeof errorCallback == "function") {
-                errorCallback({
-                    "code": FileError.INVALID_STATE_ERR
-                });
-            }
-        }
-
-        if (typeof successCallback == "function") {
-            successCallback(writer);
-        }
-    }, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "getFileMetadata", {fullPath: this.fullPath});
-};
-
-/** @constructor */
-var LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- *
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-    if (type < 0 || type > 3) {
-        if (typeof errorCallback == "function") {
-            errorCallback({
-                "code": FileError.SYNTAX_ERR
-            });
-        }
-    }
-    else {
-        Cordova.exec(successCallback, errorCallback, "File", "requestFileSystem", {type: type, size: size});
-    }
-};
-
-/**
- *
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    Cordova.exec(successCallback, errorCallback, "File", "resolveLocalFileSystemURI", {uri: uri});
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.service.contacts.find but before the find methods success call back.
-*
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry
-*/
-LocalFileSystem.prototype._castFS = function (pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        console.log("This is a dir");
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-        console.log("This is a file");
-        entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-    var retVal = [];
-    for (var i=0; i<entries.length; i++) {
-        retVal.push(window.localFileSystem._createEntry(entries[i]));
-    }
-    pluginResult.message = retVal;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-    var entry = null;
-    if (castMe.isDirectory) {
-        console.log("This is a dir");
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        console.log("This is a file");
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;
-};
-
-LocalFileSystem.prototype._castDate = function (pluginResult) {
-    if (pluginResult.message.modificationTime) {
-        var modTime = new Date(pluginResult.message.modificationTime);
-        pluginResult.message.modificationTime = modTime;
-    }
-    else if (pluginResult.message.lastModifiedDate) {
-        var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-        file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-        pluginResult.message = file;
-    }
-    return pluginResult;
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-Cordova.onCordovaInit.subscribeOnce(function () {
-    var pgLocalFileSystem = new LocalFileSystem();
-	// Needed for cast methods
-    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
-    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
-    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("filetransfer")) {
-Cordova.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- * @constructor
- */
-var FileTransfer = function() {};
-
-/**
- * FileUploadResult
- * @constructor
- */
-var FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-};
-
-/**
- * FileTransferError
- * @constructor
- */
-var FileTransferError = function() {
-    this.code = null;
-};
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
-
-    // check for options
-    var params = null;
-    if (options) {
-        if (options.params) {
-            var dict=new Array(); 
-            var idx = 0;
-
-            for (var key in options.params) {
-                if (options.params.hasOwnProperty(key)) {
-                    var value = options.params[key];
-                    var item = new Object();
-                    item.Key = key;
-                    item.Value = value;
-                    dict[idx] = item;    
-                    idx++;
-                }
-            }
-
-            options.params = dict;
-        }
-    } else {
-        options = new FileUploadOptions();
-    }    
-
-    options.filePath = filePath;
-    options.server = server;
-
-    Cordova.exec(successCallback, errorCallback, 'FileTransfer', 'upload', options);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @constructor
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-};
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("media")) {
-Cordova.addResource("media");
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @constructor
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-var Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback !== "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback !== "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (positionCallback && (typeof positionCallback !== "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = Cordova.createUUID();
-    Cordova.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-var MediaError = function() {
-    this.code = null;
-    this.message = "";
-};
-
-MediaError.MEDIA_ERR_PLAY_MODE_SET = 1;
-MediaError.MEDIA_ERR_ALREADY_RECORDING = 2;
-MediaError.MEDIA_ERR_STARTING_RECORDING = 3;
-MediaError.MEDIA_ERR_RECORD_MODE_SET = 4;
-MediaError.MEDIA_ERR_STARTING_PLAYBACK = 5;
-MediaError.MEDIA_ERR_RESUME_STATE = 6;
-MediaError.MEDIA_ERR_PAUSE_STATE = 7;
-MediaError.MEDIA_ERR_STOP_STATE = 8;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function() {
-    Cordova.exec(null, null, "Media", "startPlayingAudio", {id: this.id, src: this.src});
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    return Cordova.exec(null, null, "Media", "stopPlayingAudio", {id: this.id});
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    Cordova.exec(null, null, "Media", "seekToAudio", {id: this.id, milliseconds: milliseconds});
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    Cordova.exec(null, null, "Media", "pausePlayingAudio", {id: this.id});
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- */
-Media.prototype.getCurrentPosition = function(success, fail) {
-    Cordova.exec(success, fail, "Media", "getCurrentPositionAudio", {id: this.id});
-};
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    Cordova.exec(null, null, "Media", "startRecordingAudio", {id: this.id, src: this.src});
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    Cordova.exec(null, null, "Media", "stopRecordingAudio", {id: this.id});
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    Cordova.exec(null, null, "Media", "release", {id: this.id});
-};
-
-/**
- * List of media objects.
- * PRIVATE
- */
-Cordova.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- * @constructor
- */
-Cordova.Media = function() {};
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-Cordova.Media.getMediaObject = function(id) {
-    return Cordova.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param status        The status code (int)
- * @param msg           The status message (string)
- */
-Cordova.Media.onStatus = function(id, msg, value) {
-    var media = Cordova.mediaObjects[id];
-    // If state update
-    if (msg === Media.MEDIA_STATE) {
-        if (value === Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg === Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg === Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_POSITION) {
-        media._position = value;
-    }
-};
-
-// We need special proxy to invoke Cordova.Media.onStatus (method is not visible in other case)
-// http://stackoverflow.com/questions/7322420/calling-javascript-object-method-using-webbrowser-document-invokescript
-CordovaMediaonStatus = function (args) {
-    var res = JSON.parse(args);
-    Cordova.Media.onStatus(res.id, res.msg, res.value);
-}
-
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("network")) {
-Cordova.addResource("network");
-
-/**
- * This class contains information about the current network Connection.
- * @constructor
- */
-var Connection = function() 
-{
-    this.type = null;
-    this._firstRun = true;
-    this._timer = null;
-    this.timeout = 500;
-
-    var me = this;
-    this.getInfo(
-        function(type) {
-			//console.log("getInfo result" + type);
-            // Need to send events if we are on or offline
-            if (type == "none") {
-                // set a timer if still offline at the end of timer send the offline event
-                me._timer = setTimeout(function(){
-                    me.type = type;
-					//console.log("Cordova.fireEvent::offline");
-                    Cordova.fireEvent(document,'offline');
-                    me._timer = null;
-                    }, me.timeout);
-            } else {
-                // If there is a current offline event pending clear it
-                if (me._timer != null) {
-                    clearTimeout(me._timer);
-                    me._timer = null;
-                }
-                me.type = type;
-				//console.log("Cordova.fireEvent::online " + me.type);
-                Cordova.fireEvent(document,'online');
-            }
-            
-            // should only fire this once
-            if (me._firstRun) 
-			{
-                me._firstRun = false;
-				//console.log("onCordovaConnectionReady");
-                Cordova.onCordovaConnectionReady.fire();
-            }            
-        },
-        function(e) {
-            console.log("Error initializing Network Connection: " + e);
-        });
-};
-
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-Connection.CELL = "cellular";
-
-/**
- * Get connection info
- *
- * @param {Function} successCallback The function to call when the Connection data is available
- * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
- */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
-    // Get info
-    Cordova.exec(successCallback, errorCallback, "Connection", "getConnectionInfo", []);
-};
-
-
-Cordova.onCordovaInit.subscribeOnce(function() {
-
-	navigator.network = navigator.network || {};
-    if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
-    }
-});
-}
-
-/*  
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-if (!Cordova.hasResource("notification")) {
-Cordova.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- * @constructor
- */
-var Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) 
-{
-    var _title = (title || "Alert");
-    var _buttonLabels = (buttonLabel || "OK");
-    Cordova.exec(completeCallback, null, "Notification", "alert",{"message":message,"title":_title,"buttonLabels":_buttonLabels});
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) 
-{
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    Cordova.exec(resultCallback, null, "Notification", "confirm", {'message':message,"title":_title,"buttonLabels":_buttonLabels});
-};
-
-/**
- * Start spinning the activity indicator on the statusbar
- */
-Notification.prototype.activityStart = function() {
-    Cordova.exec(null, null, "Notification", "activityStart", ["Busy","Please wait..."]);
-};
-
-/**
- * Stop spinning the activity indicator on the statusbar, if it's currently spinning
- */
-Notification.prototype.activityStop = function() {
-    Cordova.exec(null, null, "Notification", "activityStop", []);
-};
-
-/**
- * Display a progress dialog with progress bar that goes from 0 to 100.
- *
- * @param {String} title        Title of the progress dialog.
- * @param {String} message      Message to display in the dialog.
- */
-Notification.prototype.progressStart = function(title, message) {
-    Cordova.exec(null, null, "Notification", "progressStart", [title, message]);
-};
-
-/**
- * Set the progress dialog value.
- *
- * @param {Number} value         0-100
- */
-Notification.prototype.progressValue = function(value) {
-    Cordova.exec(null, null, "Notification", "progressValue", [value]);
-};
-
-/**
- * Close the progress dialog.
- */
-Notification.prototype.progressStop = function() {
-    Cordova.exec(null, null, "Notification", "progressStop", []);
-};
-
-/**
- * Causes the device to blink a status LED.
- *
- * @param {Integer} count       The number of blinks.
- * @param {String} colour       The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-    // NOT IMPLEMENTED
-};
-
-/**
- * Causes the device to vibrate.
- *
- * @param {Integer} mills       The number of milliseconds to vibrate for.
- */
-Notification.prototype.vibrate = function(mills) 
-{
-    Cordova.exec(null, null, "Notification", "vibrate", {duration:mills});
-};
-
-/**
- * Causes the device to beep.
- * A packaged resource is played "repeatCount" times.
- *
- * @param {Integer} repeatCount       The number of beeps. default 1
- */
-Notification.prototype.beep = function(repeatCount) 
-{
-	var count = repeatCount|| 1;
-    Cordova.exec(null, null, "Notification", "beep", count);
-};
-
-Cordova.onCordovaInit.subscribeOnce(function() {
-    if (typeof navigator.notification === "undefined") {
-        navigator.notification = new Notification();
-    }
-});
-}
-
-                          
-/**
- * @author purplecabbage
- */
-                          
-(function(win,doc){
-
-
-    doc.addEventListener("DOMContentLoaded",function()
-    {
-    	var docDomain = null;
-	    try
-	    {
-	       docDomain = doc.domain;
-	    }
-	    catch(err)
-	    {
-	         //console.log("caught exception trying to access document.domain");
-	    }
-
-	    if(!docDomain || docDomain.length == 0)
-	    {
-	        //console.log("adding our own Local XHR shim ");
-			var aliasXHR = win.XMLHttpRequest;
-		
-			win.XMLHttpRequest = function(){};
-			win.XMLHttpRequest.noConflict = aliasXHR;
-			win.XMLHttpRequest.UNSENT = 0;
-			win.XMLHttpRequest.OPENED = 1;
-			win.XMLHttpRequest.HEADERS_RECEIVED = 2;
-			win.XMLHttpRequest.LOADING = 3;
-			win.XMLHttpRequest.DONE = 4;
-	          
-			win.XMLHttpRequest.prototype =
-			{
-                UNSENT:0,
-                OPENED:1,
-                HEADERS_RECEIVED:2,
-                LOADING:3,
-                DONE:4,
-
-				isAsync:false,
-				onreadystatechange:null,
-				readyState:0,
-                _url:"",
-                timeout:0,
-                withCredentials:false,
-                _requestHeaders:null,
-				open:function(reqType,uri,isAsync,user,password)
-				{
-					console.log("XMLHttpRequest.open ::: " + uri);
-
-					if(uri && uri.indexOf("http") == 0)
-					{
-						if(!this.wrappedXHR)
-						{
-							this.wrappedXHR = new aliasXHR();
-                            var self = this;
-
-                            // timeout
-                            if(this.timeout > 0)
-                            {
-                                this.wrappedXHR.timeout = this.timeout;
-                            }
-                            Object.defineProperty( this, "timeout", { 
-                            set: function(val) {
-								this.wrappedXHR.timeout = val;										
-							},
-                            get:function() {
-                                return this.wrappedXHR.timeout;
-                            }});
-                            
-                            
-
-                            if(this.withCredentials)
-                            {
-                                this.wrappedXHR.withCredentials = this.withCredentials;
-                            }
-                            Object.defineProperty( this, "withCredentials", { 
-                            set: function(val) {
-								this.wrappedXHR.withCredentials = val;										
-							},
-                            get:function() {
-                                return this.wrappedXHR.withCredentials;
-                            }});
-                            
-
-							Object.defineProperty( this, "status", { get: function() {
-								return this.wrappedXHR.status;										
-							}});
-							Object.defineProperty( this, "responseText", { get: function() {
-								return this.wrappedXHR.responseText;										
-							}});
-							Object.defineProperty( this, "statusText", { get: function() {
-								return this.wrappedXHR.statusText;										
-							}});
-
-                            Object.defineProperty( this, "responseXML", { get: function() {
-								return this.wrappedXHR.responseXML;										
-							}});    
-                        
-							this.getResponseHeader = function(header) {
-								return this.wrappedXHR.getResponseHeader(header);
-							};
-							this.getAllResponseHeaders = function() {
-								return this.wrappedXHR.getAllResponseHeaders();
-							};
-							
-							this.wrappedXHR.onreadystatechange = function()
-                            {
-                                self.changeReadyState(self.wrappedXHR.readyState);
-                            };
-						}
-						return this.wrappedXHR.open(reqType,uri,isAsync,user,password);
-					}
-					else
-					{
-                        // x-wmapp1://app/www/page2.html
-                        // need to work some magic on the actual url/filepath
-		                var newUrl =  uri;
-                        if(newUrl.indexOf(":/") > -1)
-                        {
-                            newUrl = newUrl.split(":/")[1];
-                        }
-
-		                if(newUrl.lastIndexOf("/") === newUrl.length - 1)
-		                {
-		                    newUrl += "index.html"; // default page is index.html, when call is to a dir/ ( why not ...? )
-		                }
-                        this._url = newUrl;
-					}
-				},
-				statusText:"",
-				changeReadyState:function(newState)
-				{
-					this.readyState = newState;
-					if(this.onreadystatechange)
-					{
-						this.onreadystatechange();	
-					}
-				},
-                setRequestHeader:function(header,value)
-                {
-                    if(this.wrappedXHR)
-                    {
-                        this.wrappedXHR.setRequestHeader(header,value);
-                    }
-                },
-				getResponseHeader:function(header)
-				{
-                    return this.wrappedXHR ?  this.wrappedXHR.getResponseHeader(header) : "";
-				},
-				getAllResponseHeaders:function()
-				{
-					return this.wrappedXHR ?  this.wrappedXHR.getAllResponseHeaders() : "";
-				},
-				responseText:"",
-				responseXML:"",
-				onResult:function(res)
-				{
-					this.status = 200;
-					this.responseText = res;
-
-                    Object.defineProperty( this, "responseXML", { get: function() {
-                        var parser = new DOMParser();
-						return parser.parseFromString(this.responseText,"text/xml");										
-					}}); 
-					this.changeReadyState(this.DONE);
-				},
-				onError:function(err)
-				{
-					console.log("Wrapped XHR received Error from FileAPI :: " + err);
-					this.status = 404;
-					this.changeReadyState(this.DONE);
-				},
-
-                abort:function()
-                {
-					if(this.wrappedXHR)
-					{
-						return this.wrappedXHR.abort();
-					}
-                },
-				
-				send:function(data)
-				{
-					if(this.wrappedXHR)
-					{
-						return this.wrappedXHR.send(data);
-					}
-                    else
-                    {
-                        this.changeReadyState(this.OPENED);
-                        navigator.fileMgr.readAsText(this._url,"UTF-8",this.onResult.bind(this),this.onError.bind(this));
-                    }
-				},
-				status:404
-			};		  
-	    } // if doc domain 
-
-    },false);// addEventListener
-
-		  
-})(window,document);
-
-
diff --git a/templates/custom/www/cordova-1.4.1.js b/tests/MobileSpecUnitTests/www/cordova-1.5.0.js
similarity index 100%
copy from templates/custom/www/cordova-1.4.1.js
copy to tests/MobileSpecUnitTests/www/cordova-1.5.0.js
diff --git a/tests/MobileSpecUnitTests/www/index.html b/tests/MobileSpecUnitTests/www/index.html
index 2ef2940..803be42 100644
--- a/tests/MobileSpecUnitTests/www/index.html
+++ b/tests/MobileSpecUnitTests/www/index.html
@@ -4,81 +4,66 @@
     <meta name="viewport" content="width=320; user-scalable=no" />

     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

 

-    <title>PhoneGap</title>

+    <title>Cordova Tests</title>

 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>

       

-	<script type="text/javascript">

-		// provide our own console if it does not exist, huge dev aid!

-		if(typeof window.console == "undefined")

-		{

-		window.console = {log:function(str){window.external.Notify(str);}};

-		}

-		

-		// output any errors to console log, created above.

-		window.onerror=function(e)

-		{

-			console.log("window.onerror ::" + JSON.stringify(e));

-		};

-		

-		console.log("Installed console ! ");

-    </script>

-      

-      <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script> 

+      <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script> 

        

       <script type="text/javascript">

 

-			

-			function init()

-			{

-				document.addEventListener("deviceready",onDeviceReady,false);

-				document.addEventListener("backbutton",onBackButton,false);

 

-			}

-		

-			

-			function onBackButton()

-			{

-				console.log("onBackButton");	

-			}

-			

-			function onDeviceReady(e)

-			{

-				updateDeviceInfo();

-				console.log("deviceready event fired!");

-			}

-			

-			function updateDeviceInfo() 

-			{

-				document.getElementById("platform").innerHTML = device.platform;

-				document.getElementById("version").innerHTML = device.version;

-				document.getElementById("uuid").innerHTML = device.uuid;

-				document.getElementById("name").innerHTML = device.name;

-				document.getElementById("width").innerHTML = screen.width;

-				document.getElementById("height").innerHTML = screen.height;

-				document.getElementById("colorDepth").innerHTML = screen.colorDepth;

-			};

-			

-			PhoneGap.addConstructor(function()

-			{

-				console.log("PhoneGap.addConstructor is working");

-			});

-			

-			

-			

-			

-	  </script>

+          function init()

+          {

+          document.addEventListener("deviceready",onDeviceReady,false);

+          document.addEventListener("backbutton",onBackButton,false);

+

+          }

+

+

+          function onBackButton()

+          {

+          console.log("onBackButton");

+          }

+

+          function onDeviceReady(e)

+          {

+          updateDeviceInfo();

+          console.log("deviceready event fired!");

+          }

+

+          function updateDeviceInfo()

+          {

+          document.getElementById("platform").innerHTML = device.platform;

+          document.getElementById("version").innerHTML = device.version;

+          document.getElementById("uuid").innerHTML = device.uuid;

+          document.getElementById("name").innerHTML = device.name;

+          document.getElementById("width").innerHTML = screen.width;

+          document.getElementById("height").innerHTML = screen.height;

+          document.getElementById("colorDepth").innerHTML = screen.colorDepth;

+          document.getElementById("cordovaVersion").innerHTML = device.cordova;

+

+          };

+

+

+

+

+

+      </script>

 

 

   </head>

   <body onLoad="init();" id="stage" class="theme">

     <h1>PhoneGap Tests</h1>

     <div id="info">

-        <h4>Platform: <span id="platform"> &nbsp;</span></h4>

-        <h4>Version: <span id="version">&nbsp;</span></h4>

-        <h4>UUID: <span id="uuid"> &nbsp;</span></h4>

-        <h4>Name: <span id="name">&nbsp;</span></h4>

-        <h4>Width: <span id="width"> &nbsp;</span>,   Height: <span id="height">&nbsp;

-                   </span>, Color Depth: <span id="colorDepth"></span></h4>

+        <h4>Platform: <span id="platform"></span></h4>

+        <h4>Version: <span id="version"></span></h4>

+        <h4>UUID: <span id="uuid"></span></h4>

+        <h4>Name: <span id="name"></span></h4>

+        <h4>Width: <span id="width"></span>

+        ,   Height: <span id="height"></span>

+        , Color Depth: <span id="colorDepth"></span>

+        </h4>

+        <h4>CordovaVersion:<span id="cordovaVersion"></span></h4>

      </div>