From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Fri, 13 Nov 2015 07:43:47 +0000 (+0100)
Subject: [Globalization] Corrected default parameters of methods.
X-Git-Tag: submit/tizen/20151221.111205^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7703c0813a64e5eaca7496d10e176094752d32a7;p=platform%2Fcore%2Fapi%2Fcordova-plugins.git

[Globalization] Corrected default parameters of methods.

Fixes: XWALK-857

[Verification] Code compiles, pass rate: 46/46.

Change-Id: If06fad067940dae229b9d754d9e6a675f7907222
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---

diff --git a/src/globalization/cordova_globalization_api.js b/src/globalization/cordova_globalization_api.js
index 2594778..4ddfe3a 100755
--- a/src/globalization/cordova_globalization_api.js
+++ b/src/globalization/cordova_globalization_api.js
@@ -56,12 +56,8 @@ function Globalization_getPreferredLanguage(successCb, errorCb) {
 }
 
 function Globalization_dateToString(timestamp, successCb, errorCb, options) {
-  var formatLength = formatFullStr;
-  var selector = selectorDateAndTimeStr;
-  if (options) {
-    formatLength = options.formatLength || formatFullStr;
-    selector = options.selector || selectorDateAndTimeStr;
-  }
+  var formatLength = (options && options.formatLength) || formatShortStr;
+  var selector = (options && options.selector) || selectorDateAndTimeStr;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {
@@ -82,12 +78,8 @@ function Globalization_dateToString(timestamp, successCb, errorCb, options) {
 
 function Globalization_stringToDate(dateString, successCb, errorCb, options) {
   var result = null;
-  var formatLength = formatFullStr;
-  var selector = selectorDateAndTimeStr;
-  if (options) {
-    formatLength = options.formatLength || formatFullStr;
-    selector = options.selector || selectorDateAndTimeStr;
-  }
+  var formatLength = (options && options.formatLength) || formatShortStr;
+  var selector = (options && options.selector) || selectorDateAndTimeStr;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {
@@ -107,13 +99,8 @@ function Globalization_stringToDate(dateString, successCb, errorCb, options) {
 }
 
 function Globalization_getDatePattern(successCb, errorCb, options) {
-  var formatLength = formatFullStr;
-  var selector = selectorDateAndTimeStr;
-
-  if (options) {
-    formatLength = options.formatLength || formatFullStr;
-    selector = options.selector || selectorDateAndTimeStr;
-  }
+  var formatLength = (options && options.formatLength) || formatShortStr;
+  var selector = (options && options.selector) || selectorDateAndTimeStr;
 
   var callback = function(result) {
     // Checking succes of gathering pattern
@@ -161,12 +148,8 @@ function Globalization_getDatePattern(successCb, errorCb, options) {
 }
 
 function Globalization_getDateNames(successCb, errorCb, options) {
-  var type = typeWide;
-  var item = itemDays;
-  if (options) {
-    type = options.type || typeWide;
-    item = options.item || itemDays;
-  }
+  var type = (options && options.type) || typeWide;
+  var item = (options && options.item) || itemMonths;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {
@@ -212,10 +195,7 @@ function Globalization_getFirstDayOfWeek(successCb, errorCb) {
 }
 
 function Globalization_numberToString(number, successCb, errorCb, options) {
-  var type = numberTypeDecimal;
-  if (options) {
-    type = options.type || numberTypeDecimal;
-  }
+  var type = (options && options.type) || numberTypeDecimal;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {
@@ -234,10 +214,7 @@ function Globalization_numberToString(number, successCb, errorCb, options) {
 }
 
 function Globalization_stringToNumber(numberStr, successCb, errorCb, options) {
-  var type = numberTypeDecimal;
-  if (options) {
-    type = options.type || numberTypeDecimal;
-  }
+  var type = (options && options.type) || numberTypeDecimal;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {
@@ -258,10 +235,7 @@ function Globalization_stringToNumber(numberStr, successCb, errorCb, options) {
 }
 
 function Globalization_getNumberPattern(successCb, errorCb, options) {
-  var type = numberTypeDecimal;
-  if (options) {
-    type = options.type || numberTypeDecimal;
-  }
+  var type = (options && options.type) || numberTypeDecimal;
 
   var callback = function(result) {
     if (native_.isFailure(result)) {