Merge pull request wenzhixin#555 from macias3/master

wenzhixin · wenzhixin · commit ebdbfb2983e1 · 2015-02-21T08:39:53.000+08:00
Update to methods to select rows by value and documentation
diff --git a/docs/_i18n/en/documentation/events.md b/docs/_i18n/en/documentation/events.md
@@ -77,14 +77,20 @@
     <tr>
         <td>onCheckAll</td>
         <td>check-all.bs.table</td>
-        <td>none</td>
-        <td>Fires when user check all rows.</td>
+        <td>rows</td>
+        <td>
+        Fires when user check all rows, the parameters contains: <br>
+        rows: array of records corresponding to newly checked rows.
+        </td>
     </tr>
     <tr>
         <td>onUncheckAll</td>
         <td>uncheck-all.bs.table</td>
-        <td>none</td>
-        <td>Fires when user uncheck all rows.</td>
+        <td>rows</td>
+        <td>
+        Fires when user uncheck all rows, the parameters contains: <br>
+        rows: array of records corresponding to previously checked rows.
+        </td>
     </tr>
     <tr>
         <td>onLoadSuccess</td>
diff --git a/docs/_i18n/en/documentation/methods.md b/docs/_i18n/en/documentation/methods.md
@@ -121,6 +121,28 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
         <td>index</td>
         <td>Uncheck a row, the row index start with 0.</td>
     </tr>
+    <tr>
+        <td>checkBy</td>
+        <td>params</td>
+        <td>
+        Check a row by array of values, the params contains:<br>
+        field: name of the field used to find records<br>
+        values: array of values for rows to check<br>
+        Example: <br>
+        $("#table").bootstrapTable("checkBy", {field:"field_name", values:["value1","value2","value3"]})
+        </td>
+    </tr>
+    <tr>
+        <td>uncheckBy</td>
+        <td>params</td>
+        <td>
+        Uncheck a row by array of values, the params contains:<br>
+        field: name of the field used to find records<br>
+        values: array of values for rows to uncheck<br>
+        Example: <br>
+        $("#table").bootstrapTable("uncheckBy", {field:"field_name", values:["value1","value2","value3"]})
+        </td>
+    </tr>
     <tr>
         <td>resetView</td>
         <td>params</td>
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -1554,10 +1554,16 @@
     };
     
     BootstrapTable.prototype.checkBy_ = function (checked, obj) {
+        if(!obj.hasOwnProperty('field') || !obj.hasOwnProperty('values')) {
+            return;
+        }
+        
         var that = this;
-        var is_array = $.isArray(obj.value);
         $.each(this.data, function (index, row) {
-            if(is_array ? $.inArray(row[obj.field], obj.value) != -1 : row[obj.field] == obj.value) {
+            if(!row.hasOwnProperty(obj.field)) {
+                return false;
+            }
+            if($.inArray(row[obj.field], obj.values) != -1) {
                 that.$selectItem.filter(sprintf('[data-index="%s"]', index)).prop('checked', checked);
                 row[that.header.stateField] = checked;
                 that.trigger(checked ? 'check' : 'uncheck', row);  
