ソースを参照

Update version to 1.4.0

zhixin 11 年 前
コミット
3d66232034
10 ファイル変更172 行追加147 行削除
  1. 21 0
      CHANGELOG.md
  2. 109 46
      CONTRIBUTORS.md
  3. 20 2
      Gruntfile.js
  4. 5 27
      README.md
  5. 3 3
      bootstrap-table.jquery.json
  6. 10 2
      bower.json
  7. 2 1
      package.json
  8. 1 1
      src/bootstrap-table.js
  9. 1 33
      src/extensions/export/README.md
  10. 0 32
      src/extensions/filter/README.md

+ 21 - 0
CHANGELOG.md

@@ -1,5 +1,26 @@
 ## ChangeLog
 ## ChangeLog
 
 
+### 1.4.0
+
+- [enh] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.
+- [enh] Fix #149: Hide empty data on Card view.
+- [enh] Fix #131: Add `onPageChange` event.
+- [enh] Add `onSearch` event.
+- [enh] Apply `width` column option to row style.
+- [enh] Add bootstrap-table-filter extension.
+- [enh] Add cs-CZ, es-CR, es-NI, pl-PL, ur-PK, ko-KR, th-TH locales.
+- [bug] Fix `minimumCountColumns` option init error.
+- [bug] Fix #161: `undefined` or `null` string sort bug.
+- [bug] Fix #171: IE disabled button can be clicked bug.
+- [bug] Fix #185: Reset the page to the first page when changing the url with `refresh` method.
+- [bug] Fix #202: updateRow method keep the scroll position.
+- [enh] Add `smartDisplay` option.
+- [enh] Add `searchAlign` and `toolbarAlign` options.
+- [enh] Fix #193: Add `dataType` option.
+- [enh] Add flatJSON and editable extensions.
+- [enh] Add `rowAttributes` option.
+- [enh] Update documentation.
+
 ### 1.3.0
 ### 1.3.0
 
 
 - [enh] Take `showHeader` option effect to the card view.
 - [enh] Take `showHeader` option effect to the card view.

+ 109 - 46
CONTRIBUTORS.md

@@ -12,140 +12,203 @@ bootstrap-table is due to the excellent work of the following contributors:
 </tr>
 </tr>
 
 
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/2117018?v=2" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/2117018?v=3" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td>Guangzhou, China</td>
 <td>Guangzhou, China</td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
-<td>439</td>
+<td>514</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/8710090?v=2" width="32" height="32"> Joseph Reiter</td>
-<td><a href="https://github.com/thx2001r">thx2001r</a></td>
-<td>United States</td>
+<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>
+<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>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/2130852?v=3" width="32" height="32"> kula1922</td>
+<td><a href="https://github.com/kula1922">kula1922</a></td>
+<td></td>
 <td></td>
 <td></td>
 <td>3</td>
 <td>3</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
+<td><img src="https://avatars.githubusercontent.com/u/6866443?v=3" width="32" height="32"> janborup</td>
 <td><a href="https://github.com/janborup">janborup</a></td>
 <td><a href="https://github.com/janborup">janborup</a></td>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
 <td>3</td>
 <td>3</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5487021?v=2" width="32" height="32"> Julien Bisconti</td>
+<td><img src="https://avatars.githubusercontent.com/u/8710090?v=3" width="32" height="32"> Joseph Reiter</td>
+<td><a href="https://github.com/thx2001r">thx2001r</a></td>
+<td>United States</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><a href="https://github.com/veggiemonk">veggiemonk</a></td>
 <td>Belgium</td>
 <td>Belgium</td>
 <td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
 <td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
 <td>3</td>
 <td>3</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5970450?v=2" 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>
-<td><a href="http://www.pantomedia.it">http://www.pantomedia.it</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>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/775601?v=2" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
+<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/775601?v=3" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
 <td><a href="https://github.com/Muzical84">Muzical84</a></td>
 <td><a href="https://github.com/Muzical84">Muzical84</a></td>
 <td>Midwest</td>
 <td>Midwest</td>
 <td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
 <td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
 <td>2</td>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/59292?v=2" width="32" height="32"> nikolas</td>
-<td><a href="https://github.com/nikolas">nikolas</a></td>
+<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></td>
 <td></td>
 <td>2</td>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/385731?v=2" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
+<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><a href="https://github.com/wodka">wodka</a></td>
 <td>Vienna</td>
 <td>Vienna</td>
 <td></td>
 <td></td>
 <td>2</td>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/9211672?v=2" 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/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>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/8870312?v=2" 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><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></td>
 <td>2</td>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1710772?v=2" width="32" height="32"> cokert</td>
-<td><a href="https://github.com/cokert">cokert</a></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></td>
 <td></td>
 <td></td>
 <td></td>
 <td>2</td>
 <td>2</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1369261?v=2" 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/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>
+<td><a href="http://www.pantomedia.it">http://www.pantomedia.it</a></td>
+<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></td>
+<td><a href="http://code42.pl/">http://code42.pl/</a></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/3691490?v=2" width="32" height="32"> Peter Dave Hello</td>
+<td><img src="https://avatars.githubusercontent.com/u/3691490?v=3" width="32" height="32"> Peter Dave Hello</td>
 <td><a href="https://github.com/PeterDaveHello">PeterDaveHello</a></td>
 <td><a href="https://github.com/PeterDaveHello">PeterDaveHello</a></td>
 <td>Taiwan ROC</td>
 <td>Taiwan ROC</td>
 <td><a href="https://www.peterdavehello.org/">https://www.peterdavehello.org/</a></td>
 <td><a href="https://www.peterdavehello.org/">https://www.peterdavehello.org/</a></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5148536?v=2" 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/9149445?v=3" width="32" height="32"> gianndall</td>
+<td><a href="https://github.com/gianndall">gianndall</a></td>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/5313150?v=2" 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/3030334?v=3" width="32" height="32"> himyouten</td>
+<td><a href="https://github.com/himyouten">himyouten</a></td>
+<td></td>
 <td></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/188236?v=2" 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/3645565?v=3" width="32" height="32"> <a href="mailto:github@coyle.dk">Jan Borup Coyle</a></td>
+<td><a href="https://github.com/JanCoyle">JanCoyle</a></td>
+<td>Odense, Denmark</td>
+<td><a href="http://www.coyle.dk">http://www.coyle.dk</a></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/3030334?v=2" width="32" height="32"> himyouten</td>
-<td><a href="https://github.com/himyouten">himyouten</a></td>
+<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>
+<td><a href="http://www.sercancakir.com">http://www.sercancakir.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></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/9149445?v=2" width="32" height="32"> gianndall</td>
-<td><a href="https://github.com/gianndall">gianndall</a></td>
+<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></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1542297?v=2" 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/5407898?v=3" width="32" height="32"> Malik Rizwan</td>
+<td><a href="https://github.com/rams0b">rams0b</a></td>
+<td></td>
+<td></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></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1701102?v=2" width="32" height="32"> egcerqueira</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>
+<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/1701102?v=3" width="32" height="32"> egcerqueira</td>
 <td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
 <td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
@@ -154,4 +217,4 @@ bootstrap-table is due to the excellent work of the following contributors:
 
 
 </table>
 </table>
 
 
-Update date: 2014-10-16, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-11-21, created with https://github.com/wenzhixin/github-contributors

+ 20 - 2
Gruntfile.js

@@ -13,7 +13,7 @@ module.exports = function(grunt) {
                 '* Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n' +
                 '* Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n' +
                 '*/\n',
                 '*/\n',
         // Task configuration.
         // Task configuration.
-        clean: ['dist'],
+        clean: ['dist', 'docs/dist'],
         uglify: {
         uglify: {
             options: {
             options: {
                 banner: '<%= banner %>'
                 banner: '<%= banner %>'
@@ -31,6 +31,15 @@ module.exports = function(grunt) {
                     dest: 'dist/locale',
                     dest: 'dist/locale',
                     ext: '.min.js' // replace .js to .min.js
                     ext: '.min.js' // replace .js to .min.js
                 }]
                 }]
+            },
+            extensions_target: {
+                files: [{
+                    expand: true,
+                    cwd: 'src/extensions',
+                    src: '**/*.js',
+                    dest: 'dist/extensions',
+                    ext: '.min.js' // replace .js to .min.js
+                }]
             }
             }
         },
         },
         cssmin: {
         cssmin: {
@@ -42,12 +51,21 @@ module.exports = function(grunt) {
                     'dist/<%= pkg.name %>.min.css': ['src/<%=pkg.name %>.css']
                     'dist/<%= pkg.name %>.min.css': ['src/<%=pkg.name %>.css']
                 }
                 }
             }
             }
+        },
+        copy: {
+            files: {
+                cwd: 'dist',            // set working folder / root to copy
+                src: '**/*',            // copy all files and subfolders
+                dest: 'docs/dist',      // destination folder
+                expand: true            // required when using cwd
+            }
         }
         }
     });
     });
 
 
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
+    grunt.loadNpmTasks('grunt-contrib-copy');
 
 
-    grunt.registerTask('default', ['clean', 'uglify', 'cssmin']);
+    grunt.registerTask('default', ['clean', 'uglify', 'cssmin', 'copy']);
 };
 };

+ 5 - 27
README.md

@@ -1,18 +1,14 @@
-# bootstrap table
+# [Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn)
 
 
 [![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.png)](https://travis-ci.org/wenzhixin/bootstrap-table)
 [![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.png)](https://travis-ci.org/wenzhixin/bootstrap-table)
 
 
-Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on. The table has been designed to reduce development time and to require no specific knowledge from developers. It is both featherweight and feature-rich.
+An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.
 
 
-* [Documentation](http://wenzhixin.net.cn/p/bootstrap-table/docs/documentation.html)
-* [Examples](http://wenzhixin.net.cn/p/bootstrap-table/docs/examples.html)
-* [JSFiddle Examples](docs/jsfiddle-examples.md)
-* [Extensions](http://wenzhixin.net.cn/p/bootstrap-table/docs/extensions.html)
-* [Resources](docs/resources.md)
+To get started, check out http://bootstrap-table.wenzhixin.net.cn!
 
 
 ## Latest release
 ## Latest release
 
 
-1.3.0 (2014-10-16)
+1.4.0 (2014-11-21)
 
 
 ## LICENSE
 ## LICENSE
 
 
@@ -20,25 +16,7 @@ Bootstrap table displays data in a tabular format and offers rich support to rad
 
 
 ## Bugs & Enhancements (next version)
 ## Bugs & Enhancements (next version)
 
 
-- [x] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.
-- [x] Fix #149: Hide empty data on Card view.
-- [x] Fix #131: Add `onPageChange` event.
-- [x] Add `onSearch` event.
 - [ ] Fix #144: `onCheck` and `onUncheck` method are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
 - [ ] Fix #144: `onCheck` and `onUncheck` method are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
-- [x] Apply `width` column option to row style.
-- [x] Add bootstrap-table-filter extension.
-- [x] Add cs-CZ, es-CR, es-NI, pl-PL, ur-PK, ko-KR, th-TH locales.
-- [x] Fix `minimumCountColumns` option init error.
-- [x] Fix #161: `undefined` or `null` string sort bug.
-- [x] Fix #171: IE disabled button can be clicked bug.
-- [x] Fix #185: Reset the page to the first page when changing the url with `refresh` method.
-- [x] Fix #202: updateRow method keep the scroll position.
-- [x] Add `smartDisplay` option.
-- [x] Add `searchAlign` and `toolbarAlign` options.
-- [x] Fix #193: Add `dataType` option.
-- [x] Add flatJSON and editable extensions.
-- [x] Add `rowAttributes` option.
-- [x] Update documentation.
 
 
 ## Features
 ## Features
 
 
@@ -79,7 +57,7 @@ Please provide jsFiddle when creating issues!
 
 
 It's really saves much time. Use this as template:
 It's really saves much time. Use this as template:
 
 
-[jsFiddle Bootstrap Table](http://jsfiddle.net/8svjf80g/1/)
+[jsFiddle Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
 
 
 Your feedback is very appreciated!
 Your feedback is very appreciated!
 
 

+ 3 - 3
bootstrap-table.jquery.json

@@ -1,8 +1,8 @@
 {
 {
     "name": "bootstrap-table",
     "name": "bootstrap-table",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "title": "Bootstrap Table",
     "title": "Bootstrap Table",
-    "description": "Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on.",
+    "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
     "author": {
     "author": {
         "name": "zhixin wen",
         "name": "zhixin wen",
         "email": "wenzhixin2010@gmail.com",
         "email": "wenzhixin2010@gmail.com",
@@ -19,7 +19,7 @@
     },
     },
     "keywords": ["bootstrap.table"],
     "keywords": ["bootstrap.table"],
     "homepage": "https://github.com/wenzhixin/bootstrap-table",
     "homepage": "https://github.com/wenzhixin/bootstrap-table",
-    "demo": "http://wenzhixin.net.cn/p/bootstrap-table",
+    "demo": "http://bootstrap-table.wenzhixin.net.cn",
     "bugs": {
     "bugs": {
         "url": "https://github.com/wenzhixin/bootstrap-table/issues"
         "url": "https://github.com/wenzhixin/bootstrap-table/issues"
     },
     },

+ 10 - 2
bower.json

@@ -1,24 +1,32 @@
 {
 {
   "name": "bootstrap-table",
   "name": "bootstrap-table",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "homepage": "https://github.com/wenzhixin/bootstrap-table",
   "homepage": "https://github.com/wenzhixin/bootstrap-table",
   "authors": [
   "authors": [
     "zhixin <wenzhixin2010@gmail.com>"
     "zhixin <wenzhixin2010@gmail.com>"
   ],
   ],
-  "description": "The table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on. The table has been designed to reduce development time and to require no specific knowledge from developers. It is both featherweight and feature-rich.",
+  "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
   "main": [
   "main": [
       "src/bootstrap-table.css",
       "src/bootstrap-table.css",
       "src/bootstrap-table.js",
       "src/bootstrap-table.js",
+      "src/locale/bootstrap-table-cs-CZ.js",
       "src/locale/bootstrap-table-da-DK.js",
       "src/locale/bootstrap-table-da-DK.js",
       "src/locale/bootstrap-table-el-GR.js",
       "src/locale/bootstrap-table-el-GR.js",
       "src/locale/bootstrap-table-en-US.js",
       "src/locale/bootstrap-table-en-US.js",
       "src/locale/bootstrap-table-es-AR.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-BE.js",
+      "src/locale/bootstrap-table-fr-FR.js",
       "src/locale/bootstrap-table-it-IT.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-nl-NL.js",
+      "src/locale/bootstrap-table-pl-PL.js",
       "src/locale/bootstrap-table-pt-BR.js",
       "src/locale/bootstrap-table-pt-BR.js",
       "src/locale/bootstrap-table-ru-RU.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-tr-TR.js",
+      "src/locale/bootstrap-table-ur-PK.js",
       "src/locale/bootstrap-table-vi-VN.js",
       "src/locale/bootstrap-table-vi-VN.js",
       "src/locale/bootstrap-table-zh-CN.js",
       "src/locale/bootstrap-table-zh-CN.js",
       "src/locale/bootstrap-table-zh-TW.js"
       "src/locale/bootstrap-table-zh-TW.js"

+ 2 - 1
package.json

@@ -4,6 +4,7 @@
     "grunt": "^0.4.5",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-cssmin": "^0.10.0",
     "grunt-contrib-cssmin": "^0.10.0",
-    "grunt-contrib-uglify": "^0.5.1"
+    "grunt-contrib-uglify": "^0.5.1",
+    "grunt-contrib-copy": "^0.7.0"
   }
   }
 }
 }

+ 1 - 1
src/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.3.0
+ * version: 1.4.0
  * https://github.com/wenzhixin/bootstrap-table/
  * https://github.com/wenzhixin/bootstrap-table/
  */
  */
 
 

+ 1 - 33
src/extensions/export/README.md

@@ -20,36 +20,4 @@ Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport
 
 
 * type: Array
 * type: Array
 * description: export types, support types: 'json', 'xml', 'png', 'csv', 'txt', 'sql', 'doc', 'excel', 'powerpoint', 'pdf'.
 * description: export types, support types: 'json', 'xml', 'png', 'csv', 'txt', 'sql', 'doc', 'excel', 'powerpoint', 'pdf'.
-* default: `['json', 'xml', 'csv', 'txt', 'sql', 'excel']`
-
-## [Examples](http://wenzhixin.net.cn/p/bootstrap-table/docs/extensions.html#export)
-
-```html
-<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
-<link rel="stylesheet" href="../src/bootstrap-table.css">
-
-<table data-toggle="table"
-       data-url="data1.json"
-       data-show-columns="true"
-       data-search="true"
-       data-show-refresh="true"
-       data-show-toggle="true"
-       data-pagination="true"
-       data-height="299"
-       data-show-export="true">
-    <thead>
-    <tr>
-        <th data-field="id">ID</th>
-        <th data-field="name">Item Name</th>
-        <th data-field="price">Item Price</th>
-    </tr>
-    </thead>
-</table>
-
-<script src="assets/jquery.min.js"></script>
-<script src="assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="assets/table-export/tableExport.js"></script>
-<script src="assets/table-export/jquery.base64.js"></script>
-<script src="../src/bootstrap-table.js"></script>
-<script src="../src/extensions/export/bootstrap-table-export.js"></script>
-```
+* default: `['json', 'xml', 'csv', 'txt', 'sql', 'excel']`

+ 0 - 32
src/extensions/filter/README.md

@@ -15,35 +15,3 @@ Use Plugin: [bootstrap table filters](https://github.com/lukaskral/bootstrap-tab
 * type: Boolean
 * type: Boolean
 * description: set true to show filter menu.
 * description: set true to show filter menu.
 * default: `false`
 * default: `false`
-
-## [Examples](http://wenzhixin.net.cn/p/bootstrap-table/docs/extensions.html#filter)
-
-```html
-<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
-<link rel="stylesheet" href="assets/table-filter/bootstrap-table-filter.css">
-<link rel="stylesheet" href="../src/bootstrap-table.css">
-
-<div id="filter-bar"></div>
-<table data-toggle="table"
-       data-height="299"
-       data-url="data1.json"
-       data-toolbar="#filter-bar"
-       data-show-toggle="true"
-       data-show-columns="true"
-       data-show-filter="true">
-    <thead>
-    <tr>
-        <th data-field="id" data-align="right" data-sortable="true">Item ID</th>
-        <th data-field="name" data-align="center" data-sortable="true">Item Name</th>
-        <th data-field="price" data-align="" data-sortable="true">Item Price</th>
-    </tr>
-    </thead>
-</table>
-
-<script src="assets/jquery.min.js"></script>
-<script src="assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="assets/table-filter/bootstrap-table-filter.js"></script>
-<script src="assets/table-filter/ext/bs-table.js"></script>
-<script src="../src/bootstrap-table.js"></script>
-<script src="../src/extensions/export/bootstrap-table-export.js"></script>
-```