浏览代码

Update license and error params

zhixin 7 年之前
父节点
当前提交
94f568e6ef
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      LICENSE
  2. 2 2
      src/bootstrap-table.js

+ 1 - 1
LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 (The MIT License)
 
 
-Copyright (c) 2012-2017 Zhixin Wen <wenzhixin2010@gmail.com>
+Copyright (c) 2012-2019 Zhixin Wen <wenzhixin2010@gmail.com>
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 of this software and associated documentation files (the "Software"), to deal

+ 2 - 2
src/bootstrap-table.js

@@ -2082,7 +2082,7 @@
           this.trigger('load-success', res)
           this.trigger('load-success', res)
           if (!silent) this.$tableLoading.hide()
           if (!silent) this.$tableLoading.hide()
         },
         },
-        error: res => {
+        error: jqXHR => {
           let data = []
           let data = []
           if (this.options.sidePagination === 'server') {
           if (this.options.sidePagination === 'server') {
             data = {}
             data = {}
@@ -2090,7 +2090,7 @@
             data[this.options.dataField] = []
             data[this.options.dataField] = []
           }
           }
           this.load(data)
           this.load(data)
-          this.trigger('load-error', res.status, res)
+          this.trigger('load-error', jqXHR.status, jqXHR)
           if (!silent) this.$tableLoading.hide()
           if (!silent) this.$tableLoading.hide()
         }
         }
       })
       })