Merge pull request ant-design#1858 from ant-design/fix-filter-without…

…-pagination [Table] fix: throws error when filtering data with `pagination` set to `false…
smileluo · May 26, 2016 · 4938c25 · 4938c25
2 parents b3ab13e + dbdd5c5
commit 4938c25
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/components/table/index.jsx b/components/table/index.jsx
@@ -262,9 +262,11 @@ export default class Table extends React.Component {
       }
     });
 
-    // Reset current prop
-    pagination.current = 1;
-    pagination.onChange(pagination.current);
+    if (props.pagination) {
+      // Reset current prop
+      pagination.current = 1;
+      pagination.onChange(pagination.current);
+    }
 
     const newState = {
       selectionDirty: false,