Merge pull request #390 from djhvscf/master

Fix #389 Bootstrap-table-flatJSON is not working

src/bootstrap-table.js

@@ -937,10 +937,8 @@
             this.$body = $('<tbody></tbody>').appendTo(this.$el);
         }
 
-        if (this.options.sidePagination === 'server') {
-            data = this.data;
-        }
-
+		//Fix #389 Bootstrap-table-flatJSON is not working
+        
         if (!this.options.pagination || this.options.sidePagination === 'server') {
             this.pageFrom = 1;
             this.pageTo = data.length;