zhixin 11 年 前
コミット
dcb9b921b4
3 ファイル変更94 行追加50 行削除
  1. 55 20
      CONTRIBUTORS.md
  2. 28 19
      docs/docs.js
  3. 11 11
      docs/index.html

+ 55 - 20
CONTRIBUTORS.md

@@ -16,13 +16,13 @@ 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>349</td>
+<td>385</td>
 <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></td>
+<td><img src="https://avatars.githubusercontent.com/u/5487021?v=2" width="32" height="32"> Julien Bisconti</td>
+<td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
+<td>Belgium</td>
+<td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
 <td>3</td>
 <tr>
 <tr>
@@ -33,13 +33,20 @@ 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/5487021?v=2" width="32" height="32"> Julien Bisconti</td>
-<td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
-<td>Belgium</td>
-<td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
+<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></td>
 <td>3</td>
 <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></td>
+<td>2</td>
+<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><a href="https://github.com/wodka">wodka</a></td>
 <td>Vienna</td>
@@ -47,6 +54,13 @@ 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/775601?v=2" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
+<td><a href="https://github.com/Muzical84">Muzical84</a></td>
+<td>Midwest</td>
+<td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
+<td>2</td>
+<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></td>
@@ -54,13 +68,34 @@ 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/775601?v=2" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
-<td><a href="https://github.com/Muzical84">Muzical84</a></td>
-<td>Midwest</td>
-<td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
+<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>2</td>
 <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>1</td>
+<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></td>
+<td></td>
+<td>1</td>
+<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>1</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/3691490?v=2" width="32" height="32"> Peter Dave Hello</td>
 <td><a href="https://github.com/PeterDaveHello">PeterDaveHello</a></td>
 <td>Taiwan ROC</td>
@@ -68,17 +103,17 @@ 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=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/5148536?v=2" 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/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/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></td>
 <td>1</td>
 <tr>
 <tr>
@@ -91,4 +126,4 @@ bootstrap-table is due to the excellent work of the following contributors:
 
 </table>
 
-Update date: 2014-09-12, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-10-08, created with https://github.com/wenzhixin/github-contributors

+ 28 - 19
docs/docs.js

@@ -526,11 +526,20 @@ $(function () {
                     example: 'show-columns-table'
                 },
                 {
+                    name: 'clickToSelect',
+                    attribute: 'data-click-to-select',
+                    type: 'Boolean',
+                    description: 'True to select checkbox or radiobox when the column is clicked.',
+                    description_zh: '设置为True时点击行即可选中单选/复选框。',
+                    'default': 'true',
+                    example: 'via-javascript-table'
+                },
+                {
                     name: 'formatter',
                     attribute: 'data-formatter',
                     type: 'Function',
-                    description: 'The cell formatter function, take three parameters: <br />value: the field value. <br />row: the row record data.<br />index: the row index.',
-                    description_zh: '列的格式化方法,包含3个参数:<br />value: 该单元格的数据。<br />row: 该行的数据。<br />index: 该行的index。',
+                    description: 'The cell formatter function, take three parameters: <br>value: the field value. <br>row: the row record data.<br>index: the row index.',
+                    description_zh: '列的格式化方法,包含3个参数:<br>value: 该单元格的数据。<br>row: 该行的数据。<br>index: 该行的index。',
                     'default': 'undefined',
                     example: 'format-table'
                 },
@@ -538,8 +547,8 @@ $(function () {
                     name: 'events',
                     attribute: 'data-events',
                     type: 'Object',
-                    description: 'The cell events listener when you use formatter function, take three parameters: <br />event: the jQuery event. <br />value: the field value. <br />row: the row record data.<br />index: the row index.',
-                    description_zh: '当你使用格式化方式时,可以对该列的元素进行事件监听。包含三个参数:<br />event: jQuery 事件。<br />value: 该单元格的数据。<br />row: 该行的数据。<br />index: 该行的index。',
+                    description: 'The cell events listener when you use formatter function, take three parameters: <br>event: the jQuery event. <br>value: the field value. <br>row: the row record data.<br>index: the row index.',
+                    description_zh: '当你使用格式化方式时,可以对该列的元素进行事件监听。包含三个参数:<br>event: jQuery 事件。<br>value: 该单元格的数据。<br>row: 该行的数据。<br>index: 该行的index。',
                     'default': 'undefined',
                     example: 'column-events-table'
                 },
@@ -547,19 +556,19 @@ $(function () {
                     name: 'sorter',
                     attribute: 'data-sorter',
                     type: 'Function',
-                    description: 'The custom field sort function that used to do local sorting, take two parameters: <br />a: the first field value.<br /> b: the second field value.',
-                    description_zh: '可对列进行自定义排序,包含两个参数:<br />a: 第一个值。<br /> b: 第二个值。',
+                    description: 'The custom field sort function that used to do local sorting, take two parameters: <br>a: the first field value.<br> b: the second field value.',
+                    description_zh: '可对列进行自定义排序,包含两个参数:<br>a: 第一个值。<br> b: 第二个值。',
                     'default': 'undefined',
                     example: 'custom-sort-table'
                 },
                 {
-                    name: 'clickToSelect',
-                    attribute: 'data-click-to-select',
-                    type: 'Boolean',
-                    description: 'True to select checkbox or radiobox when the column is clicked.',
-                    description_zh: '设置为True时点击行即可选中单选/复选框。',
-                    'default': 'true',
-                    example: 'via-javascript-table'
+                    name: 'cellStyle',
+                    attribute: 'data-cell-style',
+                    type: 'Function',
+                    description: 'The cell style formatter function, take three parameters: <br>value: the field value.<br>row: the row record data.<br>index: the row index.<br>Support classes or css.',
+                    description_zh: '列样式格式化方法,有三个参数:<br>row: 行记录的数据。<br>value: 该单元格的数据。<br>index: 行数据的 index。<br>支持 classes 或者 css.',
+                    'default': 'undefined',
+                    example: ''
                 }
             ]
         });
@@ -576,37 +585,37 @@ $(function () {
                     name: 'onAll',
                     event: 'all.bs.table',
                     parameter: 'name, args',
-                    description: 'Fires when all events trigger, the parameters contains: <br />name: the event name, <br>args: the event data.'
+                    description: 'Fires when all events trigger, the parameters contains: <br>name: the event name, <br>args: the event data.'
                 },
                 {
                     name: 'onClickRow',
                     event: 'click-row.bs.table',
                     parameter: 'row, $element',
-                    description: 'Fires when user click a row, the parameters contains: <br />row: the record corresponding to the clicked row, <br>$element: the tr element.'
+                    description: 'Fires when user click a row, the parameters contains: <br>row: the record corresponding to the clicked row, <br>$element: the tr element.'
                 },
                 {
                     name: 'onDblClickRow',
                     event: 'dbl-click-row.bs.table',
                     parameter: 'row, $element',
-                    description: 'Fires when user click a row, the parameters contains: <br />row: the record corresponding to the clicked row, <br>$element: the tr element.'
+                    description: 'Fires when user click a row, the parameters contains: <br>row: the record corresponding to the clicked row, <br>$element: the tr element.'
                 },
                 {
                     name: 'onSort',
                     event: 'sort.bs.table',
                     parameter: 'name, order',
-                    description: 'Fires when user sort a column, the parameters contains: <br />name: the sort column field name<br />order: the sort column order.'
+                    description: 'Fires when user sort a column, the parameters contains: <br>name: the sort column field name<br>order: the sort column order.'
                 },
                 {
                     name: 'onCheck',
                     event: 'check.bs.table',
                     parameter: 'row',
-                    description: 'Fires when user check a row, the parameters contains: <br />row: the record corresponding to the clicked row.'
+                    description: 'Fires when user check a row, the parameters contains: <br>row: the record corresponding to the clicked row.'
                 },
                 {
                     name: 'onUncheck',
                     event: 'uncheck.bs.table',
                     parameter: 'row',
-                    description: 'Fires when user uncheck a row, the parameters contains: <br />row: the record corresponding to the clicked row.'
+                    description: 'Fires when user uncheck a row, the parameters contains: <br>row: the record corresponding to the clicked row.'
                 },
                 {
                     name: 'onCheckAll',

+ 11 - 11
docs/index.html

@@ -82,18 +82,18 @@
         <div class="row">
             <div class="col-md-6">
                 <h2 data-zh="最新版本">Latest release</h2>
-                <h4>1.2.4 (2014-09-12)</h4>
+                <h4>1.2.4 (2014-10-08)</h4>
                 <ul class="task-list">
-                    <li>[bug] Fix the selected row class reset after toggle column bug.</li>
-                    <li>[bug] Fix #86: invisible column are still searchable.</li>
-                    <li>[bug] Fix search result error when toggle column display.</li>
-                    <li>[enh] Add <code>clickToSelect</code> to columns.</li>
-                    <li>[bug] Fix click-row event bug.</li>
-                    <li>[enh] When field is undefined, use index instead.</li>
-                    <li>[enh] Add <code>cache</code> option for AJAX calls.</li>
-                    <li>[enh] Improve zh-TW translation.</li>
-                    <li>[enh] #82: Add <code>getData</code> method.</li>
-                    <li>[enh] #82: Add <code>remove</code> method.</li>
+                    <li>[enh] Fix #23: Add css and classes parameters to column cell.</li>
+                    <li>[enh] Fix #64: Add support for change remote url.</li>
+                    <li>[enh] Fix #112: update the <code>refresh</code> method.</li>
+                    <li>[bug] Fix #113: Using radio type and cardView error.</li>
+                    <li>[enh] Fix #117: Add <code>updateRow</code> method.</li>
+                    <li>[enh] Fix #96, #103: apply <code>class</code> option to td elements.</li>
+                    <li>[enh] Fix #97: add <code>sortable</code> class to header cells instead of <code>cursor: pointer</code>.</li>
+                    <li>[enh] Fix #124: change <code>queryParams</code> and <code>queryParamsType</code> default option.</li>
+                    <li>[enh] Remove the <code>eval</code> method.</li>
+                    <li>[enh] Add <code>bootstrap-table-it-IT.js</code> locale.</li>
                 </ul>
             </div>
             <div class="col-md-6">