浏览代码

Merge pull request #8 from wenzhixin/master

Update my repo
Dennis Hernández 11 年之前
父节点
当前提交
f578fe4221
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 2 2
      _config.yml
  2. 2 1
      src/bootstrap-table.js

+ 2 - 2
_config.yml

@@ -19,8 +19,8 @@ url:              http://bootstrap-table.wenzhixin.net.cn
 encoding:         UTF-8
 encoding:         UTF-8
 
 
 # Languages
 # Languages
-languages: ["en", "zh-cn", "fr"]
-languages_string: ["English", "简体中文", "French"]
+languages: ["en", "zh-cn", "es", "fr"]
+languages_string: ["English", "简体中文", "Spanish", "French"]
 
 
 # Custom vars
 # Custom vars
 current_version: 1.5.0
 current_version: 1.5.0

+ 2 - 1
src/bootstrap-table.js

@@ -1217,7 +1217,8 @@
         $.ajax($.extend({}, calculateObjectValue(null, this.options.ajaxOptions), {
         $.ajax($.extend({}, calculateObjectValue(null, this.options.ajaxOptions), {
             type: this.options.method,
             type: this.options.method,
             url: this.options.url,
             url: this.options.url,
-            data: data,
+            data: this.options.contentType === 'application/json' && this.options.method === 'post' ?
+                JSON.stringify(data): data,
             cache: this.options.cache,
             cache: this.options.cache,
             contentType: this.options.contentType,
             contentType: this.options.contentType,
             dataType: this.options.dataType,
             dataType: this.options.dataType,