Merge branch 'master' of https://github.com/apache/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/5f046e17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/5f046e17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/5f046e17 Branch: refs/heads/master Commit: 5f046e177f700c327bf1c51a95da376bfff88b7d Parents: 3d45eab e799aef Author: Gord Tanner <gtan...@gmail.com> Authored: Tue Oct 2 11:13:29 2012 -0400 Committer: Gord Tanner <gtan...@gmail.com> Committed: Tue Oct 2 11:13:29 2012 -0400 ---------------------------------------------------------------------- lib/android/exec.js | 63 ++++++---- lib/android/platform.js | 10 -- lib/android/plugin/android/callback.js | 89 ------------ lib/android/plugin/android/device.js | 2 +- lib/android/plugin/android/polling.js | 51 ------- lib/bada/plugin/bada/Accelerometer.js | 4 +- lib/bada/plugin/bada/Camera.js | 4 +- lib/bada/plugin/bada/Capture.js | 4 +- lib/common/builder.js | 2 +- lib/common/plugin/Camera.js | 5 +- lib/common/plugin/CompassError.js | 2 +- lib/common/plugin/ContactError.js | 2 +- lib/common/plugin/DirectoryEntry.js | 4 +- lib/common/plugin/FileReader.js | 2 +- lib/common/plugin/accelerometer.js | 4 +- lib/common/plugin/console-via-logger.js | 4 +- lib/common/plugin/echo.js | 2 +- lib/common/plugin/geolocation.js | 2 +- lib/common/utils.js | 2 +- lib/cordova.js | 6 +- lib/errgen/exec.js | 2 +- lib/scripts/bootstrap.js | 2 +- lib/test/androidexec.js | 1 + lib/test/plugin/android/nativeapiprovider.js | 1 + lib/test/plugin/android/promptbasednativeapi.js | 1 + lib/tizen/plugin/tizen/BufferLoader.js | 2 +- lib/tizen/plugin/tizen/ContactUtils.js | 2 +- lib/tizen/plugin/tizen/SoundBeat.js | 2 +- lib/webworks/air/plugin/air/FileReader.js | 2 +- lib/webworks/air/plugin/air/capture.js | 2 +- lib/webworks/java/plugin/java/ContactUtils.js | 2 +- lib/webworks/java/plugin/manager.js | 6 +- lib/windows8/plugin/windows8/CaptureProxy.js | 10 +- lib/windows8/plugin/windows8/MediaProxy.js | 4 +- test/android/test.exec.js | 126 ++++++++++++++++++ test/test.builder.js | 4 +- test/test.channel.js | 2 +- test/test.contacts.js | 2 +- 38 files changed, 216 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
