Merge pull request wenzhixin#1921 from daciot/develop

Fixed key-events on toolbar elements
MrLiun · Jan 28, 2016 · fe1fa34 · fe1fa34
2 parents 770fe4f + 7c37c0b
commit fe1fa34
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/extensions/key-events/bootstrap-table-key-events.js b/src/extensions/key-events/bootstrap-table-key-events.js
@@ -32,7 +32,7 @@
                     $toggle = that.$toolbar.find('button[name="toggle"]'),
                     $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;
                 }