You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by au...@apache.org on 2017/08/07 16:35:41 UTC
[5/5] cordova-plugin-globalization git commit: Merge branch 'CB-12895'
Merge branch 'CB-12895'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/commit/9cf0c65e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/9cf0c65e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/9cf0c65e
Branch: refs/heads/master
Commit: 9cf0c65e49ec483585cd3c9c08d16676bff7334e
Parents: 86e33d3 f8e7fcd
Author: Audrey So <au...@apache.org>
Authored: Mon Aug 7 09:34:39 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Mon Aug 7 09:34:39 2017 -0700
----------------------------------------------------------------------
src/blackberry10/index.js | 40 ++++++++++++++++++++++++++++++--
src/browser/GlobalizationProxy.js | 22 +++++++++++-------
src/firefoxos/GlobalizationProxy.js | 17 +++++++-------
3 files changed, 60 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/9cf0c65e/src/blackberry10/index.js
----------------------------------------------------------------------
diff --cc src/blackberry10/index.js
index b9fe9b3,c950ee9..3ca2c3b
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@@ -313,9 -313,9 +313,15 @@@ var globalization =
* function () {});
*/
isDayLightSavingsTime: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('isDayLightSavingsTime', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('isDayLightSavingsTime', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('isDayLightSavingsTime: ' + JSON.stringify(response));
if (data.error !== undefined) {
@@@ -349,9 -349,9 +355,15 @@@
* function () {});
*/
getFirstDayOfWeek: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('getFirstDayOfWeek', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('getFirstDayOfWeek', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('getFirstDayOfWeek: ' + JSON.stringify(response));
if (data.error !== undefined) {
@@@ -390,9 -390,9 +402,15 @@@
* {type:'decimal'});
*/
numberToString: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('numberToString', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('numberToString', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('numberToString: ' + JSON.stringify(response));
if (data.error !== undefined) {
@@@ -431,9 -431,9 +449,15 @@@
* function () { alert('Error parsing number');});
*/
stringToNumber: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('stringToNumber', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('stringToNumber', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('stringToNumber: ' + JSON.stringify(response));
if (data.error !== undefined) {
@@@ -481,9 -481,9 +505,15 @@@
* function () {});
*/
getNumberPattern: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('getNumberPattern', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('getNumberPattern', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('getNumberPattern: ' + JSON.stringify(response));
if (data.error !== undefined) {
@@@ -533,9 -533,9 +563,15 @@@
* function () {});
*/
getCurrencyPattern: function (successCB, failureCB, args, env) {
++<<<<<<< HEAD
+ var result = new PluginResult(args, env),
+ response = g11n.getInstance().InvokeMethod('getCurrencyPattern', args),
+ data = JSON.parse(response);
++=======
+ var result = new PluginResult(args, env);
+ var response = g11n.getInstance().InvokeMethod('getCurrencyPattern', args);
+ var data = JSON.parse(response);
++>>>>>>> CB-12895
console.log('getCurrencyPattern: ' + JSON.stringify(response));
if (data.error !== undefined) {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/9cf0c65e/src/browser/GlobalizationProxy.js
----------------------------------------------------------------------
diff --cc src/browser/GlobalizationProxy.js
index 5e99920,14089ba..c06f04f
--- a/src/browser/GlobalizationProxy.js
+++ b/src/browser/GlobalizationProxy.js
@@@ -48,7 -48,8 +48,9 @@@ function dstOffsetAbs (date)
}
function getWeekDayNames (locale, options) {
- var result = [], date;
+ var result = [];
+ var date;
++
for (var i = 0; i < 7; i++) {
date = new Date(2014, 5, i + 1, 0, 0, 0, 0);
result[i] = date.toLocaleDateString(locale, options);
@@@ -116,7 -117,7 +118,8 @@@ function convertToMomentLocalizedForma
throw formatLengthError;
}
}
+
+ /* eslint-enable no-unreachable */
function prepareAndGetDateOptions (options) {
options = options || {formatLength: 'short', selector: 'date and time'};
options.formatLength = options.formatLength || 'short';
@@@ -226,7 -227,7 +229,8 @@@ var globalization =
getNumberPattern: function (win, fail, args) {
try {
- var options = args[0].options || { type: 'decimal'};
+ var options = args[0].options || { type: 'decimal' };
++
options.type = options.type || 'decimal';
options = convertToIntlNumberFormatOptions(options);
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/9cf0c65e/src/firefoxos/GlobalizationProxy.js
----------------------------------------------------------------------
diff --cc src/firefoxos/GlobalizationProxy.js
index 42048d6,91694ce..e665611
--- a/src/firefoxos/GlobalizationProxy.js
+++ b/src/firefoxos/GlobalizationProxy.js
@@@ -208,7 -208,7 +208,8 @@@ Date.prototype.stdTimezoneOffset = func
return Math.max(jan.getTimezoneOffset(), jul.getTimezoneOffset());
};
- Date.prototype.isDayLightSavingsTime = function () {
++
+ Date.prototype.isDayLightSavingsTime = function () { // eslint-disable-line no-extend-native
return this.getTimezoneOffset() < this.stdTimezoneOffset();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org