You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/05/01 22:31:53 UTC

[5/7] js commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/97d4ff51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/97d4ff51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/97d4ff51

Branch: refs/heads/master
Commit: 97d4ff51d1c63ce1017fd54e1493795c193722f6
Parents: 1eb529f cb7a4c7
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Apr 30 11:44:23 2012 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Apr 30 11:44:23 2012 -0700

----------------------------------------------------------------------
 Jakefile                                         |    8 +-
 VERSION                                          |    2 +-
 lib/bada/exec.js                                 |    3 +-
 lib/bada/platform.js                             |    6 +
 lib/bada/plugin/bada/Camera.js                   |   30 ++++
 lib/bada/plugin/bada/Capture.js                  |   22 +++
 lib/bada/plugin/bada/Compass.js                  |   19 +++
 lib/bada/plugin/bada/NetworkStatus.js            |    2 +-
 lib/bada/plugin/bada/device.js                   |   12 +-
 lib/blackberry/plugin/blackberry/Contact.js      |   22 ++--
 lib/blackberry/plugin/blackberry/ContactUtils.js |    5 +-
 lib/blackberry/plugin/blackberry/contacts.js     |    7 +-
 lib/common/channel.js                            |   55 ++++----
 lib/common/plugin/Contact.js                     |    6 +-
 lib/common/plugin/ContactField.js                |    4 +-
 lib/common/plugin/FileTransfer.js                |    2 +-
 lib/common/plugin/MediaFile.js                   |   32 ++--
 lib/common/plugin/contacts.js                    |    5 +-
 lib/common/utils.js                              |   26 ++--
 lib/cordova.js                                   |  126 ++++++++++-------
 lib/ios/exec.js                                  |    2 +-
 lib/playbook/plugin/playbook/manager.js          |    2 +-
 lib/wp7/exec.js                                  |    3 +
 test/test.channel.js                             |   26 +++-
 24 files changed, 281 insertions(+), 146 deletions(-)
----------------------------------------------------------------------