Skip to content

Commit b0f28b0

Browse files
committed
Moved js clobbers to each platform execpt windows phone
1 parent 477c4ee commit b0f28b0

File tree

2 files changed

+57
-34
lines changed

2 files changed

+57
-34
lines changed

plugin.xml

Lines changed: 56 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,25 @@
66

77
<name>Geolocation</name>
88

9-
<js-module src="www/Coordinates.js" name="Coordinates">
10-
<clobbers target="Coordinates" />
11-
</js-module>
12-
13-
<js-module src="www/PositionError.js" name="PositionError">
14-
<clobbers target="PositionError" />
15-
</js-module>
16-
17-
<js-module src="www/Position.js" name="Position">
18-
<clobbers target="Position" />
19-
</js-module>
20-
21-
<js-module src="www/geolocation.js" name="geolocation">
22-
<clobbers target="navigator.geolocation" />
23-
</js-module>
24-
25-
26-
279
<!-- android -->
2810
<platform name="android">
11+
12+
<js-module src="www/Coordinates.js" name="Coordinates">
13+
<clobbers target="Coordinates" />
14+
</js-module>
15+
16+
<js-module src="www/PositionError.js" name="PositionError">
17+
<clobbers target="PositionError" />
18+
</js-module>
19+
20+
<js-module src="www/Position.js" name="Position">
21+
<clobbers target="Position" />
22+
</js-module>
23+
24+
<js-module src="www/geolocation.js" name="geolocation">
25+
<clobbers target="navigator.geolocation" />
26+
</js-module>
27+
2928
<config-file target="res/xml/config.xml" parent="/*">
3029
<feature name="Geolocation">
3130
<param name="android-package" value="org.apache.cordova.core.GeoBroker"/>
@@ -36,7 +35,7 @@
3635
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
3736
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
3837
</config-file>
39-
38+
4039
<source-file src="src/android/GeoBroker.java" target-dir="src/org/apache/cordova/core" />
4140
<source-file src="src/android/GPSListener.java" target-dir="src/org/apache/cordova/core" />
4241
<source-file src="src/android/NetworkListener.java" target-dir="src/org/apache/cordova/core" />
@@ -45,7 +44,24 @@
4544
</platform>
4645

4746
<!-- ios -->
48-
<platform name="ios">
47+
<platform name="ios">
48+
49+
<js-module src="www/Coordinates.js" name="Coordinates">
50+
<clobbers target="Coordinates" />
51+
</js-module>
52+
53+
<js-module src="www/PositionError.js" name="PositionError">
54+
<clobbers target="PositionError" />
55+
</js-module>
56+
57+
<js-module src="www/Position.js" name="Position">
58+
<clobbers target="Position" />
59+
</js-module>
60+
61+
<js-module src="www/geolocation.js" name="geolocation">
62+
<clobbers target="navigator.geolocation" />
63+
</js-module>
64+
4965
<config-file target="config.xml" parent="/*">
5066
<feature name="Geolocation">
5167
<param name="ios-package" value="CDVLocation"/>
@@ -57,6 +73,23 @@
5773

5874
<!-- blackberry10 -->
5975
<platform name="blackberry10">
76+
77+
<js-module src="www/Coordinates.js" name="Coordinates">
78+
<clobbers target="Coordinates" />
79+
</js-module>
80+
81+
<js-module src="www/PositionError.js" name="PositionError">
82+
<clobbers target="PositionError" />
83+
</js-module>
84+
85+
<js-module src="www/Position.js" name="Position">
86+
<clobbers target="Position" />
87+
</js-module>
88+
89+
<js-module src="www/geolocation.js" name="geolocation">
90+
<clobbers target="navigator.geolocation" />
91+
</js-module>
92+
6093
<source-file src="src/blackberry10/index.js" target-dir="Geolocation" />
6194
<config-file target="www/config.xml" parent="/widget">
6295
<feature name="Geolocation" value="Geolocation"/>
@@ -65,32 +98,22 @@
6598

6699
<!-- wp7 -->
67100
<platform name="wp7">
68-
<config-file target="config.xml" parent="/*">
69-
<feature name="GeoLocation">
70-
<param name="wp-package" value="GeoLocation"/>
71-
</feature>
72-
</config-file>
73101

74102
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
75103
<Capability Name="ID_CAP_LOCATION" />
76104
</config-file>
77105

78-
<source-file src="src/wp/GeoLocation.cs" />
79-
</platform>
106+
<source-file src="src/wp/Geolocation.cs" />
107+
</platform>-->
80108

81109
<!-- wp8 -->
82110
<platform name="wp8">
83-
<config-file target="config.xml" parent="/*">
84-
<feature name="GeoLocation">
85-
<param name="wp-package" value="GeoLocation"/>
86-
</feature>
87-
</config-file>
88111

89112
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
90113
<Capability Name="ID_CAP_LOCATION" />
91114
</config-file>
92115

93-
<source-file src="src/wp/GeoLocation.cs" />
116+
<source-file src="src/wp/Geolocation.cs" />
94117
</platform>
95118

96119
</plugin>

src/wp/GeoLocation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace WPCordovaClassLib.Cordova.Commands
2323
/// <summary>
2424
/// This is a command stub, the browser provides the correct implementation. We use this to trigger the static analyzer that we require this permission
2525
/// </summary>
26-
public class GeoLocation
26+
public class Geolocation
2727
{
2828
/* Unreachable code, by design -jm */
2929
private void triggerGeoInclusion()

0 commit comments

Comments
 (0)