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/12/07 23:51:50 UTC
[9/9] git commit: added device.model (name has been deprecated),
removed dll ref in project
added device.model (name has been deprecated), removed dll ref in project
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/74a09910
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/74a09910
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/74a09910
Branch: refs/heads/master
Commit: 74a0991001b4885bb1971e352e7bde173d9f2f74
Parents: a7725a9
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Nov 27 18:01:42 2012 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Nov 27 18:01:42 2012 -0800
----------------------------------------------------------------------
templates/full/CordovaAppProj.csproj | 2 +-
templates/standalone/cordovalib/Commands/Device.cs | 17 ++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/74a09910/templates/full/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/full/CordovaAppProj.csproj b/templates/full/CordovaAppProj.csproj
index 74e9d46..1312772 100644
--- a/templates/full/CordovaAppProj.csproj
+++ b/templates/full/CordovaAppProj.csproj
@@ -141,7 +141,6 @@
</Page>
</ItemGroup>
<ItemGroup>
- <Content Include="CordovaLib\WPCordovaClassLib.dll" />
<Content Include="www\cordova-2.3.0.js" />
<Content Include="www\img\logo.png" />
<Content Include="www\js\index.js" />
@@ -174,6 +173,7 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
+ <Folder Include="CordovaLib\" />
<Folder Include="Plugins\" />
</ItemGroup>
<ItemGroup>
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/74a09910/templates/standalone/cordovalib/Commands/Device.cs
----------------------------------------------------------------------
diff --git a/templates/standalone/cordovalib/Commands/Device.cs b/templates/standalone/cordovalib/Commands/Device.cs
index aee6cfc..e23b6f9 100644
--- a/templates/standalone/cordovalib/Commands/Device.cs
+++ b/templates/standalone/cordovalib/Commands/Device.cs
@@ -35,12 +35,13 @@ namespace WPCordovaClassLib.Cordova.Commands
public void getDeviceInfo(string notused)
{
- string res = String.Format("\"name\":\"{0}\",\"cordova\":\"{1}\",\"platform\":\"{2}\",\"uuid\":\"{3}\",\"version\":\"{4}\"",
+ string res = String.Format("\"name\":\"{0}\",\"cordova\":\"{1}\",\"platform\":\"{2}\",\"uuid\":\"{3}\",\"version\":\"{4}\",\"model\":\"{5}\"",
this.name,
this.cordova,
this.platform,
this.uuid,
- this.version);
+ this.version,
+ this.model);
@@ -49,11 +50,21 @@ namespace WPCordovaClassLib.Cordova.Commands
DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res));
}
+ public string model
+ {
+ get
+ {
+ return DeviceStatus.DeviceName;
+ //return String.Format("{0},{1},{2}", DeviceStatus.DeviceManufacturer, DeviceStatus.DeviceHardwareVersion, DeviceStatus.DeviceFirmwareVersion);
+ }
+ }
+
public string name
{
get
{
return DeviceStatus.DeviceName;
+
}
}
@@ -62,7 +73,7 @@ namespace WPCordovaClassLib.Cordova.Commands
get
{
// TODO: should be able to dynamically read the Cordova version from somewhere...
- return "2.2.0";
+ return "2.3.0";
}
}