You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2013/01/29 03:34:41 UTC
[2/4] js commit: fixed whitespaces
fixed whitespaces
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/29b266bc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/29b266bc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/29b266bc
Branch: refs/heads/master
Commit: 29b266bc6736d48e3082ad811f4a1b58bcef6953
Parents: 840e56a
Author: Dan Silivestru <da...@gmail.com>
Authored: Sat Jan 26 14:30:51 2013 -0500
Committer: Gord Tanner <gt...@gmail.com>
Committed: Mon Jan 28 21:33:49 2013 -0500
----------------------------------------------------------------------
Jakefile | 2 ++
build/packager.js | 1 +
lib/webos/platform.js | 2 +-
lib/windows8/platform.js | 2 +-
lib/windows8/plugin/windows8/NotificationProxy.js | 10 +++++-----
package.json | 4 ++++
6 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/Jakefile
----------------------------------------------------------------------
diff --git a/Jakefile b/Jakefile
index 23ba7d3..1babd49 100644
--- a/Jakefile
+++ b/Jakefile
@@ -89,6 +89,7 @@ task('build', ['clean', 'hint', 'update-version'], function () {
packager.generate("windows8",commitId,true);
packager.generate("blackberry",commitId);
+ packager.generate("b2g",commitId);
packager.generate("ios",commitId);
packager.generate("windowsphone",commitId,true);
packager.generate("android",commitId);
@@ -109,6 +110,7 @@ task('update-version', ['set-cwd'], function() {
var files = {
"lib/bada/plugin/bada/device.js":/(me\.cordova\s=\s").+(")/,
"lib/tizen/plugin/tizen/Device.js":/(this\.cordova\s=\s").+(")/,
+ "lib/b2g/plugin/b2g/Device.js":/(this\.cordova\s=\s").+(")/,
"lib/blackberry/plugin/qnx/device.js":/(cordova:\s").+(")/,
"lib/blackberry/plugin/air/device.js":/(cordova:\s").+(")/
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/build/packager.js
----------------------------------------------------------------------
diff --git a/build/packager.js b/build/packager.js
index 1247385..5112350 100644
--- a/build/packager.js
+++ b/build/packager.js
@@ -57,6 +57,7 @@ packager.bundle = function(platform, debug, commitId ) {
//Test platform needs to bring in platform specific plugin's for testing
copyProps(modules, collectFiles(path.join('lib', 'blackberry', 'plugin'), 'plugin'));
+ copyProps(modules, collectFiles(path.join('lib', 'b2g', 'plugin', 'b2g'), 'plugin/b2g'));
copyProps(modules, collectFiles(path.join('lib', 'tizen', 'plugin', 'tizen'), 'plugin/tizen'));
copyProps(modules, collectFiles(path.join('lib', 'windowsphone', 'plugin', 'windowsphone'), 'plugin/windowsphone'));
copyProps(modules, collectFiles(path.join('lib', 'windows8', 'plugin', 'windows8'), 'plugin/windows8'));
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/lib/webos/platform.js
----------------------------------------------------------------------
diff --git a/lib/webos/platform.js b/lib/webos/platform.js
index baa3457..2c33313 100644
--- a/lib/webos/platform.js
+++ b/lib/webos/platform.js
@@ -70,7 +70,7 @@ module.exports = {
console.log("event:ToggleAppMenu");
cordova.fireDocumentEvent("menubutton");
}
-
+
console.log("relaunch");
return true;
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/lib/windows8/platform.js
----------------------------------------------------------------------
diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js
index 7646fea..3b43e6d 100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@ -51,7 +51,7 @@ module.exports = {
modulemapper.mapModules(window);
window.alert = window.alert || require("cordova/plugin/notification").alert;
- window.confirm = window.confirm || require("cordova/plugin/notification").confirm;
+ window.confirm = window.confirm || require("cordova/plugin/notification").confirm;
var onWinJSReady = function () {
var app = WinJS.Application;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/lib/windows8/plugin/windows8/NotificationProxy.js
----------------------------------------------------------------------
diff --git a/lib/windows8/plugin/windows8/NotificationProxy.js b/lib/windows8/plugin/windows8/NotificationProxy.js
index 35ef6e7..5cfac61 100644
--- a/lib/windows8/plugin/windows8/NotificationProxy.js
+++ b/lib/windows8/plugin/windows8/NotificationProxy.js
@@ -28,7 +28,7 @@ var alertStack = [];
module.exports = {
alert:function(win, loseX, args) {
-
+
if (isAlertShowing) {
var later = function () {
module.exports.alert(win, loseX, args);
@@ -37,7 +37,7 @@ module.exports = {
return;
}
isAlertShowing = true;
-
+
var message = args[0];
var _title = args[1];
var _buttonLabel = args[2];
@@ -46,12 +46,12 @@ module.exports = {
md.commands.append(new Windows.UI.Popups.UICommand(_buttonLabel));
md.showAsync().then(function() {
isAlertShowing = false;
- win && win();
+ win && win();
if (alertStack.length) {
setTimeout(alertStack.shift(), 0);
}
-
+
});
},
@@ -88,7 +88,7 @@ module.exports = {
if (alertStack.length) {
setTimeout(alertStack.shift(), 0);
}
-
+
});
},
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/29b266bc/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4ef5e6d..938412d 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,10 @@
{
"name":"Anis Kadri",
"email":""
+ },
+ {
+ "name":"Dan Silivestru",
+ "email":"dansilivestru@apache.org"
}
],
"dependencies": {