cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject cordova-windows git commit: Reverted change to version which added pascal casing based on CR feedback
Date Sat, 02 May 2015 06:49:22 GMT
Repository: cordova-windows
Updated Branches:
  refs/heads/windows10 89745f525 -> 32d459c0f


Reverted change to version which added pascal casing based on CR feedback


Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/32d459c0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/32d459c0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/32d459c0

Branch: refs/heads/windows10
Commit: 32d459c0f6e380878620a39518cc37768470b339
Parents: 89745f5
Author: Rob Paveza <Rob.Paveza@microsoft.com>
Authored: Fri May 1 11:10:27 2015 -0700
Committer: Rob Paveza <Rob.Paveza@microsoft.com>
Committed: Fri May 1 11:10:27 2015 -0700

----------------------------------------------------------------------
 cordova-windows10.md                 | 14 +++++++-------
 template/cordova/lib/ConfigParser.js |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/32d459c0/cordova-windows10.md
----------------------------------------------------------------------
diff --git a/cordova-windows10.md b/cordova-windows10.md
index 4c7e1f7..24833b9 100644
--- a/cordova-windows10.md
+++ b/cordova-windows10.md
@@ -11,7 +11,7 @@ app developers and plugin developers need to know about Windows 10 when
building
 Adding Windows 10 support to your app is as easy as setting your Windows target platform
version to 
 10.0:
 
-    <preference name="WindowsTargetVersion" value="10.0" />
+    <preference name="windows-target-version" value="10.0" />
 
 To develop apps for Windows 10, you require:
 
@@ -71,12 +71,12 @@ manifest, a warning will be displayed.
 
 ### config.xml Preferences ###
 
-#### WindowsTargetVersion, WindowsPhoneTargetVersion ####
+#### windows-target-version, windows-phone-target-version ####
 
-    <preference name="WindowsTargetVersion" value="10.0" />
-    <preference name="WindowsPhoneTargetVersion" value="10.0" />
+    <preference name="windows-target-version" value="10.0" />
+    <preference name="windows-phone-target-version" value="10.0" />
 
-*At least one is required.*
+*The default value is 8.1 for both platforms*
 
 These preferences identify the version of Windows or Windows Phone you would like your app

 package to target.
@@ -91,8 +91,8 @@ instead)
 **Scenarios**
 
 If you are targeting Windows 8.1 or Windows 10 only, you only need to have a single 
-`WindowsTargetVersion` setting in your config.xml file.  Explicitly setting 
-`WindowsTargetVersion` to specify Windows 10 will push the Phone setting to 10 as well.
+`windows-target-version` setting in your config.xml file.  Explicitly setting 
+`windows-target-version` to specify Windows 10 will push the Phone setting to 10 as well.
 
 #### WindowsDefaultUriPrefix ####
     <preference name="WindowsDefaultUriPrefix" value="ms-appx://|ms-appx-web://" />

http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/32d459c0/template/cordova/lib/ConfigParser.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/ConfigParser.js b/template/cordova/lib/ConfigParser.js
index 583da4d..93a9da0 100644
--- a/template/cordova/lib/ConfigParser.js
+++ b/template/cordova/lib/ConfigParser.js
@@ -192,8 +192,7 @@ ConfigParser.prototype = {
     },
 
     getWindowsTargetVersion: function() {
-        // PascalCased version is the new official preference name, but retain the old for
back-compat
-        var preference = this.getPreference('WindowsTargetVersion') || this.getPreference('windows-target-version');
+        var preference = this.getPreference('windows-target-version');
 
         if (!preference) 
             preference = '8.1'; // default is 8.1.
@@ -206,7 +205,7 @@ ConfigParser.prototype = {
         // 1. Check for an explicit preference.  If the preference is set explicitly, return
that, irrespective of whether it is valid
         // 2. Get the Windows baseline version.  If it's equivalent to 8.0, bump it to 8.1.
         // 3. Return the Windows baseline version.
-        var explicitPreference = this.getPreference('WindowsPhoneTargetVersion') || this.getPreference('windows-phone-target-version');
+        var explicitPreference = this.getPreference('windows-phone-target-version');
         if (explicitPreference)
             return explicitPreference;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message