Fixed #23, extend(default, more.hasOwnProperty is not function)

hotoo · Mar 24, 2014 · 62c614f · 62c614f
1 parent 4877228
commit 62c614f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "pinyin",
-  "version": "2.2.0",
+  "name": "pinyinjs",
+  "version": "2.2.1",
   "description": "汉语拼音转换工具。",
   "main": "src/pinyin.js",
   "bin": {

diff --git a/src/pinyin.js b/src/pinyin.js
@@ -101,7 +101,6 @@ function single_pinyin(han, options){
     return single_pinyin(han.charAt(0), options);
   }
 
-  options = extend(DEFAULT_OPTIONS, options);
   var hanCode = han.charCodeAt(0);
 
   if(!PINYIN_DICT[hanCode]){return [han];}
@@ -155,7 +154,7 @@ function pinyin(hans, options){
 
   if("string" !== typeof hans){return [];}
 
-  options = extend(DEFAULT_OPTIONS, options);
+  options = extend(DEFAULT_OPTIONS, options || {});
 
   var phrases = segment.doSegment(hans);
   var len = hans.length;