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/b3eb7267 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/b3eb7267 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/b3eb7267 Branch: refs/heads/master Commit: b3eb726716d1534cfee2208fc1cf3d1dbb9b96af Parents: c2cbb54 ac0a399 Author: Anis Kadri <anis.ka...@gmail.com> Authored: Tue Jun 5 15:15:25 2012 -0700 Committer: Anis Kadri <anis.ka...@gmail.com> Committed: Tue Jun 5 15:15:25 2012 -0700 ---------------------------------------------------------------------- VERSION | 2 +- grunt.js | 75 +++++++++++++ lib/blackberry/plugin/blackberry/ContactUtils.js | 10 ++- lib/blackberry/plugin/blackberry/contacts.js | 2 +- lib/common/channel.js | 14 ++- lib/common/common.js | 3 + lib/common/plugin/Camera.js | 6 +- lib/common/plugin/CameraConstants.js | 7 ++ lib/common/plugin/CameraPopoverOptions.js | 16 +++ lib/common/plugin/Position.js | 2 +- lib/common/plugin/geolocation.js | 4 +- lib/common/utils.js | 20 +++- lib/cordova.js | 8 +- lib/ios/plugin/ios/console.js | 7 +- lib/playbook/plugin/playbook/manager.js | 2 +- test/test.channel.js | 95 +++++++++++++++++ test/test.utils.js | 20 ++++ 17 files changed, 272 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
