You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/29 03:58:03 UTC
[2/2] git commit: Fix contacts module doubly defined on iOS
Fix contacts module doubly defined on iOS
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/56a3f96e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/56a3f96e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/56a3f96e
Branch: refs/heads/master
Commit: 56a3f96e6e6b514b3aa74516519126066ac111b8
Parents: 66bb54a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 28 20:32:23 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 28 21:01:08 2013 -0400
----------------------------------------------------------------------
plugin.xml | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/56a3f96e/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e7c2ee3..f0c0c93 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,14 +5,6 @@
version="0.1.0">
<name>Contacts</name>
- <js-module src="www/contacts.js" name="contacts">
- <clobbers target="navigator.contacts" />
- </js-module>
-
- <js-module src="www/Contact.js" name="Contact">
- <clobbers target="Contact" />
- </js-module>
-
<js-module src="www/ContactAddress.js" name="ContactAddress">
<clobbers target="ContactAddress" />
</js-module>
@@ -53,6 +45,14 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
</config-file>
+ <js-module src="www/contacts.js" name="contacts">
+ <clobbers target="navigator.contacts" />
+ </js-module>
+
+ <js-module src="www/Contact.js" name="Contact">
+ <clobbers target="Contact" />
+ </js-module>
+
<source-file src="src/android/ContactAccessor.java" target-dir="src/org/apache/cordova/core" />
<source-file src="src/android/ContactAccessorSdk5.java" target-dir="src/org/apache/cordova/core" />
<source-file src="src/android/ContactManager.java" target-dir="src/org/apache/cordova/core" />
@@ -85,6 +85,15 @@
<config-file target="www/config.xml" parent="/widget">
<feature name="Contacts" value="Contacts"/>
</config-file>
+
+ <js-module src="www/contacts.js" name="contacts">
+ <clobbers target="navigator.contacts" />
+ </js-module>
+
+ <js-module src="www/Contact.js" name="Contact">
+ <clobbers target="Contact" />
+ </js-module>
+
<source-file src="src/blackberry10/index.js" target-dir="Contacts"></source-file>
<source-file src="src/blackberry10/ContactActivity.js" target-dir="Contacts"></source-file>
<source-file src="src/blackberry10/ContactAddress.js" target-dir="Contacts"></source-file>
@@ -107,6 +116,14 @@
</feature>
</config-file>
+ <js-module src="www/contacts.js" name="contacts">
+ <clobbers target="navigator.contacts" />
+ </js-module>
+
+ <js-module src="www/Contact.js" name="Contact">
+ <clobbers target="Contact" />
+ </js-module>
+
<config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
<Capability Name="ID_CAP_CONTACTS" />
</config-file>
@@ -126,6 +143,14 @@
<Capability Name="ID_CAP_CONTACTS" />
</config-file>
+ <js-module src="www/contacts.js" name="contacts">
+ <clobbers target="navigator.contacts" />
+ </js-module>
+
+ <js-module src="www/Contact.js" name="Contact">
+ <clobbers target="Contact" />
+ </js-module>
+
<source-file src="src/wp8/Contacts.cs" />
</platform>