Commit 155cd133ae77dd2d3039a5adee0a2276ba93a2ee
1 parent
f6fdbf6b
manually merged tapIssue_2(Merge Request #843 )
Showing
1 changed file
with
20 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/themes/default/scripts/bootstrap/3.3.5/bootstrap.js
... | ... | @@ -629,13 +629,27 @@ if (typeof jQuery === 'undefined') { |
629 | 629 | |
630 | 630 | // APPLY TO STANDARD DROPDOWN ELEMENTS |
631 | 631 | // =================================== |
632 | - | |
632 | + var $ua = navigator.userAgent; | |
633 | + if (($ua.match(/(iPod|iPhone|iPad)/i))) { | |
633 | 634 | $(document) |
634 | - .on('click.bs.dropdown.data-api', clearMenus) | |
635 | - .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) | |
636 | - .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) | |
637 | - .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) | |
638 | - .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) | |
635 | + .on('click.bs.dropdown.data-api', clearMenus) | |
636 | + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) | |
637 | + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) | |
638 | + .on('touchstart.bs.dropdown.data-api', clearMenus) | |
639 | + .on('touchstart.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) | |
640 | + .on('touchstart.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) | |
641 | + .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) | |
642 | + .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) | |
643 | +} | |
644 | +else | |
645 | +{ | |
646 | + $(document) | |
647 | + .on('click.bs.dropdown.data-api', clearMenus) | |
648 | + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) | |
649 | + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) | |
650 | + .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) | |
651 | + .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) | |
652 | +} | |
639 | 653 | |
640 | 654 | }(jQuery); |
641 | 655 | ... | ... |