app/assets/javascripts/i18n.js in i18n-js-3.0.9 vs app/assets/javascripts/i18n.js in i18n-js-3.0.10
- old
+ new
@@ -68,26 +68,30 @@
// Is a given value an array?
// Borrowed from Underscore.js
var isArray = function(val) {
if (Array.isArray) {
return Array.isArray(val);
- };
+ }
return Object.prototype.toString.call(val) === '[object Array]';
};
var isString = function(val) {
- return typeof value == 'string' || Object.prototype.toString.call(val) === '[object String]';
+ return typeof val === 'string' || Object.prototype.toString.call(val) === '[object String]';
};
var isNumber = function(val) {
- return typeof val == 'number' || Object.prototype.toString.call(val) === '[object Number]';
+ return typeof val === 'number' || Object.prototype.toString.call(val) === '[object Number]';
};
var isBoolean = function(val) {
return val === true || val === false;
};
+ var isNull = function(val) {
+ return val === null;
+ };
+
var decimalAdjust = function(type, value, exp) {
// If the exp is undefined or zero...
if (typeof exp === 'undefined' || +exp === 0) {
return Math[type](value);
}
@@ -115,10 +119,10 @@
var merge = function (dest, obj) {
var key, value;
for (key in obj) if (obj.hasOwnProperty(key)) {
value = obj[key];
- if (isString(value) || isNumber(value) || isBoolean(value) || isArray(value)) {
+ if (isString(value) || isNumber(value) || isBoolean(value) || isArray(value) || isNull(value)) {
dest[key] = value;
} else {
if (dest[key] == null) dest[key] = {};
merge(dest[key], value);
}