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/03/26 17:28:26 UTC
[1/4] js commit: fixing weird outputstream problem
Repository: cordova-js
Updated Branches:
refs/heads/browserify 1b5885943 -> a7e396993
fixing weird outputstream problem
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/0dc876da
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0dc876da
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0dc876da
Branch: refs/heads/browserify
Commit: 0dc876da3179903f93fd03e54cee4de809c92e2c
Parents: 1b58859
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:25:58 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 26 17:25:58 2014 +0100
----------------------------------------------------------------------
tasks/lib/packager-browserify.js | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0dc876da/tasks/lib/packager-browserify.js
----------------------------------------------------------------------
diff --git a/tasks/lib/packager-browserify.js b/tasks/lib/packager-browserify.js
index ecc3f5f..3e718c6 100644
--- a/tasks/lib/packager-browserify.js
+++ b/tasks/lib/packager-browserify.js
@@ -32,18 +32,18 @@ module.exports = function generate(platform, useWindowsLineEndings, done) {
var time = new Date().valueOf();
var libraryRelease = bundle(platform, false, commitId);
- // if we are using windows line endings, we will also add the BOM
+ // if we are using windows line endings, we will also add the BOM
// if(useWindowsLineEndings) {
// libraryRelease = "\ufeff" + libraryRelease.split(/\r?\n/).join("\r\n");
// }
- var libraryDebug = bundle(platform, true, commitId);
+ // var libraryDebug = bundle(platform, true, commitId);
if (!fs.existsSync('pkg')) {
fs.mkdirSync('pkg');
}
- if(!fs.existsSync('pkg/debug')) {
- fs.mkdirSync('pkg/debug');
- }
+ // if(!fs.existsSync('pkg/debug')) {
+ // fs.mkdirSync('pkg/debug');
+ // }
outReleaseFile = path.join('pkg', 'cordova.' + platform + '.js');
outReleaseFileStream = fs.createWriteStream(outReleaseFile);
@@ -55,20 +55,20 @@ module.exports = function generate(platform, useWindowsLineEndings, done) {
releaseBundle.pipe(outReleaseFileStream);
- releaseBundle.on('end', function() {
+ outReleaseFileStream.on('finish', function() {
var newtime = new Date().valueOf() - time;
console.log('generated cordova.' + platform + '.js @ ' + commitId + ' in ' + newtime + 'ms');
done();
});
- outDebugFile = path.join('pkg', 'debug', 'cordova.' + platform + '-debug.js');
- outDebugFileStream = fs.createWriteStream(outDebugFile);
- debugBundle = libraryDebug.bundle();
- debugBundle.pipe(outDebugFileStream);
+ // outDebugFile = path.join('pkg', 'debug', 'cordova.' + platform + '-debug.js');
+ // outDebugFileStream = fs.createWriteStream(outDebugFile);
+ // debugBundle = libraryDebug.bundle();
+ // debugBundle.pipe(outDebugFileStream);
- outDebugFileStream.on('end', function() {
- var newtime = new Date().valueOf() - time;
- console.log('generated cordova.' + platform + '-debug.js @ ' + commitId + ' in ' + newtime + 'ms');
- });
+ // outDebugFileStream.on('end', function() {
+ // var newtime = new Date().valueOf() - time;
+ // console.log('generated cordova.' + platform + '-debug.js @ ' + commitId + ' in ' + newtime + 'ms');
+ // });
});
}
[3/4] js commit: removing onPluginsReady and setting platform exec
Posted by an...@apache.org.
removing onPluginsReady and setting platform exec
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/94a11853
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/94a11853
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/94a11853
Branch: refs/heads/browserify
Commit: 94a1185390485015db1b164706788968f0661e59
Parents: 2a6941c
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:27:30 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 26 17:27:30 2014 +0100
----------------------------------------------------------------------
src/common/channel.js | 1 +
src/common/init_b.js | 19 +++++--------------
2 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/94a11853/src/common/channel.js
----------------------------------------------------------------------
diff --git a/src/common/channel.js b/src/common/channel.js
index 653af15..f3d83df 100644
--- a/src/common/channel.js
+++ b/src/common/channel.js
@@ -235,6 +235,7 @@ channel.createSticky('onNativeReady');
channel.createSticky('onCordovaReady');
// Event to indicate that all automatically loaded JS plugins are loaded and ready.
+// FIXME remove this
channel.createSticky('onPluginsReady');
// Event to indicate that Cordova is ready
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/94a11853/src/common/init_b.js
----------------------------------------------------------------------
diff --git a/src/common/init_b.js b/src/common/init_b.js
index efcb6cf..288c5a5 100644
--- a/src/common/init_b.js
+++ b/src/common/init_b.js
@@ -21,11 +21,12 @@
var channel = require('cordova/channel');
var cordova = require('cordova');
-//var modulemapper = require('cordova/modulemapper');
var platform = require('cordova/platform');
-var pluginloader = require('cordova/pluginloader');
-var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];
+var platformInitChannelsArray = [channel.onNativeReady];
+
+// setting exec
+cordova.exec = require('cordova/exec');
function logUnfiredChannels(arr) {
for (var i = 0; i < arr.length; ++i) {
@@ -96,23 +97,14 @@ if (window._nativeReady) {
channel.onNativeReady.fire();
}
-//modulemapper.clobbers('cordova', 'cordova');
-//modulemapper.clobbers('cordova/exec', 'cordova.exec');
-//modulemapper.clobbers('cordova/exec', 'Cordova.exec');
-
// Call the platform-specific initialization.
platform.bootstrap && platform.bootstrap();
-pluginloader.load(function() {
- channel.onPluginsReady.fire();
-});
-
/**
* Create all cordova objects once native side is ready.
*/
channel.join(function() {
-// modulemapper.mapModules(window);
-
+
platform.initialize && platform.initialize();
// Fire event to notify that all objects are created
@@ -126,4 +118,3 @@ channel.join(function() {
}, channel.deviceReadyChannelsArray);
}, platformInitChannelsArray);
-
[2/4] js commit: updating version
Posted by an...@apache.org.
updating version
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/2a6941c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/2a6941c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/2a6941c2
Branch: refs/heads/browserify
Commit: 2a6941c2956cf36d2e33fa8323cd05b6fff11e37
Parents: 0dc876d
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:26:39 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 26 17:26:39 2014 +0100
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/2a6941c2/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index b0c6225..fdafd26 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Gord Tanner <gt...@gmail.com> (http://github.com/gtanner)",
"name": "cordova-js",
"description": "Cordova JavaScript: a unified JavaScript layer for the Cordova suite of projects enabling cross-platform native mobile development of applications using HTML, CSS and JavaScript.",
- "version": "3.1.0",
+ "version": "3.5.0",
"homepage": "http://cordova.apache.org",
"repository": {
"type": "git",
[4/4] js commit: exec was set in the wrong file
Posted by an...@apache.org.
exec was set in the wrong file
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/a7e39699
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/a7e39699
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/a7e39699
Branch: refs/heads/browserify
Commit: a7e3969934cf10df58c09e0234979429b8928aca
Parents: 94a1185
Author: Anis Kadri <an...@apache.org>
Authored: Wed Mar 26 17:28:11 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Mar 26 17:28:11 2014 +0100
----------------------------------------------------------------------
src/cordova_b.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a7e39699/src/cordova_b.js
----------------------------------------------------------------------
diff --git a/src/cordova_b.js b/src/cordova_b.js
index 1d2d36e..f4c781e 100644
--- a/src/cordova_b.js
+++ b/src/cordova_b.js
@@ -226,6 +226,4 @@ var cordova = {
});
}
};
-window.cordova = cordova;
-window.cordova.exec = require('cordova/exec');
-module.exports = cordova;
+window.cordova = module.exports = cordova;