0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

85 Commits

Author SHA1 Message Date
Zlatan Vasović
576230b92a Happy New Year 🎅 2015-01-01 01:23:48 +01:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Heinrich Fenkart
da74fba490 Center modal dialog at all times 2014-11-05 01:37:44 +01:00
Heinrich Fenkart
14e5fb04e9 Fix modal backdrop overlaying the modal's scrollbar
Fixes #14916.
2014-11-04 23:17:55 +01:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
fat
4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
Heinrich Fenkart
c4f431d262 Remove .modal-open class after backdrop is hidden
Fixes #14274.
Fixes #14632.
2014-09-17 09:21:09 +02:00
Heinrich Fenkart
787404e090 Merge pull request #14287 from hnrch02/revert-13855-modal-mousedown
Revert #13855 due to #14263
2014-09-08 22:23:43 +02:00
Stefan Sundin
f25181615e Fix bug not re-calculating scrollbar width when opening modal.
If opening a modal when a scrollbar is present, closing it, then
resizing the window so the scrollbar disappears, then opening the
modal again, the content would shift. This fixes the problem by
always calculating the scrollbar width every time a modal is opened.

Closes #14357.
2014-09-07 23:06:37 -07:00
Heinrich Fenkart
18c0a1c977 Revert "Use mousedown instead of click for backdrop click detection; fixes #13816" 2014-07-30 23:54:25 +02:00
Heinrich Fenkart
231744d628 Expose transition durations on plugin constructors; closes #13656 2014-07-07 13:03:56 +02:00
Jacob
5830febd9a Merge pull request #13855 from hnrch02/modal-mousedown
Use mousedown instead of click for backdrop click detection; fixes #13816
2014-07-06 00:01:57 -07:00
Heinrich Fenkart
91f329e448 Only close modal if escape was hit with keydown; fixes #13929 2014-07-01 05:50:31 +02:00
Heinrich Fenkart
121bf6633e Use mousedown instead of click for backdrop click detection; fixes #13816 2014-07-01 02:53:57 +02:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
2014-06-23 11:11:59 -07:00
Heinrich Fenkart
587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
fat
2b302f69ee some changes from #13801 - add strict mode back and == 2014-06-12 11:11:04 -07:00
Jacob
696632d7da Merge pull request #13786 from twbs/fat-13430
add special transitionend type to test event origin
2014-06-11 22:44:04 -07:00
Heinrich Fenkart
e9d6756a1a Fix regression of #10038 introduced by #13772 2014-06-12 06:00:02 +02:00
fat
7f122be004 add special transitionend type to test event origin
fixes #13430
2014-06-10 20:42:19 -07:00
Katie Zhu
1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
XhmikosR
3b99a41246 Merge pull request #13388 from twbs/xhmikosr-js-style
Improve JS style
2014-06-07 09:13:05 +03:00
XhmikosR
e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
Chris Rebert
b058c018eb Hopefully a fix for #12364
* register the callback before invoking the toggling
* listen for `hidden` instead of `hide`
* account for the possibility of the associated `show` event being preventDefault-ed

Adds relevant unit tests.
2014-05-19 02:14:14 -07:00
Chris Rebert
3d1723d689 add missing event namespacing in modal.js 2014-05-16 17:05:03 -07:00
fat
f219fee07b versions 2014-05-12 21:15:16 -07:00
Collin Donahue-Oponski
a9f2b6ce0f #11464 - Fix JS noConflict mode - Refactor all plugins to use an internal reference to the jQuery plugin, because in noConflict mode you can never expect to be defined on the jQuery object 2014-04-21 23:03:33 -06:00
Tobias Lindig
a69bc3bc09 move call for removeBackdrop() to backdrop()
Closes #11958 by rebasing & merging it
2014-04-20 14:47:32 -07:00
Tyler Cipriani
0907244256 Modal body shift fix for IE10/11
Closes #13103 by merging it.
2014-03-28 23:45:22 -07:00
Heinrich Fenkart
4e4e456341 Fix #12845 - Modal#hide should only be called with an event argument
Closes #12850
2014-03-16 20:24:33 -07:00
fat
615dcb5ca0 fixes #9855 2014-03-16 18:38:47 -07:00
Heinrich Fenkart
8a78bc065f Remove event aliases from JavaScript
Makes life for people with custom jQuery builds excluding event aliases much easier.
2014-02-16 21:00:04 +01:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Tobias Lindig
084f0fb113 add namespace .bs also to the event dismiss.modal 2014-01-17 12:16:53 -08:00
Tobias Lindig
7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert
5f328dce88 Merge pull request #12057 from ZDroid/nl
'use strict' on new line
2014-01-07 00:31:27 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Zlatan Vasović
0f060e7bc4 'use strict' on new line 2014-01-01 15:42:41 +01:00
Zlatan Vasović
1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
fat
ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
fat
c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat
34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
Jacob
bea46fca70 Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
2013-12-26 17:46:59 -08:00
Mark Otto
5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
fat
fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
Chris Rebert
df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00