Updated Branches: refs/heads/master c6917ee59 -> 65b59c7e4
Merge branch 'master' of http://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/65b59c7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/65b59c7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/65b59c7e Branch: refs/heads/master Commit: 65b59c7e484a9e5227fa7b4de8e784a8466b2ef5 Parents: fcb8e83 c6917ee Author: Simon MacDonald <simon.macdon...@gmail.com> Authored: Wed Sep 19 13:54:44 2012 -0400 Committer: Simon MacDonald <simon.macdon...@gmail.com> Committed: Wed Sep 19 13:54:44 2012 -0400 ---------------------------------------------------------------------- lib/android/exec.js | 173 ++++---- lib/android/platform.js | 20 +- lib/android/plugin/android/callback.js | 11 +- lib/android/plugin/android/nativeapiprovider.js | 13 + lib/android/plugin/android/polling.js | 23 +- lib/android/plugin/android/promptbasednativeapi.js | 16 + lib/bada/plugin/bada/device.js | 2 +- lib/common/builder.js | 17 +- lib/common/channel.js | 193 ++++----- lib/common/common.js | 6 +- lib/common/plugin/battery.js | 30 +- lib/common/plugin/device.js | 2 +- lib/common/plugin/network.js | 14 +- lib/common/utils.js | 11 + lib/cordova.js | 78 ++-- lib/ios/exec.js | 2 +- lib/scripts/bootstrap.js | 10 +- lib/scripts/require.js | 19 +- lib/tizen/plugin/tizen/Device.js | 2 +- lib/webworks/java/platform.js | 48 +-- lib/wp7/platform.js | 14 +- test/test.channel.js | 332 +++++++++------ test/test.require.js | 32 ++ 23 files changed, 589 insertions(+), 479 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/65b59c7e/lib/common/common.js ----------------------------------------------------------------------