Browse Source

Merge pull request #41 from wenzhixin/master

Update my repo
Dennis Hernández 10 years ago
parent
commit
a423c0891b
3 changed files with 8 additions and 7 deletions
  1. 2 1
      README.md
  2. 4 4
      docs/_i18n/en/documentation/methods.md
  3. 2 2
      src/bootstrap-table.js

+ 2 - 1
README.md

@@ -7,7 +7,7 @@
 
 An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
 
-To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
+To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Example issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aexample+is%3Aclosed), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
 
 
 **List of donators**
@@ -20,6 +20,7 @@ To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More
 * Paul Abbott - $20
 * Philip Tepfer - $10
 * Marcus Eddy - $5
+* Keith Rockhold - $50
 
 ## LICENSE
 

+ 4 - 4
docs/_i18n/en/documentation/methods.md

@@ -85,15 +85,15 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
         <td>showRow</td>
         <td>params</td>
         <td>Show the specified row. the param contains following properties:
-        index: the row index or the idField.
-        isIdField: Boolean to indicates if index is the idField od the row or not.</td>
+        index: the row index or the uniqueId.
+        isIdField: Boolean to indicates if index is the uniqueId or the row or not.</td>
     </tr>
     <tr>
         <td>hideRow</td>
         <td>params</td>
         <td>Hide the specified row. the param contains following properties:
-        index: the row index or the idField.
-        isIdField: Boolean to indicates if index is the idField od the row or not.</td>
+        index: the row index or the uniqueId.
+        isIdField: Boolean to indicates if index is the uniqueId or the row or not.</td>
     </tr>
     <tr>
         <td>getRowsHidden</td>

+ 2 - 2
src/bootstrap-table.js

@@ -1201,7 +1201,7 @@
                 sprintf(' id="%s"', $.isArray(item) ? undefined : item._id),
                 sprintf(' class="%s"', style.classes || ($.isArray(item) ? undefined : item._class)),
                 sprintf(' data-index="%s"', i),
-                sprintf(' data-unique-id="%s"', item[this.options.uniqueId]),
+                sprintf(' data-uniqueid="%s"', item[this.options.uniqueId]),
                 sprintf('%s', data_),
                 '>'
             );
@@ -1663,7 +1663,7 @@
             return;
         }
 
-        $(this.$body[0]).children().filter(sprintf(isIdField ? '[data-unique-id="%s"]' : '[data-index="%s"]', index))
+        $(this.$body[0]).children().filter(sprintf(isIdField ? '[data-uniqueid="%s"]' : '[data-index="%s"]', index))
             [visible ? 'show' : 'hide']();
     };