You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/11/27 01:52:06 UTC
[2/12] wp7 commit: update to 2.3.0rc1 and fix issue with File upload
update to 2.3.0rc1 and fix issue with File upload
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp7/commit/115a04f7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp7/tree/115a04f7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp7/diff/115a04f7
Branch: refs/heads/master
Commit: 115a04f7f33559f22fc7c50d785a6d064afb858c
Parents: d3cc114
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Nov 26 16:33:58 2012 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Nov 26 16:33:58 2012 -0800
----------------------------------------------------------------------
example/CordovaExample.csproj | 2 +-
example/CordovaSourceDictionary.xml | 2 +-
.../standalone/cordovalib/Commands/FileTransfer.cs | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/115a04f7/example/CordovaExample.csproj
----------------------------------------------------------------------
diff --git a/example/CordovaExample.csproj b/example/CordovaExample.csproj
index d8430fa..5752930 100644
--- a/example/CordovaExample.csproj
+++ b/example/CordovaExample.csproj
@@ -99,7 +99,7 @@
<Content Include="CordovaSourceDictionary.xml">
<SubType>Designer</SubType>
</Content>
- <Content Include="www\cordova-2.2.0.js" />
+ <Content Include="www\cordova-2.3.0.js" />
<Content Include="www\cordova-current.js" />
<Content Include="www\network.html">
<SubType>Designer</SubType>
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/115a04f7/example/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/example/CordovaSourceDictionary.xml b/example/CordovaSourceDictionary.xml
index c321e11..6d09c64 100644
--- a/example/CordovaSourceDictionary.xml
+++ b/example/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-2.2.0.js"/>
+ <FilePath Value="www\cordova-2.3.0.js"/>
<FilePath Value="www\cordova-current.js"/>
<FilePath Value="www\network.html"/>
<FilePath Value="www\notification.html"/>
http://git-wip-us.apache.org/repos/asf/cordova-wp7/blob/115a04f7/templates/standalone/cordovalib/Commands/FileTransfer.cs
----------------------------------------------------------------------
diff --git a/templates/standalone/cordovalib/Commands/FileTransfer.cs b/templates/standalone/cordovalib/Commands/FileTransfer.cs
index bf953ac..fcb866d 100644
--- a/templates/standalone/cordovalib/Commands/FileTransfer.cs
+++ b/templates/standalone/cordovalib/Commands/FileTransfer.cs
@@ -251,7 +251,9 @@ namespace WP7CordovaClassLib.Cordova.Commands
{
try
{
- uploadOptions = JSON.JsonHelper.Deserialize<UploadOptions[]>(options)[0];
+ String obj = JSON.JsonHelper.Deserialize<String[]>(options)[0];
+
+ uploadOptions = JSON.JsonHelper.Deserialize<UploadOptions>(obj);
}
catch (Exception)
{