Merge pull request #4 from wenzhixin/develop

Update my repo

docs/_i18n/en/faq/faq.md

@@ -56,4 +56,4 @@ onClickRow: function (row, $element) {
 
 All your ideas and feedback are very appreciated! Please feel free to open issues on GitHub or send me email.
 
-I'm also grateful for your donations: <a href="donate">{% t pages.donate.title %}</a>
+I'm also grateful for your donations: <a href="/donate">{% t pages.donate.title %}</a>

docs/_i18n/en/getting-started/usage.md

@@ -64,6 +64,19 @@ We can also use remote url data by setting `data-url="data1.json"` on a normal t
     </thead>
 </table>
 ```
+You can also add `pagination`, `search`, and `sorting` to a table like the following table.
+
+```html
+<table data-pagination="true" data-search="true" data-toggle="table" data-url="data1.json">
+    <thead>
+        <tr>
+            <th data-sortable="true" data-field="id">Item ID</th>
+            <th data-field="name">Item Name</th>
+            <th data-field="price">Item Price</th>
+        </tr>
+    </thead>
+</table>
+```
 
 ## Via JavaScript
 

docs/_i18n/es/faq/faq.md

@@ -56,4 +56,4 @@ onClickRow: function (row, $element) {
 
 All your ideas and feedback are very appreciated! Please feel free to open issues on GitHub or send me email.
 
-I'm also grateful for your donations: <a href="donate">{% t pages.donate.title %}</a>
+I'm also grateful for your donations: <a href="/donate">{% t pages.donate.title %}</a>

docs/_i18n/zh-cn/faq/faq.md

@@ -54,4 +54,4 @@ onClickRow: function (row, $element) {
 
 非常感谢你的想法和建议，你可以到 GitHub 上提 issue 或者发邮件给我。
 
-当然，假如你也可以 <a href="donate">{% t pages.donate.title %}</a> 我们的项目。
+当然，假如你也可以 <a href="/donate">{% t pages.donate.title %}</a> 我们的项目。

src/bootstrap-table.js

@@ -1234,7 +1234,7 @@
 
         if (this.options.sidePagination !== 'server') {
             if (this.options.customSearch !== $.noop) {
-                this.options.customSearch.apply(this, [this.searchText]);
+                window[this.options.customSearch].apply(this, [this.searchText]);
                 return;
             }
 
@@ -2392,9 +2392,16 @@
     };
 
     BootstrapTable.prototype.getData = function (useCurrentPage) {
-        return (this.searchText || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) ?
-            (useCurrentPage ? this.data.slice(this.pageFrom - 1, this.pageTo) : this.data) :
-            (useCurrentPage ? this.options.data.slice(this.pageFrom - 1, this.pageTo) : this.options.data);
+        var data = this.options.data;
+        if (this.searchText || this.options.sortName || !$.isEmptyObject(this.filterColumns) || !$.isEmptyObject(this.filterColumnsPartial)) {
+            data = this.data;
+        }
+
+        if (useCurrentPage) {
+            return data.slice(this.pageFrom - 1, this.pageTo);
+        }
+
+        return data;
     };
 
     BootstrapTable.prototype.load = function (data) {

src/extensions/cookie/bootstrap-table-cookie.js

@@ -193,6 +193,7 @@
                 });
 
                 bootstrapTable.initColumnSearch(cachedFilters);
+                bootstrapTable.refresh();
             }
         }, 250);
     };
@@ -359,31 +360,37 @@
     BootstrapTable.prototype.onPageNumber = function () {
         _onPageNumber.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageNumber, this.options.pageNumber);
+        return false;
     };
 
     BootstrapTable.prototype.onPageListChange = function () {
         _onPageListChange.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageList, this.options.pageSize);
+        return false;
     };
 
     BootstrapTable.prototype.onPageFirst = function () {
         _onPageFirst.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageNumber, this.options.pageNumber);
+        return false;
     };
 
     BootstrapTable.prototype.onPagePre = function () {
         _onPagePre.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageNumber, this.options.pageNumber);
+        return false;
     };
 
     BootstrapTable.prototype.onPageNext = function () {
         _onPageNext.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageNumber, this.options.pageNumber);
+        return false;
     };
 
     BootstrapTable.prototype.onPageLast = function () {
         _onPageLast.apply(this, Array.prototype.slice.apply(arguments));
         setCookie(this, cookieIds.pageNumber, this.options.pageNumber);
+        return false;
     };
 
     BootstrapTable.prototype.toggleColumn = function () {

src/locale/bootstrap-table-fr-FR.js

@@ -33,7 +33,7 @@
         },
         formatAllRows: function () {
             return 'Tous';
-        }
+        },
         formatExport: function () {
             return 'Exporter les données';
         },
@@ -41,50 +41,50 @@
             return 'Vider les filtres';
         },
         formatMultipleSort: function() {
-+            return 'Tri avancé';
-+        },
-+        formatAddLevel: function() {
-+            return 'Ajouter un niveau';
-+        },
-+        formatDeleteLevel: function() {
-+            return 'Supprimer un niveau';
-+        },
-+        formatColumn: function() {
-+            return 'Colonne';
-+        },
-+        formatOrder: function() {
-+            return 'Ordre';
-+        },
-+        formatSortBy: function() {
-+            return 'Trier par';
-+        },
-+        formatThenBy: function() {
-+            return 'Puis par';
-+        },
-+        formatSort: function() {
-+            return 'Trier';
-+        },
-+        formatCancel: function() {
-+            return 'Annuler';
-+        },
-+        formatDuplicateAlertTitle: function() {
-+            return 'Doublon(s) détecté(s)!';
-+        },
-+        formatDuplicateAlertDescription: function() {
-+            return 'Supprimez ou changez les colonnes dupliquées.';
-+        },
-+        formatSortOrders: function() {
-+            return {
-+                asc: 'Croissant',
-+                desc: 'Décroissant'
-+            };
-+        },
-         formatAdvancedSearch: function() {
-+            return 'Recherche avancée';
-+        },
-+        formatAdvancedCloseButton: function() {
-+            return "Fermer";
-+        }
+            return 'Tri avancé';
+        },
+        formatAddLevel: function() {
+            return 'Ajouter un niveau';
+        },
+        formatDeleteLevel: function() {
+            return 'Supprimer un niveau';
+        },
+        formatColumn: function() {
+            return 'Colonne';
+        },
+        formatOrder: function() {
+            return 'Ordre';
+        },
+        formatSortBy: function() {
+            return 'Trier par';
+        },
+        formatThenBy: function() {
+            return 'Puis par';
+        },
+        formatSort: function() {
+            return 'Trier';
+        },
+        formatCancel: function() {
+            return 'Annuler';
+        },
+        formatDuplicateAlertTitle: function() {
+            return 'Doublon(s) détecté(s)!';
+        },
+        formatDuplicateAlertDescription: function() {
+            return 'Supprimez ou changez les colonnes dupliquées.';
+        },
+        formatSortOrders: function() {
+            return {
+                asc: 'Croissant',
+                desc: 'Décroissant'
+            };
+        },
+        formatAdvancedSearch: function() {
+            return 'Recherche avancée';
+        },
+        formatAdvancedCloseButton: function() {
+            return "Fermer";
+        }
     };
 
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fr-FR']);