You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by he...@apache.org on 2014/01/09 21:10:55 UTC
[20/21] git commit: Merge branch 'master' of
github.com:apache/cordova-plugin-contacts
Merge branch 'master' of github.com:apache/cordova-plugin-contacts
Conflicts:
README.md
src/firefoxos/ContactsProxy.js
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/84004104
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/84004104
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/84004104
Branch: refs/heads/master
Commit: 84004104a97ee1c550cdc2f919cfae6de50c6e5a
Parents: 4ca5d1b 322753f
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Tue Jan 7 12:49:20 2014 +0100
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Tue Jan 7 12:49:20 2014 +0100
----------------------------------------------------------------------
README.md | 27 +-
RELEASENOTES.md | 26 +
doc/index.md | 640 +++++++++++++++++++
docs/Contact/contact.md | 238 -------
docs/ContactAddress/contactaddress.md | 161 -----
docs/ContactError/contactError.md | 45 --
docs/ContactField/contactfield.md | 148 -----
docs/ContactFindOptions/contactfindoptions.md | 118 ----
docs/ContactName/contactname.md | 147 -----
docs/ContactOrganization/contactorganization.md | 148 -----
docs/contacts.create.md | 78 ---
docs/contacts.find.md | 119 ----
docs/contacts.md | 104 ---
docs/parameters/contactError.md | 27 -
docs/parameters/contactFields.md | 25 -
docs/parameters/contactFindOptions.md | 35 -
docs/parameters/contactSuccess.md | 40 --
plugin.xml | 36 +-
src/blackberry10/plugin.xml | 41 --
src/firefoxos/ContactsProxy.js | 2 -
src/ubuntu/contacts.cpp | 576 +++++++++++++++++
src/ubuntu/contacts.h | 70 ++
src/wp/Contacts.cs | 59 +-
test/autotest/tests/contacts.tests.js | 76 ++-
test/cordova-incl.js | 6 +-
25 files changed, 1476 insertions(+), 1516 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/84004104/src/firefoxos/ContactsProxy.js
----------------------------------------------------------------------
diff --cc src/firefoxos/ContactsProxy.js
index 354a746,afd43a4..1ccbed7
--- a/src/firefoxos/ContactsProxy.js
+++ b/src/firefoxos/ContactsProxy.js
@@@ -19,8 -19,8 +19,6 @@@
*
*/
--// somehow call this function by this:
--// exec(success, fail, "Contacts", "save", [dupContact]);
// Cordova contact definition:
// http://cordova.apache.org/docs/en/2.5.0/cordova_contacts_contacts.md.html#Contact
// FxOS contact definition: