|
@@ -24,12 +24,11 @@
|
|
|
var BootstrapTable = $.fn.bootstrapTable.Constructor,
|
|
var BootstrapTable = $.fn.bootstrapTable.Constructor,
|
|
|
_initData = BootstrapTable.prototype.initData,
|
|
_initData = BootstrapTable.prototype.initData,
|
|
|
_init = BootstrapTable.prototype.init,
|
|
_init = BootstrapTable.prototype.init,
|
|
|
- _load = BootstrapTable.prototype.load,
|
|
|
|
|
_initTable = BootstrapTable.prototype.initTable;
|
|
_initTable = BootstrapTable.prototype.initTable;
|
|
|
|
|
|
|
|
- BootstrapTable.prototype.initData = function () {
|
|
|
|
|
- flatJSON(this, this.options.data);
|
|
|
|
|
|
|
+ BootstrapTable.prototype.initData = function (data) {
|
|
|
_initData.apply(this, Array.prototype.slice.apply(arguments));
|
|
_initData.apply(this, Array.prototype.slice.apply(arguments));
|
|
|
|
|
+ flatJSON(this, data === undefined ? this.options.data : data);
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
BootstrapTable.prototype.init = function () {
|
|
BootstrapTable.prototype.init = function () {
|
|
@@ -42,11 +41,6 @@
|
|
|
_initTable.apply(this, Array.prototype.slice.apply(arguments));
|
|
_initTable.apply(this, Array.prototype.slice.apply(arguments));
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- BootstrapTable.prototype.load = function (data) {
|
|
|
|
|
- flatJSON(this, data);
|
|
|
|
|
- _load.apply(this, Array.prototype.slice.apply(arguments));
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
//Main functions
|
|
//Main functions
|
|
|
var sd = {
|
|
var sd = {
|
|
|
flat: function (element) {
|
|
flat: function (element) {
|