diff options
| author | Jacob Thornton <[email protected]> | 2013-08-08 23:08:40 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-08 23:08:40 -0700 |
| commit | e46708f7cee19ebe4acf04c71ef71947e6c2e20f (patch) | |
| tree | 3d98f2451e509e4b3b43d5304e63d1878411d8a4 /js | |
| parent | dec00eeeafaa1272b8fc3754b8d134e8d358a6ed (diff) | |
| parent | f86f6ee9555819468467d48387becf80c831d34f (diff) | |
| download | bootstrap-e46708f7cee19ebe4acf04c71ef71947e6c2e20f.tar.xz bootstrap-e46708f7cee19ebe4acf04c71ef71947e6c2e20f.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/collapse.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 35 | ||||
| -rw-r--r-- | js/tooltip.js | 4 |
3 files changed, 38 insertions, 3 deletions
diff --git a/js/collapse.js b/js/collapse.js index ab575515d..b20022a2e 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -169,7 +169,7 @@ var $parent = parent && $(parent) if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') + if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 73799c75d..11b2cf838 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -126,4 +126,39 @@ $(function () { target3.click() }) + test("should allow dots in data-parent", function () { + $.support.transition = false + stop() + + var accordion = $('<div class="accordion"><div class="accordion-group"></div><div class="accordion-group"></div><div class="accordion-group"></div></div>') + .appendTo($('#qunit-fixture')) + + var target1 = $('<a data-toggle="collapse" href="#body1" data-parent=".accordion"></a>') + .appendTo(accordion.find('.accordion-group').eq(0)) + + var collapsible1 = $('<div id="body1" class="in"></div>') + .appendTo(accordion.find('.accordion-group').eq(0)) + + var target2 = $('<a class="collapsed" data-toggle="collapse" href="#body2" data-parent=".accordion"></a>') + .appendTo(accordion.find('.accordion-group').eq(1)) + + var collapsible2 = $('<div id="body2"></div>') + .appendTo(accordion.find('.accordion-group').eq(1)) + + var target3 = $('<a class="collapsed" data-toggle="collapse" href="#body3" data-parent=".accordion"></a>') + .appendTo(accordion.find('.accordion-group').eq(2)) + + var collapsible3 = $('<div id="body3"></div>') + .appendTo(accordion.find('.accordion-group').eq(2)) + .on('show.bs.collapse', function () { + ok(target1.hasClass('collapsed')) + ok(target2.hasClass('collapsed')) + ok(!target3.hasClass('collapsed')) + + start() + }) + + target3.click() + }) + }) diff --git a/js/tooltip.js b/js/tooltip.js index 8f2beedce..cd4ee50ed 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -179,7 +179,7 @@ .addClass(placement) } - var calculatedOffset = this.getCalcuatedOffset(placement, pos, actualWidth, actualHeight) + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) this.applyPlacement(calculatedOffset, placement) this.$element.trigger('shown.bs.' + this.type) @@ -292,7 +292,7 @@ }, this.$element.offset()) } - Tooltip.prototype.getCalcuatedOffset = function (placement, pos, actualWidth, actualHeight) { + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : |