You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/26 02:11:50 UTC
[1/2] js commit: fixing jshint error
Repository: cordova-js
Updated Branches:
refs/heads/master 68ab22d1c -> 9c165de7c
fixing jshint error
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/5ba8e902
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/5ba8e902
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/5ba8e902
Branch: refs/heads/master
Commit: 5ba8e9024c2afa17850141681323069ca3324b83
Parents: 58812ae
Author: Anis Kadri <an...@apache.org>
Authored: Fri Apr 25 14:17:28 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 25 14:17:28 2014 -0700
----------------------------------------------------------------------
src/cordova_b.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/5ba8e902/src/cordova_b.js
----------------------------------------------------------------------
diff --git a/src/cordova_b.js b/src/cordova_b.js
index a00423c..c5c3850 100644
--- a/src/cordova_b.js
+++ b/src/cordova_b.js
@@ -229,11 +229,11 @@ var cordova = {
// FIXME hack: cordova iOS calls cordova.require()
cordova.require = function(module) {
- if(module === "cordova/exec") {
- return cordova.exec;
- }
+ if(module === "cordova/exec") {
+ return cordova.exec;
+ }
- return undefined;
-}
+ return undefined;
+};
window.cordova = module.exports = cordova;
[2/2] js commit: Merge branch 'browserify'
Posted by an...@apache.org.
Merge branch 'browserify'
Conflicts:
src/cordova_b.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/9c165de7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/9c165de7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/9c165de7
Branch: refs/heads/master
Commit: 9c165de7ca85addd61434888213107558c31221a
Parents: 68ab22d 5ba8e90
Author: Anis Kadri <an...@apache.org>
Authored: Fri Apr 25 14:21:11 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 25 14:21:11 2014 -0700
----------------------------------------------------------------------
src/cordova_b.js | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 239 insertions(+)
----------------------------------------------------------------------