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 2013/01/31 23:29:07 UTC
[4/7] js commit: merge issues
merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/1d846e2f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/1d846e2f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/1d846e2f
Branch: refs/heads/master
Commit: 1d846e2fc8730a689d5aa98eb583af6b92412c91
Parents: 1d80d91 7122371
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Jan 21 17:06:45 2013 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Jan 21 17:06:45 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
lib/android/exec.js | 16 ++
lib/android/platform.js | 6 +-
lib/android/plugin/file/symbols.js | 25 +++
lib/bada/platform.js | 7 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/platform.js | 6 +
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/air/file/bbsymbols.js | 33 ++++
lib/blackberry/plugin/air/platform.js | 31 ----
lib/blackberry/plugin/java/file/bbsymbols.js | 27 +++
lib/blackberry/plugin/java/platform.js | 11 +-
lib/blackberry/plugin/qnx/device.js | 2 +-
lib/common/builder.js | 19 +-
lib/common/common.js | 54 ------
lib/common/modulemapper.js | 115 ++++++++++++
lib/common/plugin/Camera.js | 6 +-
lib/common/plugin/FileReader.js | 3 +-
lib/common/plugin/echo.js | 3 +
lib/common/plugin/file/symbols.js | 25 +++
lib/common/plugin/file/symbolshelper.js | 40 +++++
lib/common/utils.js | 5 +-
lib/ios/exec.js | 4 +-
lib/ios/platform.js | 13 +-
lib/ios/plugin/file/symbols.js | 26 +++
lib/scripts/require.js | 1 +
lib/test/testmodule.js | 27 +++
lib/tizen/platform.js | 16 +-
lib/tizen/plugin/file/symbols.js | 28 +++
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/webos/platform.js | 13 +-
lib/webos/plugin/file/symbols.js | 27 +++
lib/windows8/platform.js | 10 +-
lib/windows8/plugin/file/symbols.js | 27 +++
lib/windowsphone/platform.js | 14 +-
lib/windowsphone/plugin/file/symbols.js | 28 +++
test/test.modulemapper.js | 193 +++++++++++++++++++++
37 files changed, 708 insertions(+), 161 deletions(-)
----------------------------------------------------------------------