cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bennma...@apache.org
Subject git commit: Moved js clobbers to each platform execpt windows phone
Date Thu, 11 Jul 2013 18:10:50 GMT
Updated Branches:
  refs/heads/master 477c4ee5e -> b0f28b0fb


Moved js clobbers to each platform execpt windows phone


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/commit/b0f28b0f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/b0f28b0f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/b0f28b0f

Branch: refs/heads/master
Commit: b0f28b0fbef8742fbbf259347e36984a1d2968e0
Parents: 477c4ee
Author: Benn Mapes <benn.mapes@gmail.com>
Authored: Thu Jul 11 11:10:31 2013 -0700
Committer: Benn Mapes <benn.mapes@gmail.com>
Committed: Thu Jul 11 11:10:31 2013 -0700

----------------------------------------------------------------------
 plugin.xml            | 89 +++++++++++++++++++++++++++++-----------------
 src/wp/GeoLocation.cs |  2 +-
 2 files changed, 57 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/b0f28b0f/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 617a293..e276498 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,26 +6,25 @@
 
     <name>Geolocation</name>
 
-    <js-module src="www/Coordinates.js" name="Coordinates">
-        <clobbers target="Coordinates" />
-    </js-module>
-    
-    <js-module src="www/PositionError.js" name="PositionError">
-        <clobbers target="PositionError" />
-    </js-module>
-
-    <js-module src="www/Position.js" name="Position">
-        <clobbers target="Position" />
-    </js-module>
-    
-    <js-module src="www/geolocation.js" name="geolocation">
-        <clobbers target="navigator.geolocation" />
-    </js-module>
-    
-
-    
     <!-- android -->
     <platform name="android">
+
+        <js-module src="www/Coordinates.js" name="Coordinates">
+            <clobbers target="Coordinates" />
+        </js-module>
+
+        <js-module src="www/PositionError.js" name="PositionError">
+            <clobbers target="PositionError" />
+        </js-module>
+
+        <js-module src="www/Position.js" name="Position">
+            <clobbers target="Position" />
+        </js-module>
+
+        <js-module src="www/geolocation.js" name="geolocation">
+            <clobbers target="navigator.geolocation" />
+        </js-module>
+
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="Geolocation">
 	            <param name="android-package" value="org.apache.cordova.core.GeoBroker"/>
@@ -36,7 +35,7 @@
             <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
/>
             <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
         </config-file>
-        
+
         <source-file src="src/android/GeoBroker.java" target-dir="src/org/apache/cordova/core"
/>
         <source-file src="src/android/GPSListener.java" target-dir="src/org/apache/cordova/core"
/>
         <source-file src="src/android/NetworkListener.java" target-dir="src/org/apache/cordova/core"
/>
@@ -45,7 +44,24 @@
     </platform>
 
     <!-- ios -->
-    <platform name="ios">    
+    <platform name="ios">
+
+        <js-module src="www/Coordinates.js" name="Coordinates">
+            <clobbers target="Coordinates" />
+        </js-module>
+
+        <js-module src="www/PositionError.js" name="PositionError">
+            <clobbers target="PositionError" />
+        </js-module>
+
+        <js-module src="www/Position.js" name="Position">
+            <clobbers target="Position" />
+        </js-module>
+
+        <js-module src="www/geolocation.js" name="geolocation">
+            <clobbers target="navigator.geolocation" />
+        </js-module>
+
         <config-file target="config.xml" parent="/*">
 	        <feature name="Geolocation">
 	            <param name="ios-package" value="CDVLocation"/>
@@ -57,6 +73,23 @@
 
     <!-- blackberry10 -->
     <platform name="blackberry10">
+
+        <js-module src="www/Coordinates.js" name="Coordinates">
+            <clobbers target="Coordinates" />
+        </js-module>
+
+        <js-module src="www/PositionError.js" name="PositionError">
+            <clobbers target="PositionError" />
+        </js-module>
+
+        <js-module src="www/Position.js" name="Position">
+            <clobbers target="Position" />
+        </js-module>
+
+        <js-module src="www/geolocation.js" name="geolocation">
+            <clobbers target="navigator.geolocation" />
+        </js-module>
+
         <source-file src="src/blackberry10/index.js" target-dir="Geolocation" />
         <config-file target="www/config.xml" parent="/widget">
             <feature name="Geolocation" value="Geolocation"/>
@@ -65,32 +98,22 @@
 
     <!-- wp7 -->
     <platform name="wp7">
-        <config-file target="config.xml" parent="/*">
-            <feature name="GeoLocation">
-                <param name="wp-package" value="GeoLocation"/>
-            </feature>
-        </config-file>
 
         <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
             <Capability Name="ID_CAP_LOCATION" />
         </config-file>
 
-        <source-file src="src/wp/GeoLocation.cs" />
-    </platform>
+        <source-file src="src/wp/Geolocation.cs" />
+    </platform>-->
 
     <!-- wp8 -->
     <platform name="wp8">
-        <config-file target="config.xml" parent="/*">
-            <feature name="GeoLocation">
-                <param name="wp-package" value="GeoLocation"/>
-            </feature>
-        </config-file>
 
         <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
             <Capability Name="ID_CAP_LOCATION" />
         </config-file>
 
-        <source-file src="src/wp/GeoLocation.cs" />
+        <source-file src="src/wp/Geolocation.cs" />
     </platform>
     
 </plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/b0f28b0f/src/wp/GeoLocation.cs
----------------------------------------------------------------------
diff --git a/src/wp/GeoLocation.cs b/src/wp/GeoLocation.cs
index c53cb29..42af72d 100644
--- a/src/wp/GeoLocation.cs
+++ b/src/wp/GeoLocation.cs
@@ -23,7 +23,7 @@ namespace WPCordovaClassLib.Cordova.Commands
     /// <summary>
     /// This is a command stub, the browser provides the correct implementation.  We use
this to trigger the static analyzer that we require this permission 
     /// </summary>
-    public class GeoLocation
+    public class Geolocation
     {
         /* Unreachable code, by design -jm */
         private void triggerGeoInclusion()


Mime
View raw message