Browse Source

Merge pull request #1921 from daciot/develop

Fixed  key-events on toolbar elements
wenzhixin 10 years ago
parent
commit
fe1fa34759
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/extensions/key-events/bootstrap-table-key-events.js

+ 1 - 1
src/extensions/key-events/bootstrap-table-key-events.js

@@ -32,7 +32,7 @@
                     $toggle = that.$toolbar.find('button[name="toggle"]'),
                     $toggle = that.$toolbar.find('button[name="toggle"]'),
                     $paginationSwitch = that.$toolbar.find('button[name="paginationSwitch"]');
                     $paginationSwitch = that.$toolbar.find('button[name="paginationSwitch"]');
 
 
-                if (document.activeElement === $search.get(0)) {
+                if (document.activeElement === $search.get(0) || !$.contains(document.activeElement ,that.$toolbar.get(0))) {
                     return true;
                     return true;
                 }
                 }