diff --git a/dest/index.js b/dest/index.js index 888488a..d4cf99a 100644 --- a/dest/index.js +++ b/dest/index.js @@ -71,7 +71,7 @@ var LOCALE_ZH_CN = { yy: '%s年' }; // 当前本地化语言对象 -var _curentLocale = {}; +var _curentLocale = undefined; /** * 修改本地化语言 @@ -85,14 +85,15 @@ function locate(arg) { } else { newLocale = arg; } + if (!_curentLocale) { + _curentLocale = {}; + } for (prop in newLocale) { if (newLocale.hasOwnProperty(prop) && typeof newLocale[prop] === 'string') { _curentLocale[prop] = newLocale[prop]; } } } -// 初始化本地化语言为 en -locate(''); /** * CONST for .fromNow @@ -112,6 +113,10 @@ var DET_STD = [['yy', 31536e6], // 1000 * 60 * 60 * 24 * 365 一年月按 365 */ // 只要大于等于 0 都是秒 function fromNow(datetime) { + if (!_curentLocale) { + // 初始化本地化语言为 en + locate(''); + } var det = +new Date() - +getDateObject(datetime); var format = undefined, str = undefined, diff --git a/dest/index.umd.js b/dest/index.umd.js index c4b4732..d644c2d 100644 --- a/dest/index.umd.js +++ b/dest/index.umd.js @@ -75,7 +75,7 @@ yy: '%s年' }; // 当前本地化语言对象 - var _curentLocale = {}; + var _curentLocale = undefined; /** * 修改本地化语言 @@ -89,14 +89,15 @@ } else { newLocale = arg; } + if (!_curentLocale) { + _curentLocale = {}; + } for (prop in newLocale) { if (newLocale.hasOwnProperty(prop) && typeof newLocale[prop] === 'string') { _curentLocale[prop] = newLocale[prop]; } } } - // 初始化本地化语言为 en - locate(''); /** * CONST for .fromNow @@ -116,6 +117,10 @@ */ // 只要大于等于 0 都是秒 function fromNow(datetime) { + if (!_curentLocale) { + // 初始化本地化语言为 en + locate(''); + } var det = +new Date() - +getDateObject(datetime); var format = undefined, str = undefined, diff --git a/package.json b/package.json index 957fec7..371aff9 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { "name": "silly-datetime", - "version": "0.1.1", + "version": "0.1.2", "description": "simple datetime formater", "main": "dest/index.js", "jsnext:main": "src/index.js", "scripts": { + "prepublish": "node rollup.js", "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" }, "repository": { diff --git a/src/index.js b/src/index.js index 60b8efa..4dc20aa 100644 --- a/src/index.js +++ b/src/index.js @@ -74,7 +74,7 @@ const LOCALE_ZH_CN = { yy: '%s年' }; // 当前本地化语言对象 -let _curentLocale = {}; +let _curentLocale; /** @@ -88,14 +88,15 @@ export function locate(arg) { } else { newLocale = arg; } + if (!_curentLocale) { + _curentLocale = {}; + } for (prop in newLocale) { if (newLocale.hasOwnProperty(prop) && typeof newLocale[prop] === 'string') { _curentLocale[prop] = newLocale[prop]; } } } -// 初始化本地化语言为 en -locate(''); /** @@ -117,6 +118,10 @@ const DET_STD = [ * @return {string} 时间距离 */ export function fromNow(datetime) { + if (!_curentLocale) { + // 初始化本地化语言为 en + locate(''); + } let det = +new Date() - (+getDateObject(datetime)); let format, str, i = 0, detDef, detDefVal; if (det < 0) {