|
@@ -156,7 +156,7 @@
|
|
|
|
|
|
|
|
if (compareLength) {
|
|
if (compareLength) {
|
|
|
// If number of properties is different, objects are not equivalent
|
|
// If number of properties is different, objects are not equivalent
|
|
|
- if (objectAProperties.length != objectBProperties.length) {
|
|
|
|
|
|
|
+ if (objectAProperties.length !== objectBProperties.length) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -493,6 +493,7 @@
|
|
|
this.initToolbar();
|
|
this.initToolbar();
|
|
|
this.initPagination();
|
|
this.initPagination();
|
|
|
this.initBody();
|
|
this.initBody();
|
|
|
|
|
+ this.initSearchText();
|
|
|
this.initServer();
|
|
this.initServer();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -1022,11 +1023,6 @@
|
|
|
that.onSearch(event);
|
|
that.onSearch(event);
|
|
|
}, that.options.searchTimeOut);
|
|
}, that.options.searchTimeOut);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
- if (this.options.searchText !== '') {
|
|
|
|
|
- $search.val(this.options.searchText);
|
|
|
|
|
- that.onSearch({currentTarget: $search});
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -1716,6 +1712,14 @@
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ BootstrapTable.prototype.initSearchText = function () {
|
|
|
|
|
+ if (this.options.searchText !== '') {
|
|
|
|
|
+ var $search = this.$toolbar.find('.search input');
|
|
|
|
|
+ $search.val(this.options.searchText);
|
|
|
|
|
+ this.onSearch({currentTarget: $search});
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
BootstrapTable.prototype.getCaret = function () {
|
|
BootstrapTable.prototype.getCaret = function () {
|
|
|
var that = this;
|
|
var that = this;
|
|
|
|
|
|