Merge remote branch 'origin/dev' into HEAD

BaiduFE · Dec 31, 2011 · b721cf0 · b721cf0
2 parents d37bfd5 + f1d4a37
commit b721cf0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/baidu/parser/Json.js b/src/baidu/parser/Json.js
@@ -21,7 +21,7 @@ baidu.parser.Json = baidu.parser.Json || (function(){
     return function(options){
 
         var parser = new baidu.parser.Parser(options);
-        parser._type = baidu.parser.JSON;
+        parser._type = baidu.parser.type.JSON;
 
         baidu.extend(parser, {
 

diff --git a/src/baidu/parser/Parser.js b/src/baidu/parser/Parser.js
@@ -12,6 +12,7 @@
 ///import baidu.ajax.get;
 ///import baidu.ajax.post;
 
+
 baidu.parser.Parser = baidu.parser.Parser || (function(){
 
     /**

diff --git a/src/baidu/parser/Xml.js b/src/baidu/parser/Xml.js
@@ -44,7 +44,7 @@ baidu.parser.Xml = baidu.parser.Xml || (function(){
     return function(options){
 
         var parser = new baidu.parser.Parser(options);
-        parser._type = baidu.parser.XML;
+        parser._type = baidu.parser.type.XML;
 
         baidu.extend(parser, {