Merge pull request #61 from wenzhixin/master

Update my repo

docs/_i18n/en/examples/events.md

@@ -6,7 +6,7 @@
 
 Table events. _by [@wenzhixin](https://github.com/wenzhixin)_
 
-<iframe width="100%" height="500" data-src="http://jsfiddle.net/wenyi/e3nk137y/36/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
+<iframe width="100%" height="500" data-src="http://jsfiddle.net/e3nk137y/2106/embedded/html,js,result" allowfullscreen="allowfullscreen" frameborder="0"></iframe>
 
 ## Column Events
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-table",
   "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features. (supports twitter bootstrap v2 and v3).",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "main": "Gruntfile.js",
   "directories": {
     "doc": "docs"

src/bootstrap-table.js

@@ -1452,7 +1452,7 @@
             var $this = $(this),
                 $tr = $this.parent().parent(),
                 index = $tr.data('index'),
-                row = that.options.data[index];
+                row = data[index]; // Fix #980 Detail view, when searching, returns wrong row
 
             // remove and update
             if ($tr.next().is('tr.detail-view')) {

src/extensions/mobile/bootstrap-table-mobile.js

@@ -10,7 +10,7 @@
 
     var resetView = function (that) {
         if (that.options.height || that.options.showFooter) {
-            setTimeout(that.resetView(), 1);
+            setTimeout(that.resetView, 1);
         }
     };