Merge pull request #6 from wenzhixin/master

Update my repo

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 _gh_pages
 deploy.sh
+docs_

CHANGELOG.md

@@ -1,5 +1,20 @@
 ## ChangeLog
 
+### 1.5.1
+
+- [bug] Fix queryParams bug when use `sidePagination='server'`.
+- [enh] Add uk-UA, sv-SE, pt-PT locales.
+- [enh] Add `searchTimeOut` option.
+- [bug] Fix #220: state column hideColumn bug.
+- [enh] Add `iconsPrefix` and `icons` options to support custom icons.
+- [enh] Add i18n support for docs.
+- [enh] Allow `query` params to be specified during refresh.
+- [bug] Fix bug of ellipsis string.
+- [bug] Fix pageList smartDisplay.
+- [bug] Fix #188: Export Button is not shown only use `showExport=true`.
+- [enh] Add limit and offset params only if pagination is activated.
+- [enh] Add `ajaxOptions` option to custom $.ajax options.
+
 ### 1.5.0
 
 - [bug] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).

README.md

@@ -11,6 +11,8 @@ An extended Bootstrap table with radio, checkbox, sort, pagination, and other ad
 
 To get started, check out http://bootstrap-table.wenzhixin.net.cn!
 
+More examples: https://github.com/wenzhixin/bootstrap-table-examples#examples-list
+
 ## LICENSE
 
 **NOTE:** Bootstrap Table is licensed under the [The MIT License](https://github.com/wenzhixin/bootstrap-table/blob/master/LICENSE). Completely free, you can arbitrarily use and modify this plugin. If this plugin is useful to you, you can **Star** this repo, your support is my biggest motive force, thanks.

dist/locale/ bootstrap-table-pt-PT.min.js

@@ -0,0 +1,7 @@
+/*
+* bootstrap-table - v1.5.0 - 2014-12-12
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2014 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";a.fn.bootstrapTable.locales["pt-PT"]={formatLoadingMessage:function(){return"A carregar, aguarde…"},formatRecordsPerPage:function(a){return a+" registos por página"},formatShowingRows:function(a,b,c){return"A mostrar "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-PT"])}(jQuery);

docs/_i18n/en/documentation/methods.md

@@ -69,7 +69,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
     <tr>
         <td>refresh</td>
         <td>params</td>
-        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url.</td>
+        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url. To supply query params specific to this request, set <code>{query: {foo: 'bar'}}</code></td>
     </tr>
     <tr>
         <td>showLoading</td>

docs/_i18n/en/documentation/table-options.md

@@ -137,6 +137,13 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>The type of data that you are expecting back from the server.</td>
     </tr>
     <tr>
+        <td>ajaxOptions</td>
+        <td>data-ajax-options</td>
+        <td>Object</td>
+        <td>{}</td>
+        <td>Additional options for submit ajax request. List of values: <a href="http://api.jquery.com/jQuery.ajax">http://api.jquery.com/jQuery.ajax</a>.</td>
+    </tr>
+    <tr>
         <td>queryParams</td>
         <td>data-query-params</td>
         <td>Function</td>

docs/_i18n/en/examples/align.md

@@ -2,4 +2,4 @@
 
 Use `align`, `halign` and `valign` options to set the alignment of the columns and their header. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/basic.md

@@ -6,16 +6,16 @@
 
 Transform table from an existing, unformatted html table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from data
 
 Transform table from an existing data. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from url
 
 Transform table from an url. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/card-view.md

@@ -2,4 +2,4 @@
 
 Use `cardView: true` option to show Card View. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/columns.md

@@ -6,10 +6,10 @@
 
 Use `showColumns`, `minimumCountColumns` options, and `visible`, `switchable` column options to show the columns menu list use to switch. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Large Columns
 
 Bootstrap table support large columns, it will auto to show the horizontal scroll bar. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="350" src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="350" data-src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/events.md

@@ -6,11 +6,11 @@
 
 Table events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Column Events
 
 Use `formatter`, `events` column option to define the custom events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 

docs/_i18n/en/examples/format.md

@@ -2,4 +2,4 @@
 
 Use `formatter` column option to format the display of bootstrap table column. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/hide-header.md

@@ -2,4 +2,4 @@
 
 Use `showHeader: false` to hide the header of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/methods.md

@@ -6,7 +6,7 @@
 
 The table header does not adjust automatically, We need to call `resetView` method. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 
 <!--

docs/_i18n/en/examples/pagination.md

@@ -6,4 +6,15 @@
 
 The default side pagination of table is `client`. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="400" src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+
+## Server Side
+
+Use sidePagination: `server` option to define the server side pagination of table. _by [@mikepenz](https://github.com/mikepenz)_
+
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/4r6g4cfu/3/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+Here's the server-side code.
+https://gist.github.com/mikepenz/06df1204cbb65b874cb5
+ It's a quick and dirty api, just to showcase the usage.

docs/_i18n/en/examples/select.md

@@ -6,22 +6,22 @@
 
 Use `clickToSelect`, `selectItemName` options and `radio` column option to show a radio select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Checkbox Select
 
 Use `clickToSelect` option and `checkbox` column option to show a checkbox select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Disabled Checkbox
 
 Use `checkboxHeader`, `checkboxEnable` options and `formatter` column option to disabled select input. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Single Checkbox
 
 Use `singleSelect` option to allow checkbox selecting only one row. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/sort.md

@@ -6,10 +6,10 @@
 
 Use `sortName`, `sortOrder`, `sortable` options, and `sortable`, `order` column options to set the basic sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Sort
 
 Use `sorter` column option to define the custom sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/style.md

@@ -6,16 +6,16 @@
 
 Use `height, classes, striped` options and `class, width` column options to set the styles of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## RowStyle
 
 Use `rowStyle` option to set the row style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## CellStyle
 
 Use `cellStyle` column option to set the cell style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/examples/toolbar.md

@@ -6,10 +6,10 @@
 
 Use `search`, `showColumns`, `showRefresh`, `showToggle` options to show the basic toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Toolbar
 
 Use `toolbar` option to define the custom toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/en/extensions/editable.md

@@ -25,4 +25,4 @@ Use Plugin:
 
 ## Editable Examples
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/documentation/methods.md

@@ -69,7 +69,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
     <tr>
         <td>refresh</td>
         <td>params</td>
-        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url.</td>
+        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url. To supply query params specific to this request, set <code>{query: {foo: 'bar'}}</code></td>
     </tr>
     <tr>
         <td>showLoading</td>

docs/_i18n/fr/documentation/table-options.md

@@ -137,6 +137,13 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>The type of data that you are expecting back from the server.</td>
     </tr>
     <tr>
+        <td>ajaxOptions</td>
+        <td>data-ajax-options</td>
+        <td>Object</td>
+        <td>{}</td>
+        <td>Additional options for submit ajax request. List of values: <a href="http://api.jquery.com/jQuery.ajax">http://api.jquery.com/jQuery.ajax</a>.</td>
+    </tr>
+    <tr>
         <td>queryParams</td>
         <td>data-query-params</td>
         <td>Function</td>

docs/_i18n/fr/examples/align.md

@@ -2,4 +2,4 @@
 
 Use `align`, `halign` and `valign` options to set the alignment of the columns and their header. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/basic.md

@@ -6,16 +6,16 @@
 
 Transform table from an existing, unformatted html table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from data
 
 Transform table from an existing data. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from url
 
 Transform table from an url. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/card-view.md

@@ -2,4 +2,4 @@
 
 Use `cardView: true` option to show Card View. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/columns.md

@@ -6,10 +6,10 @@
 
 Use `showColumns`, `minimumCountColumns` options, and `visible`, `switchable` column options to show the columns menu list use to switch. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Large Columns
 
 Bootstrap table support large columns, it will auto to show the horizontal scroll bar. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="350" src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="350" data-src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/events.md

@@ -6,11 +6,11 @@
 
 Table events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Column Events
 
 Use `formatter`, `events` column option to define the custom events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 

docs/_i18n/fr/examples/format.md

@@ -2,4 +2,4 @@
 
 Use `formatter` column option to format the display of bootstrap table column. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/hide-header.md

@@ -2,4 +2,4 @@
 
 Use `showHeader: false` to hide the header of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/methods.md

@@ -6,7 +6,7 @@
 
 The table header does not adjust automatically, We need to call `resetView` method. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 
 <!--

docs/_i18n/fr/examples/pagination.md

@@ -6,4 +6,15 @@
 
 The default side pagination of table is `client`. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="400" src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+
+## Server Side
+
+Use sidePagination: `server` option to define the server side pagination of table. _by [@mikepenz](https://github.com/mikepenz)_
+
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/4r6g4cfu/3/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+Here's the server-side code.
+https://gist.github.com/mikepenz/06df1204cbb65b874cb5
+ It's a quick and dirty api, just to showcase the usage.

docs/_i18n/fr/examples/select.md

@@ -6,22 +6,22 @@
 
 Use `clickToSelect`, `selectItemName` options and `radio` column option to show a radio select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Checkbox Select
 
 Use `clickToSelect` option and `checkbox` column option to show a checkbox select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Disabled Checkbox
 
 Use `checkboxHeader`, `checkboxEnable` options and `formatter` column option to disabled select input. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Single Checkbox
 
 Use `singleSelect` option to allow checkbox selecting only one row. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/sort.md

@@ -6,10 +6,10 @@
 
 Use `sortName`, `sortOrder`, `sortable` options, and `sortable`, `order` column options to set the basic sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Sort
 
 Use `sorter` column option to define the custom sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/style.md

@@ -6,16 +6,16 @@
 
 Use `height, classes, striped` options and `class, width` column options to set the styles of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## RowStyle
 
 Use `rowStyle` option to set the row style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## CellStyle
 
 Use `cellStyle` column option to set the cell style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/examples/toolbar.md

@@ -6,10 +6,10 @@
 
 Use `search`, `showColumns`, `showRefresh`, `showToggle` options to show the basic toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Toolbar
 
 Use `toolbar` option to define the custom toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/fr/extensions/editable.md

@@ -25,4 +25,4 @@ Use Plugin:
 
 ## Editable Examples
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/documentation/methods.md

@@ -69,7 +69,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
     <tr>
         <td>refresh</td>
         <td>params</td>
-        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url.</td>
+        <td>Refresh the remote server data, you can set <code>{silent: true}</code> to refresh the data silently, and set <code>{url: newUrl}</code> to change the url. To supply query params specific to this request, set <code>{query: {foo: 'bar'}}</code></td>
     </tr>
     <tr>
         <td>showLoading</td>

docs/_i18n/zh-cn/documentation/table-options.md

@@ -137,6 +137,13 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>The type of data that you are expecting back from the server.</td>
     </tr>
     <tr>
+        <td>ajaxOptions</td>
+        <td>data-ajax-options</td>
+        <td>Object</td>
+        <td>{}</td>
+        <td>Additional options for submit ajax request. List of values: <a href="http://api.jquery.com/jQuery.ajax">http://api.jquery.com/jQuery.ajax</a>.</td>
+    </tr>
+    <tr>
         <td>queryParams</td>
         <td>data-query-params</td>
         <td>Function</td>

docs/_i18n/zh-cn/examples/align.md

@@ -2,4 +2,4 @@
 
 Use `align`, `halign` and `valign` options to set the alignment of the columns and their header. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/17/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/basic.md

@@ -6,16 +6,16 @@
 
 Transform table from an existing, unformatted html table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/11/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from data
 
 Transform table from an existing data. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/13/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Table from url
 
 Transform table from an url. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/14/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/card-view.md

@@ -2,4 +2,4 @@
 
 Use `cardView: true` option to show Card View. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/27/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/columns.md

@@ -6,10 +6,10 @@
 
 Use `showColumns`, `minimumCountColumns` options, and `visible`, `switchable` column options to show the columns menu list use to switch. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/24/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Large Columns
 
 Bootstrap table support large columns, it will auto to show the horizontal scroll bar. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="350" src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="350" data-src="http://jsfiddle.net/wenyi/e3nk137y/26/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/events.md

@@ -6,11 +6,11 @@
 
 Table events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Column Events
 
 Use `formatter`, `events` column option to define the custom events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/39/embedded/html,js,css,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 

docs/_i18n/zh-cn/examples/format.md

@@ -2,4 +2,4 @@
 
 Use `formatter` column option to format the display of bootstrap table column. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/21/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/hide-header.md

@@ -2,4 +2,4 @@
 
 Use `showHeader: false` to hide the header of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/22/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/methods.md

@@ -6,7 +6,7 @@
 
 The table header does not adjust automatically, We need to call `resetView` method. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/40/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 
 <!--

docs/_i18n/zh-cn/examples/pagination.md

@@ -6,4 +6,15 @@
 
 The default side pagination of table is `client`. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="400" src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/wenyi/e3nk137y/42/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+
+## Server Side
+
+Use sidePagination: `server` option to define the server side pagination of table. _by [@mikepenz](https://github.com/mikepenz)_
+
+<iframe width="100%" height="400" data-src="http://jsfiddle.net/4r6g4cfu/3/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+
+Here's the server-side code.
+https://gist.github.com/mikepenz/06df1204cbb65b874cb5
+ It's a quick and dirty api, just to showcase the usage.

docs/_i18n/zh-cn/examples/select.md

@@ -6,22 +6,22 @@
 
 Use `clickToSelect`, `selectItemName` options and `radio` column option to show a radio select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/29/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Checkbox Select
 
 Use `clickToSelect` option and `checkbox` column option to show a checkbox select table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/30/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Disabled Checkbox
 
 Use `checkboxHeader`, `checkboxEnable` options and `formatter` column option to disabled select input. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/31/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Single Checkbox
 
 Use `singleSelect` option to allow checkbox selecting only one row. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/32/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/sort.md

@@ -6,10 +6,10 @@
 
 Use `sortName`, `sortOrder`, `sortable` options, and `sortable`, `order` column options to set the basic sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/18/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Sort
 
 Use `sorter` column option to define the custom sort of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/19/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/style.md

@@ -6,16 +6,16 @@
 
 Use `height, classes, striped` options and `class, width` column options to set the styles of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/15/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## RowStyle
 
 Use `rowStyle` option to set the row style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/16/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## CellStyle
 
 Use `cellStyle` column option to set the cell style of bootstrap table. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/30sx4h3t/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/examples/toolbar.md

@@ -6,10 +6,10 @@
 
 Use `search`, `showColumns`, `showRefresh`, `showToggle` options to show the basic toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/33/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Custom Toolbar
 
 Use `toolbar` option to define the custom toolbars. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/34/embedded/html,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/extensions/editable.md

@@ -25,4 +25,4 @@ Use Plugin:
 
 ## Editable Examples
 
-<iframe width="100%" height="300" src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="300" data-src="http://jsfiddle.net/wenyi/e3nk137y/28/embedded/html,js,resources,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>

docs/_i18n/zh-cn/getting-started/grunt.md

@@ -1,38 +1,38 @@
-# Compiling CSS and JavaScript []({{ site.repo }}/blob/master/docs/_i18n/{{ site.lang }}/getting-started/grunt.md)
+# 编译 CSS 和 JavaScript []({{ site.repo }}/blob/master/docs/_i18n/{{ site.lang }}/getting-started/grunt.md)
 
 ---
 
-Bootstrap table uses [Grunt](http://gruntjs.com/) for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.
+Bootstrap table 使用 [Grunt](http://gruntjs.com/) 来作为编译系统，可以用十分方便的方法来编译我们代码，或者文档等等。
 
-## Installing Grunt
+## 安装 Grunt
 
-To install Grunt, you must **first** [download and install node.js](http://nodejs.org/download/) (which includes npm). npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js.
+安装 Grunt，你必须先 [下载和安装 node.js](http://nodejs.org/download/) (包含 npm)。npm 是 [node 的包模块](http://npmjs.org/) 管理工具。
 
-Then, from the command line:
+然后，我们使用命令行：
 
-1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
-2. Navigate to the root `/bootstrap-table/` directory, then run `npm install`. npm will look at the `package.json` file and automatically install the necessary local dependencies listed there.
+1. 安装全局的 `grunt-cli`，使用 `npm install -g grunt-cli` 命令即可。
+2. 进入到 `/bootstrap-table/` 的根目录，然后运行 `npm install`。npm 将通过查找 `package.json` 文件并自动安装这里所需要的依赖。
 
-When completed, you'll be able to run the various Grunt commands provided from the command line.
+完成之后，你就可以运行一下的命令来编译的代码了。
 
-## Available Grunt commands
+## 可以用的 Grunt 命令
 
-### `grunt dist` (Just compile CSS and JavaScript)
+### `grunt dist` (编译 CSS 和 JavaScript)
 
-Regenerates the `/dist/` directory with compiled and minified CSS and JavaScript files. As a Bootstrap user, this is normally the command you want.
+这里我们会生成 `/dist/` 文件夹。 As a Bootstrap user, this is normally the command you want.
 
-### `grunt test` (Run tests)
+### `grunt test` (运行 tests)
 
-Runs [JSHint](http://jshint.com/) to test our code.
+运行 [JSHint](http://jshint.com/) 来测试我们的代码。
 
-### `grunt docs` (Build & test the docs assets)
+### `grunt docs` (编译和测试文档)
 
-Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via `jekyll serve`.
+编译和测试 CSS，JavaScript，本地我们可以通过 `jekyll serve` 来运行我们的文档。
 
-### `grunt` (Build absolutely everything and run tests)
+### `grunt` (编译所有并运行测试)
 
-Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires [Jekyll](http://jekyllrb.com/docs/installation/).
+压缩和扰乱 CSS 和 JavaScript，测试，编译文档等等。依赖 [Jekyll](http://jekyllrb.com/docs/installation/)。
 
-## Troubleshooting
+## 遇到问题
 
-Should you encounter problems with installing dependencies or running Grunt commands, first delete the `/node_modules/` directory generated by npm. Then, rerun `npm install`.
+如果你安装或运行依赖是遇到问题，首先删除 `/node_modules/` npm 生成的文件夹。然后，再运行一次 `npm install` 即可。

docs/_i18n/zh-cn/getting-started/usage.md

@@ -1,15 +1,15 @@
-# Usage []({{ site.repo }}/blob/master/docs/_i18n/{{ site.lang }}/getting-started/usage.md)
+# 使用 []({{ site.repo }}/blob/master/docs/_i18n/{{ site.lang }}/getting-started/usage.md)
 
 ---
 
-Include Bootstrap library (if your project doesn't use it already) and `bootstrap-table.css` in the head tag your html document.
+引入 Bootstrap 库（假如你的项目还没有使用）和 `bootstrap-table.css` 到 head 标签下。
 
 ```html
 <link rel="stylesheet" href="bootstrap.min.css">
 <link rel="stylesheet" href="bootstrap-table.css">
 ```
 
-Include jQuery library, bootstrap library (if your project doesn't use it already) and `bootstrap-table.js` in the head tag or at the very bottom of your document, just before the closing body tag (usually recommended for better performance).
+引入 jQuery 库，bootstrap 库（假如你的项目还没有使用）和 `bootstrap-table.js` 到 head 标签下或者在 body 标签关闭之前（一般建议这么做）。
 
 ```html
 <script src="jquery.min.js"></script>
@@ -21,11 +21,11 @@ Include jQuery library, bootstrap library (if your project doesn't use it alread
 
 ---
 
-The Bootstrap Table plugin displays data in a tabular format, via data attributes or JavaScript.
+通过 data 属性或者 JavaScript 来启用 Bootstrap Table 插件，显示丰富的功能。
 
-## Via data attributes
+## 通过 data 属性的方式
 
-Activate bootstrap table without writing JavaScript. Set `data-toggle="table"` on a normal table.
+无需编写 JavaScript 启用 bootstrap table，我们对普通的 table 设置 `data-toggle="table"` 即可。
 
 ```html
 <table data-toggle="table">
@@ -51,7 +51,7 @@ Activate bootstrap table without writing JavaScript. Set `data-toggle="table"` o
 </table>
 ```
 
-We can also use remote url data by setting `data-url="data1.json"` on a normal table.
+我们也可以通过设置远程的 url 如  `data-url="data1.json"` 来加载数据。
 
 ```html
 <table data-toggle="table" data-url="data1.json">
@@ -65,9 +65,9 @@ We can also use remote url data by setting `data-url="data1.json"` on a normal t
 </table>
 ```
 
-## Via JavaScript
+## 通过 JavaScript 的方式
 
-Call a bootstrap table with id table with JavaScript.
+通过表格 id 来启用 bootstrap table。
 
 ```html
 <table id="table"></table>
@@ -97,7 +97,7 @@ $('#table').bootstrapTable({
 });
 ```
 
-We can also use remote url data by setting `url: 'data1.json'`.
+我们也可以通过设置远程的 url 如  `url: 'data1.json'` 来加载数据。
 
 ```js
 $('#table').bootstrapTable({

docs/assets/css/style.css

@@ -9,4 +9,12 @@
     font-size: 16px;
     font-weight: normal;
     line-height: 39px;
+}
+.examples-parent {
+    position: relative;
+}
+.examples-button {
+    position: absolute;
+    left: 20px;
+    top: 20px;
 }

docs/assets/js/common.js

@@ -20,4 +20,15 @@ $(function () {
             $('.language').text($(this).text());
         }
     });
+
+    // examples
+    $('iframe[data-src]').each(function () {
+        $(this).wrap('<div class="examples-parent"></div>').parent()
+            .append('<button class="examples-button btn btn-primary btn-lg"><i class="glyphicon glyphicon-fire"></i> Start Example</button>');
+    });
+    $(document).on('click', 'button.examples-button', function () {
+        var $iframe = $(this).prev();
+        $iframe.attr('src', $iframe.data('src'));
+        $(this).remove();
+    });
 });

docs/examples.md

@@ -31,4 +31,8 @@ lead: pages.examples.lead
 
 {% tf examples/events.md %}
 
-{% tf examples/methods.md %}
+{% tf examples/methods.md %}
+
+# More examples
+
+More examples: [https://github.com/wenzhixin/bootstrap-table-examples#examples-list](https://github.com/wenzhixin/bootstrap-table-examples#examples-list)

src/bootstrap-table.js

@@ -135,6 +135,7 @@
         cache: true,
         contentType: 'application/json',
         dataType: 'json',
+        ajaxOptions: {},
         queryParams: function (params) {return params;},
         queryParamsType: 'limit', // undefined
         responseHandler: function (res) {return res;},
@@ -155,6 +156,7 @@
         minimumCountColumns: 1,
         idField: undefined,
         cardView: false,
+        trimOnSearch: true,
         clickToSelect: false,
         singleSelect: false,
         toolbar: undefined,
@@ -195,7 +197,7 @@
 
     BootstrapTable.LOCALES['en-US'] = {
         formatLoadingMessage: function () {
-            return 'Loading, please wait…';
+            return 'Loading, please wait...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return sprintf('%s records per page', pageNumber);
@@ -498,16 +500,24 @@
                 if (aa === undefined || aa === null) {
                     aa = '';
                 }
-                if (aa === undefined || bb === null) {
+                if (bb === undefined || bb === null) {
                     bb = '';
                 }
-
+                
+                if ($.isNumeric(aa) && $.isNumeric(bb)) {
+                    if (aa < bb) {
+                        return order * -1;
+                    }
+                    return order;
+                }
+                
                 if (aa === bb) {
                     return 0;
                 }
-                if (aa < bb) {
+                if (aa.localeCompare(bb) == -1) {
                     return order * -1;
                 }
+                    
                 return order;
             });
         }
@@ -603,7 +613,8 @@
 
         html.push('</div>');
 
-        if (html.length > 2) {
+        // Fix #188: this.showToolbar is for extentions
+        if (this.showToolbar || html.length > 2) {
             this.$toolbar.append(html.join(''));
         }
 
@@ -662,7 +673,7 @@
         var text = $.trim($(event.currentTarget).val());
 
         // trim search input
-        $(event.currentTarget).val(text);
+        if(this.options.trimOnSearch) $(event.currentTarget).val(text);
 
         if (text === this.searchText) {
             return;
@@ -777,7 +788,7 @@
         }
 
         $.each(pageList, function (i, page) {
-            if (!that.options.smartDisplay || that.options.totalRows >= page || i === 0) {
+            if (!that.options.smartDisplay || i === 0 || pageList[i-1] <= that.options.totalRows) {
                 var active = page === that.options.pageSize ? ' class="active"' : '';
                 pageNumber.push(sprintf('<li%s><a href="javascript:void(0)">%s</a></li>', active, page));
             }
@@ -841,7 +852,7 @@
             if (this.totalPages <= 1) {
                 this.$pagination.find('div.pagination').hide();
             }
-            if (this.options.pageList.length < 2 || this.options.totalRows <= this.options.pageList[1]) {
+            if (this.options.pageList.length < 2 || this.options.totalRows <= this.options.pageList[0]) {
                 this.$pagination.find('span.page-list').hide();
             }
 
@@ -926,7 +937,7 @@
         }
 
 		//Fix #389 Bootstrap-table-flatJSON is not working
-        
+
         if (!this.options.pagination || this.options.sidePagination === 'server') {
             this.pageFrom = 1;
             this.pageTo = data.length;
@@ -1137,7 +1148,7 @@
         this.trigger('post-body');
     };
 
-    BootstrapTable.prototype.initServer = function (silent) {
+    BootstrapTable.prototype.initServer = function (silent, query) {
         var that = this,
             data = {},
             params = {
@@ -1154,15 +1165,19 @@
 
         if (this.options.queryParamsType === 'limit') {
             params = {
-                limit: params.pageSize,
-                offset: params.pageSize * (params.pageNumber - 1),
                 search: params.searchText,
                 sort: params.sortName,
                 order: params.sortOrder
             };
+            if (this.options.pagination) {
+                params.limit = this.options.pageSize;
+                params.offset = this.options.pageSize * (this.options.pageNumber - 1);
+            }
         }
         data = calculateObjectValue(this.options, this.options.queryParams, [params], data);
 
+        $.extend(data, query || {});
+
         // false to stop request
         if (data === false) {
             return;
@@ -1172,7 +1187,7 @@
             this.$loading.show();
         }
 
-        $.ajax({
+        $.ajax($.extend({}, calculateObjectValue(null, this.options.ajaxOptions), {
             type: this.options.method,
             url: this.options.url,
             data: data,
@@ -1199,7 +1214,7 @@
                     that.$loading.hide();
                 }
             }
-        });
+        }));
     };
 
     BootstrapTable.prototype.getCaretHtml = function () {
@@ -1488,7 +1503,7 @@
             this.options.url = params.url;
             this.options.pageNumber = 1;
         }
-        this.initServer(params && params.silent);
+        this.initServer(params && params.silent, params && params.query);
     };
 
     BootstrapTable.prototype.showColumn = function (field) {

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

@@ -29,6 +29,8 @@
         _initToolbar = BootstrapTable.prototype.initToolbar;
 
     BootstrapTable.prototype.initToolbar = function () {
+        this.showToolbar = true;
+
         _initToolbar.apply(this, Array.prototype.slice.apply(arguments));
 
         if (this.options.showExport) {

src/locale/bootstrap-table-cs-CZ.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['cs-CZ'] = {
         formatLoadingMessage: function () {
-            return 'Čekejte, prosím…';
+            return 'Čekejte, prosím...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' položek na stránku';

src/locale/bootstrap-table-da-DK.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['da-DK'] = {
         formatLoadingMessage: function () {
-            return 'Indlæser, vent venligst…';
+            return 'Indlæser, vent venligst...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' poster pr side';

src/locale/bootstrap-table-de-DE.js

@@ -7,7 +7,7 @@
 
   $.fn.bootstrapTable.locales['de-DE'] = {
     formatLoadingMessage: function () {
-      return 'Lade, bitte warten…';
+      return 'Lade, bitte warten...';
     },
     formatRecordsPerPage: function (pageNumber) {
       return pageNumber + ' Einträge pro Seite';

src/locale/bootstrap-table-el-GR.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['el-GR'] = {
         formatLoadingMessage: function () {
-            return 'Φορτώνει, παρακαλώ περιμένετε…';
+            return 'Φορτώνει, παρακαλώ περιμένετε...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' αποτελέσματα ανά σελίδα';

src/locale/bootstrap-table-en-US.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['en-US'] = {
         formatLoadingMessage: function () {
-            return 'Loading, please wait…';
+            return 'Loading, please wait...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' records per page';

src/locale/bootstrap-table-en-US.js.template

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['en-US'] = {
         formatLoadingMessage: function () {
-            return 'Loading, please wait…';
+            return 'Loading, please wait...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' records per page';

src/locale/bootstrap-table-hu-HU.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['hu-HU'] = {
         formatLoadingMessage: function () {
-            return 'Betöltés, kérem várjon…';
+            return 'Betöltés, kérem várjon...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' rekord per oldal';

src/locale/bootstrap-table-it-IT.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['it-IT'] = {
         formatLoadingMessage: function () {
-            return 'Caricamento in corso…';
+            return 'Caricamento in corso...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' records per pagina';

src/locale/bootstrap-table-nl-NL.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['nl-NL'] = {
         formatLoadingMessage: function () {
-            return 'Laden, even geduld…';
+            return 'Laden, even geduld...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' records per pagina';

src/locale/bootstrap-table-pl-PL.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['pl-PL'] = {
         formatLoadingMessage: function () {
-            return 'Ładowanie, proszę czekać…';
+            return 'Ładowanie, proszę czekać...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' rekordów na stronę';

src/locale/bootstrap-table-pt-BR.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['pt-BR'] = {
         formatLoadingMessage: function () {
-            return 'Carregando, aguarde…';
+            return 'Carregando, aguarde...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' registros por página';

src/locale/bootstrap-table-pt-PT.js

@@ -0,0 +1,28 @@
+/**
+ * Bootstrap Table Portuguese Portugal Translation
+ * Author: Burnspirit<burnspirit@gmail.com>
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['pt-BR'] = {
+        formatLoadingMessage: function () {
+            return 'A carregar, aguarde...';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' registos por página';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'A mostrar ' + pageFrom + ' até ' + pageTo + ' de ' + totalRows + ' linhas';
+        },
+        formatSearch: function () {
+            return 'Pesquisa';
+        },
+        formatNoMatches: function () {
+            return 'Nenhum registo encontrado';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['pt-PT']);
+
+})(jQuery);

src/locale/bootstrap-table-sk-SK.js

@@ -7,7 +7,7 @@
 
     $.fn.bootstrapTable.locales['sk-SK'] = {
         formatLoadingMessage: function () {
-            return 'Prosím čakajte …';
+            return 'Prosím čakajte ...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' záznamov na stranu';

src/locale/bootstrap-table-sv-SE.js

@@ -0,0 +1,37 @@
+/**
+ * Bootstrap Table Swedish translation
+ * Author: C Bratt <bratt@inix.se>
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['sv-SE'] = {
+        formatLoadingMessage: function () {
+            return 'Laddar, vänligen vänta...';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' rader per sida';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'Visa ' + pageFrom + ' till ' + pageTo + ' av ' + totalRows + ' rader';
+        },
+        formatSearch: function () {
+            return 'Sök';
+        },
+        formatNoMatches: function () {
+            return 'Inga matchande resultat funna.';
+        },
+        formatRefresh: function () {
+            return 'Uppdatera';
+        },
+        formatToggle: function () {
+            return 'Skifta';
+        },
+        formatColumns: function () {
+            return 'kolumn';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sv-SE']);
+
+})(jQuery);

src/locale/bootstrap-table-tr-TR.js

@@ -8,7 +8,7 @@
 
     $.fn.bootstrapTable.locales['tr-TR'] = {
         formatLoadingMessage: function () {
-            return 'Yükleniyor, lütfen bekleyin…';
+            return 'Yükleniyor, lütfen bekleyin...';
         },
         formatRecordsPerPage: function (pageNumber) {
             return 'Sayfa başına ' + pageNumber + ' kayıt.';