Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DFF8D3AC for ; Fri, 7 Dec 2012 22:51:51 +0000 (UTC) Received: (qmail 36912 invoked by uid 500); 7 Dec 2012 22:51:51 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 36849 invoked by uid 500); 7 Dec 2012 22:51:51 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 36719 invoked by uid 99); 7 Dec 2012 22:51:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 22:51:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 39B1C31D7D8; Fri, 7 Dec 2012 22:51:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [9/9] git commit: added device.model (name has been deprecated), removed dll ref in project Message-Id: <20121207225150.39B1C31D7D8@tyr.zones.apache.org> Date: Fri, 7 Dec 2012 22:51:50 +0000 (UTC) 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 Authored: Tue Nov 27 18:01:42 2012 -0800 Committer: Jesse MacFadyen 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 @@ - @@ -174,6 +173,7 @@ + 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"; } }