Merge pull request #14 from wenzhixin/master

Update my repo

CHANGELOG.md

@@ -6,18 +6,22 @@
 - [enh] Add uk-UA, sv-SE, pt-PT, ms-MY, ja-JP locales.
 - [enh] Add `searchTimeOut` option.
 - [bug] Fix #220: state column hideColumn bug.
+- [bug] Fix #221: cellStyle 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`.
+- [bug] Fix page-change event params bug.
 - [enh] Add limit and offset params only if pagination is activated.
 - [enh] Add `ajaxOptions` option to custom $.ajax options.
 - [enh] Add a toggle pagination toolbar button.
 - [enh] Add `iconSize` option.
 - [enh] Add `buttonsAlign` option and update `toolbarAlign` option.
 - [enh] Add `prepend`, `insertRow` and `toggleView` methods.
+- [enh] Add `editable-save.bs.table` event to editatble extension.
+- [enh] #431: load method support pagination.
 
 ### 1.5.0
 

CONTRIBUTORS.md

@@ -16,21 +16,35 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td>Guangzhou, China</td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
-<td>514</td>
+<td>608</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/4496763?v=3" width="32" height="32"> <a href="mailto:dennishernandezvargas@gmail.com">Dennis Hernández</a></td>
 <td><a href="https://github.com/djhvscf">djhvscf</a></td>
 <td>Costa Rica</td>
 <td><a href="http://djhvscf.github.io/Blog/">http://djhvscf.github.io/Blog/</a></td>
-<td>11</td>
+<td>29</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/2921893?v=3" width="32" height="32"> <a href="mailto:ice50505050@hotmail.com">Kamonwat Sangudsub</a></td>
 <td><a href="https://github.com/ice5050">ice5050</a></td>
 <td>Chiang Mai, Thailand</td>
 <td><a href="http://www.kamonwat.ninja">http://www.kamonwat.ninja</a></td>
-<td>5</td>
+<td>9</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/553292?v=3" width="32" height="32"> D0d0</td>
+<td><a href="https://github.com/D0d0">D0d0</a></td>
+<td></td>
+<td></td>
+<td>7</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/2520829?v=3" width="32" height="32"> Timmy72</td>
+<td><a href="https://github.com/Timmy72">Timmy72</a></td>
+<td></td>
+<td></td>
+<td>7</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/2130852?v=3" width="32" height="32"> kula1922</td>
@@ -54,6 +68,13 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>3</td>
 <tr>
 <tr>
+<td><img src="https://avatars.githubusercontent.com/u/1455662?v=3" width="32" height="32"> arifemre</td>
+<td><a href="https://github.com/arifemre">arifemre</a></td>
+<td></td>
+<td></td>
+<td>3</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/5487021?v=3" width="32" height="32"> Julien Bisconti</td>
 <td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
 <td>Belgium</td>
@@ -61,17 +82,24 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>3</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1710772?v=3" width="32" height="32"> cokert</td>
-<td><a href="https://github.com/cokert">cokert</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/1874318?v=3" width="32" height="32"> <a href="mailto:tristanlee85@gmail.com">Tristan Lee</a></td>
+<td><a href="https://github.com/tristanlee85">tristanlee85</a></td>
+<td></td>
+<td></td>
+<td>3</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/8644915?v=3" width="32" height="32"> @mcspx</td>
+<td><a href="https://github.com/mcspx">mcspx</a></td>
 <td></td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/9211672?v=3" width="32" height="32"> Bert Hankes</td>
-<td><a href="https://github.com/BertHankes">BertHankes</a></td>
-<td>Utrecht</td>
-<td><a href="http://www.a2hankes.nl">http://www.a2hankes.nl</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/1476232?v=3" width="32" height="32"> <a href="mailto:mikepenz@gmail.com">Mike Penz</a></td>
+<td><a href="https://github.com/mikepenz">mikepenz</a></td>
+<td>Freistadt</td>
+<td><a href="http://mikepenz.com">http://mikepenz.com</a></td>
 <td>2</td>
 <tr>
 <tr>
@@ -82,41 +110,48 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/8644915?v=3" width="32" height="32"> @mcspx</td>
-<td><a href="https://github.com/mcspx">mcspx</a></td>
-<td></td>
+<td><img src="https://avatars.githubusercontent.com/u/59292?v=3" width="32" height="32"> nikolas</td>
+<td><a href="https://github.com/nikolas">nikolas</a></td>
+<td>New York, NY</td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/385731?v=3" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
-<td><a href="https://github.com/wodka">wodka</a></td>
-<td>Vienna</td>
+<td><img src="https://avatars.githubusercontent.com/u/5313150?v=3" width="32" height="32"> Dunaevsky Maxim</td>
+<td><a href="https://github.com/dunmaksim">dunmaksim</a></td>
+<td>Russia, Lipetsk</td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/8870312?v=3" width="32" height="32"> <a href="mailto:duc.pham@enclave.vn">Duc N. PHAM</a></td>
-<td><a href="https://github.com/ducnpham">ducnpham</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/1710772?v=3" width="32" height="32"> cokert</td>
+<td><a href="https://github.com/cokert">cokert</a></td>
 <td></td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5313150?v=3" width="32" height="32"> Dunaevsky Maxim</td>
-<td><a href="https://github.com/dunmaksim">dunmaksim</a></td>
-<td>Russia, Lipetsk</td>
+<td><img src="https://avatars.githubusercontent.com/u/2326627?v=3" width="32" height="32"> burnspirit</td>
+<td><a href="https://github.com/burnspirit">burnspirit</a></td>
+<td></td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/59292?v=3" width="32" height="32"> nikolas</td>
-<td><a href="https://github.com/nikolas">nikolas</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/2863538?v=3" width="32" height="32"> azamshul</td>
+<td><a href="https://github.com/azamshul">azamshul</a></td>
 <td></td>
 <td></td>
 <td>2</td>
 <tr>
 <tr>
+<td><img src="https://avatars.githubusercontent.com/u/9211672?v=3" width="32" height="32"> Bert Hankes</td>
+<td><a href="https://github.com/BertHankes">BertHankes</a></td>
+<td>Utrecht</td>
+<td><a href="http://www.a2hankes.nl">http://www.a2hankes.nl</a></td>
+<td>2</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/5970450?v=3" width="32" height="32"> <a href="mailto:davide.renzi@gmail.com">Davide Renzi</a></td>
 <td><a href="https://github.com/didaxRedux">didaxRedux</a></td>
 <td>Rome, IT</td>
@@ -124,10 +159,45 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>2</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/171167?v=3" width="32" height="32"> Michał Zagdan</td>
-<td><a href="https://github.com/zergu">zergu</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/8870312?v=3" width="32" height="32"> <a href="mailto:duc.pham@enclave.vn">Duc N. PHAM</a></td>
+<td><a href="https://github.com/ducnpham">ducnpham</a></td>
+<td></td>
+<td></td>
+<td>2</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/385731?v=3" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
+<td><a href="https://github.com/wodka">wodka</a></td>
+<td>Vienna</td>
+<td></td>
+<td>2</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/9944172?v=3" width="32" height="32"> <a href="mailto:tidalf@tidalf.fr">Tidalf</a></td>
+<td><a href="https://github.com/TidalfFR">TidalfFR</a></td>
+<td>France</td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/1202596?v=3" width="32" height="32"> <a href="mailto:github@sopamo.de">Paul Mohr</a></td>
+<td><a href="https://github.com/Sopamo">Sopamo</a></td>
+<td>Germany</td>
+<td><a href="www.sopamo.de">www.sopamo.de</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/1369261?v=3" width="32" height="32"> Tomislav Simić</td>
+<td><a href="https://github.com/petougao">petougao</a></td>
+<td>Serbia, Europe</td>
+<td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/9339703?v=3" width="32" height="32"> JSON-OBJECT</td>
+<td><a href="https://github.com/JSON-OBJECT">JSON-OBJECT</a></td>
+<td></td>
 <td></td>
-<td><a href="http://code42.pl/">http://code42.pl/</a></td>
 <td>1</td>
 <tr>
 <tr>
@@ -138,6 +208,55 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
+<td><img src="https://avatars.githubusercontent.com/u/1701102?v=3" width="32" height="32"> egcerqueira</td>
+<td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/2017998?v=3" width="32" height="32"> <a href="mailto:jmello@hotmail.com.br">João Mello</a></td>
+<td><a href="https://github.com/multiarts">multiarts</a></td>
+<td>Salvador</td>
+<td><a href="joao.winserv.net.br">joao.winserv.net.br</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/2442098?v=3" width="32" height="32"> ltcszk</td>
+<td><a href="https://github.com/ltcszk">ltcszk</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/5148536?v=3" width="32" height="32"> Emin Şen</td>
+<td><a href="https://github.com/emnsen">emnsen</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/4281333?v=3" width="32" height="32"> jmarceli</td>
+<td><a href="https://github.com/jmarceli">jmarceli</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/7952803?v=3" width="32" height="32"> <a href="mailto:git@adtime.at">DominikAngerer</a></td>
+<td><a href="https://github.com/DominikAngerer">DominikAngerer</a></td>
+<td>Austria</td>
+<td><a href="http://www.adtime.at">http://www.adtime.at</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/79682?v=3" width="32" height="32"> l0pez</td>
+<td><a href="https://github.com/l0pez">l0pez</a></td>
+<td>Poland, Poznań</td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/9149445?v=3" width="32" height="32"> gianndall</td>
 <td><a href="https://github.com/gianndall">gianndall</a></td>
 <td></td>
@@ -145,8 +264,22 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/3030334?v=3" width="32" height="32"> himyouten</td>
-<td><a href="https://github.com/himyouten">himyouten</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/1460006?v=3" width="32" height="32"> Paul Cothenet</td>
+<td><a href="https://github.com/pcothenet">pcothenet</a></td>
+<td>Mountain View, CA</td>
+<td><a href="http://attackwithnumbers.com">http://attackwithnumbers.com</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/1542297?v=3" width="32" height="32"> <a href="mailto:mengyou658@163.com">mengyou</a></td>
+<td><a href="https://github.com/mengyou658">mengyou658</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/5520402?v=3" width="32" height="32"> rml1997</td>
+<td><a href="https://github.com/rml1997">rml1997</a></td>
 <td></td>
 <td></td>
 <td>1</td>
@@ -159,6 +292,13 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
+<td><img src="https://avatars.githubusercontent.com/u/10198214?v=3" width="32" height="32"> f0u</td>
+<td><a href="https://github.com/f0u">f0u</a></td>
+<td></td>
+<td></td>
+<td>1</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/61626?v=3" width="32" height="32"> <a href="mailto:srcnckr@gmail.com">Sercan Çakır</a></td>
 <td><a href="https://github.com/mayoz">mayoz</a></td>
 <td>Turkey</td>
@@ -166,15 +306,29 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1542297?v=3" width="32" height="32"> <a href="mailto:mengyou658@163.com">mengyou</a></td>
-<td><a href="https://github.com/mengyou658">mengyou658</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/171167?v=3" width="32" height="32"> Michał Zagdan</td>
+<td><a href="https://github.com/zergu">zergu</a></td>
+<td></td>
+<td><a href="http://code42.pl/">http://code42.pl/</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/128070?v=3" width="32" height="32"> <a href="mailto:smgladkovskiy@gmail.com">Sergey Gladkovskiy</a></td>
+<td><a href="https://github.com/smgladkovskiy">smgladkovskiy</a></td>
+<td>Russia/Moscow</td>
+<td><a href="http://uniglad.ru">http://uniglad.ru</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/3030334?v=3" width="32" height="32"> Him You Ten</td>
+<td><a href="https://github.com/himyouten">himyouten</a></td>
 <td></td>
 <td></td>
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5148536?v=3" width="32" height="32"> Emin Şen</td>
-<td><a href="https://github.com/emnsen">emnsen</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/971893?v=3" width="32" height="32"> odannyboy000</td>
+<td><a href="https://github.com/odannyboy000">odannyboy000</a></td>
 <td></td>
 <td></td>
 <td>1</td>
@@ -187,34 +341,34 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/9339703?v=3" width="32" height="32"> JSON-OBJECT</td>
-<td><a href="https://github.com/JSON-OBJECT">JSON-OBJECT</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/1829789?v=3" width="32" height="32"> yonjah</td>
+<td><a href="https://github.com/yonjah">yonjah</a></td>
 <td></td>
 <td></td>
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/188236?v=3" width="32" height="32"> gnhaku</td>
-<td><a href="https://github.com/gnhaku">gnhaku</a></td>
-<td>Moscow, Russia</td>
-<td><a href="http://gnhaku.me">http://gnhaku.me</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/8653173?v=3" width="32" height="32"> Cravid</td>
+<td><a href="https://github.com/Cravid">Cravid</a></td>
+<td></td>
+<td></td>
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1369261?v=3" width="32" height="32"> Tomislav Simić</td>
-<td><a href="https://github.com/petougao">petougao</a></td>
-<td>Serbia, Europe</td>
-<td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/4995734?v=3" width="32" height="32"> <a href="mailto:info@nagygergely.eu">Gergely Nagy</a></td>
+<td><a href="https://github.com/chpdesign">chpdesign</a></td>
+<td>Hungary, Miskolc</td>
+<td><a href="http://nagygergely.eu">http://nagygergely.eu</a></td>
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1701102?v=3" width="32" height="32"> egcerqueira</td>
-<td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
-<td></td>
-<td></td>
+<td><img src="https://avatars.githubusercontent.com/u/188236?v=3" width="32" height="32"> gnhaku</td>
+<td><a href="https://github.com/gnhaku">gnhaku</a></td>
+<td>Moscow, Russia</td>
+<td><a href="http://gnhaku.me">http://gnhaku.me</a></td>
 <td>1</td>
 <tr>
 
 </table>
 
-Update date: 2014-11-21, created with https://github.com/wenzhixin/github-contributors
+Update date: 2015-02-02, created with https://github.com/wenzhixin/github-contributors

_config.yml

@@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es", "fr"]
 languages_string: ["English", "简体中文", "Español", "French"]
 
 # Custom vars
-current_version: 1.5.0
+current_version: 1.6.0
 repo: https://github.com/wenzhixin/bootstrap-table
 website: http://wenzhixin.net.cn
 repos: http://repos.wenzhixin.net.cn

bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-table",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "title": "Bootstrap Table",
     "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
     "author": {

bower.json

@@ -1,49 +1,61 @@
 {
-  "name": "bootstrap-table",
-  "version": "1.5.0",
-  "homepage": "https://github.com/wenzhixin/bootstrap-table",
-  "authors": [
-    "zhixin <wenzhixin2010@gmail.com>"
-  ],
-  "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
-  "main": [
-      "src/bootstrap-table.css",
-      "src/bootstrap-table.js",
-      "src/locale/bootstrap-table-cs-CZ.js",
-      "src/locale/bootstrap-table-da-DK.js",
-      "src/locale/bootstrap-table-el-GR.js",
-      "src/locale/bootstrap-table-en-US.js",
-      "src/locale/bootstrap-table-es-AR.js",
-      "src/locale/bootstrap-table-es-CR.js",
-      "src/locale/bootstrap-table-es-NI.js",
-      "src/locale/bootstrap-table-fr-BE.js",
-      "src/locale/bootstrap-table-fr-FR.js",
-      "src/locale/bootstrap-table-it-IT.js",
-      "src/locale/bootstrap-table-ko-KR.js",
-      "src/locale/bootstrap-table-nl-NL.js",
-      "src/locale/bootstrap-table-pl-PL.js",
-      "src/locale/bootstrap-table-pt-BR.js",
-      "src/locale/bootstrap-table-ru-RU.js",
-      "src/locale/bootstrap-table-th-TH.js",
-      "src/locale/bootstrap-table-tr-TR.js",
-      "src/locale/bootstrap-table-ur-PK.js",
-      "src/locale/bootstrap-table-vi-VN.js",
-      "src/locale/bootstrap-table-zh-CN.js",
-      "src/locale/bootstrap-table-zh-TW.js"
-  ],
-  "keywords": [
-    "bootstrap",
-    "table",
-    "bootstrap table"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "docs",
-    "assets"
-  ]
+    "name": "bootstrap-table",
+    "version": "1.6.0",
+    "homepage": "https://github.com/wenzhixin/bootstrap-table",
+    "authors": [
+        "zhixin <wenzhixin2010@gmail.com>"
+    ],
+    "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
+    "main": [
+        "src/bootstrap-table.js",
+        "src/bootstrap-table.css",
+        "src/extensions/filter/bootstrap-table-filter.js",
+        "src/extensions/editable/bootstrap-table-editable.js",
+        "src/extensions/export/bootstrap-table-export.js",
+        "src/extensions/flatJSON/bootstrap-table-flatJSON.js",
+        "src/locale/bootstrap-table-zh-CN.js",
+        "src/locale/bootstrap-table-da-DK.js",
+        "src/locale/bootstrap-table-el-GR.js",
+        "src/locale/bootstrap-table-hu-HU.js",
+        "src/locale/bootstrap-table-en-US.js",
+        "src/locale/bootstrap-table-pt-PT.js",
+        "src/locale/bootstrap-table-zh-TW.js",
+        "src/locale/bootstrap-table-pl-PL.js",
+        "src/locale/bootstrap-table-ja-JP.js",
+        "src/locale/bootstrap-table-sv-SE.js",
+        "src/locale/bootstrap-table-ko-KR.js",
+        "src/locale/bootstrap-table-nl-NL.js",
+        "src/locale/bootstrap-table-es-CR.js",
+        "src/locale/bootstrap-table-sk-SK.js",
+        "src/locale/bootstrap-table-ru-RU.js",
+        "src/locale/bootstrap-table-es-AR.js",
+        "src/locale/bootstrap-table-ur-PK.js",
+        "src/locale/bootstrap-table-it-IT.js",
+        "src/locale/bootstrap-table-pt-BR.js",
+        "src/locale/bootstrap-table-es-NI.js",
+        "src/locale/bootstrap-table-tr-TR.js",
+        "src/locale/bootstrap-table-uk-UA.js",
+        "src/locale/bootstrap-table-ms-MY.js",
+        "src/locale/bootstrap-table-fr-FR.js",
+        "src/locale/bootstrap-table-vi-VN.js",
+        "src/locale/bootstrap-table-th-TH.js",
+        "src/locale/bootstrap-table-cs-CZ.js",
+        "src/locale/bootstrap-table-de-DE.js",
+        "src/locale/bootstrap-table-fr-BE.js"
+    ],
+    "keywords": [
+        "bootstrap",
+        "table",
+        "bootstrap table"
+    ],
+    "license": "MIT",
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests",
+        "docs",
+        "assets"
+    ]
 }

dist/bootstrap-table.min.css

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 

dist/locale/bootstrap-table-es-AR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-AR"])}(jQuery);

dist/locale/bootstrap-table-fr-BE.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);

dist/locale/bootstrap-table-ja-JP.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.5.0 - 2015-01-19
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2015 zhixin wen
 * Licensed MIT License

dist/locale/bootstrap-table-ms-MY.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.5.0 - 2015-01-19
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2015 zhixin wen
 * Licensed MIT License

dist/locale/bootstrap-table-nl-NL.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld..."},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);

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

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 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);
+!function(a){"use strict";a.fn.bootstrapTable.locales["pt-BR"]={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);

dist/locale/bootstrap-table-vi-VN.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["vi-VN"])}(jQuery);

docs/_includes/latest-release.md

@@ -1,17 +1,24 @@
 ### Latest release
 
-#### v{{ site.current_version }} (2014-12-12)
+#### v{{ site.current_version }} (2015-02-03)
 
-- [bug] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
-- [bug] Fix IE browser display header bug when use `mergeCells` method.
-- [bug] Fix #269: array as row bug.
-- [bug] Fix #314: `rowStyle` bug.
-- [enh] Add de-DE, hu-HU, sk-SK locales.
-- [enh] Fix #261: add namespace to `.table` style.
-- [bug] Fix #160, #323: operate events don't work in card view.
-- [enh] Add `filterBy`, `scrollTo`, `prevPage` and `nextPage`, `check` and `uncheck` methods.
-- [enh] Add `onPreBody` and `onPostBody` events.
-- [enh] Add `searchable` column option.
-- [enh] Fix #59: support load multiple locale files.
-- [enh] Modify the scope of the column events.
-- [enh] Improve editable extension.
+- [bug] Fix queryParams bug when use `sidePagination='server'`.
+- [enh] Add uk-UA, sv-SE, pt-PT, ms-MY, ja-JP locales.
+- [enh] Add `searchTimeOut` option.
+- [bug] Fix #220: state column hideColumn bug.
+- [bug] Fix #221: cellStyle 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`.
+- [bug] Fix page-change event params bug.
+- [enh] Add limit and offset params only if pagination is activated.
+- [enh] Add `ajaxOptions` option to custom $.ajax options.
+- [enh] Add a toggle pagination toolbar button.
+- [enh] Add `iconSize` option.
+- [enh] Add `buttonsAlign` option and update `toolbarAlign` option.
+- [enh] Add `prepend`, `insertRow` and `toggleView` methods.
+- [enh] Add `editable-save.bs.table` event to editatble extension.
+- [enh] #431: load method support pagination.

docs/dist/bootstrap-table.min.css

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 

docs/dist/locale/bootstrap-table-es-AR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-AR"])}(jQuery);

docs/dist/locale/bootstrap-table-fr-BE.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);

docs/dist/locale/bootstrap-table-ja-JP.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.5.0 - 2015-01-19
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2015 zhixin wen
 * Licensed MIT License

docs/dist/locale/bootstrap-table-ms-MY.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.5.0 - 2015-01-19
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2015 zhixin wen
 * Licensed MIT License

docs/dist/locale/bootstrap-table-nl-NL.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld..."},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);

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

@@ -0,0 +1,7 @@
+/*
+* bootstrap-table - v1.6.0 - 2015-02-03
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2015 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";a.fn.bootstrapTable.locales["pt-BR"]={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/dist/locale/bootstrap-table-vi-VN.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.5.0 - 2014-12-12
+* bootstrap-table - v1.6.0 - 2015-02-03
 * https://github.com/wenzhixin/bootstrap-table
-* Copyright (c) 2014 zhixin wen
+* Copyright (c) 2015 zhixin wen
 * Licensed MIT License
 */
 !function(a){"use strict";a.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["vi-VN"])}(jQuery);

src/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.5.0
+ * version: 1.6.0
  * https://github.com/wenzhixin/bootstrap-table/
  */
 
@@ -813,7 +813,7 @@
             pageList = this.options.pageList;
 
         if (typeof this.options.pageList === 'string') {
-            var list = this.options.pageList.slice(1, -1).replace(/ /g, '').split(',');
+            var list = this.options.pageList.replace('[', '').replace(']', '').replace(/ /g, '').split(',');
 
             pageList = [];
             $.each(list, function (i, value) {
@@ -918,7 +918,7 @@
             this.initBody();
         }
 
-        this.trigger('page-change', this.options.pageSize, this.options.pageNumber);
+        this.trigger('page-change', this.options.pageNumber, this.options.pageSize);
     };
 
     BootstrapTable.prototype.onPageListChange = function (event) {
@@ -1041,11 +1041,11 @@
                     class_ = sprintf(' class="%s"', cellStyle.classes);
                 }
                 if (cellStyle.css) {
-                    csses = [];
+                    var csses_ = [];
                     for (var key in cellStyle.css) {
-                        csses.push(key + ': ' + cellStyle.css[key]);
+                        csses_.push(key + ': ' + cellStyle.css[key]);
                     }
-                    style = sprintf('style="%s"', csses.concat(that.header.styles[j]).join('; '));
+                    style = sprintf('style="%s"', csses_.concat(that.header.styles[j]).join('; '));
                 }
 
                 if (column.checkbox || column.radio) {
@@ -1232,14 +1232,8 @@
             success: function (res) {
                 res = calculateObjectValue(that.options, that.options.responseHandler, [res], res);
 
-                var data = res;
-
-                if (that.options.sidePagination === 'server') {
-                    that.options.totalRows = res.total;
-                    data = res.rows;
-                }
-                that.load(data);
-                that.trigger('load-success', data);
+                that.load(res);
+                that.trigger('load-success', res);
             },
             error: function (res) {
                 that.trigger('load-error', res.status);
@@ -1408,6 +1402,12 @@
     };
 
     BootstrapTable.prototype.load = function (data) {
+        // #431: support pagination
+        if (this.options.sidePagination === 'server') {
+            this.options.totalRows = data.total;
+            data = data.rows;
+        }
+
         this.initData(data);
         this.initSearch();
         this.initPagination();

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

@@ -9,11 +9,13 @@
 
     $.extend($.fn.bootstrapTable.defaults, {
         editable: true,
-        onEditableInit: function () {return false;}
+        onEditableInit: function () {return false;},
+        onEditableSave: function (field, row, oldValue, $el) {return false;}
     });
 
     $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
-        'editable-init.bs.table': 'onEditableInit'
+        'editable-init.bs.table': 'onEditableInit',
+        'editable-save.bs.table': 'onEditableSave'
     });
 
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
@@ -62,9 +64,12 @@
             that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
                 .off('save').on('save', function (e, params) {
                     var data = that.getData(),
-                        row = data[$(this).parents('tr[data-index]').data('index')];
+                        index = $(this).parents('tr[data-index]').data('index'),
+                        row = data[index],
+                        oldValue = row[column.field];
 
                     row[column.field] = params.submitValue;
+                    that.trigger('editable-save', column.field, row, oldValue, $(this));
                 });
         });
         this.trigger('editable-init');