Skip to content

B
bootstrap
Commit 4a01acaf authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #11941 from ZDroid/left-plus 

No leading pluses
parents caadd720 1bf5abab
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 136 deletions
dist/css/bootstrap.css
View file @ 4a01acaf
...@@ -1456,6 +1456,7 @@ table col[class*="col-"] { ...@@ -1456,6 +1456,7 @@ table col[class*="col-"] {
} }
table td[class*="col-"], table td[class*="col-"],
table th[class*="col-"] { table th[class*="col-"] {
position: static;
display: table-cell; display: table-cell;
float: none; float: none;
} }
......
dist/css/bootstrap.css.map
View file @ 4a01acaf
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ 4a01acaf
This source diff could not be displayed because it is too large. You can view the blob instead.
js/scrollspy.js
View file @ 4a01acaf
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
.parents('.active') .parents('.active')
.removeClass('active') .removeClass('active')
var selector = this.selector var selector = this.selector +
+ '[data-target="' + target + '"],' '[data-target="' + target + '"],' +
+ this.selector + '[href="' + target + '"]' this.selector + '[href="' + target + '"]'
var active = $(selector) var active = $(selector)
.parents('li') .parents('li')
......
js/tests/unit/alert.js
View file @ 4a01acaf
...@@ -17,10 +17,10 @@ $(function () { ...@@ -17,10 +17,10 @@ $(function () {
}) })
test('should fade element out on clicking .close', function () { test('should fade element out on clicking .close', function () {
var alertHTML = '<div class="alert-message warning fade in">' var alertHTML = '<div class="alert-message warning fade in">' +
+ '<a class="close" href="#" data-dismiss="alert">×</a>' '<a class="close" href="#" data-dismiss="alert">×</a>' +
+ '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' +
+ '</div>', '</div>',
alert = $(alertHTML).alert() alert = $(alertHTML).alert()
alert.find('.close').click() alert.find('.close').click()
...@@ -31,10 +31,10 @@ $(function () { ...@@ -31,10 +31,10 @@ $(function () {
test('should remove element when clicking .close', function () { test('should remove element when clicking .close', function () {
$.support.transition = false $.support.transition = false
var alertHTML = '<div class="alert-message warning fade in">' var alertHTML = '<div class="alert-message warning fade in">' +
+ '<a class="close" href="#" data-dismiss="alert">×</a>' '<a class="close" href="#" data-dismiss="alert">×</a>' +
+ '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' +
+ '</div>', '</div>',
alert = $(alertHTML).appendTo('#qunit-fixture').alert() alert = $(alertHTML).appendTo('#qunit-fixture').alert()
ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom') ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
......
js/tests/unit/dropdown.js
View file @ 4a01acaf
...@@ -18,68 +18,68 @@ $(function () { ...@@ -18,68 +18,68 @@ $(function () {
}) })
test('should not open dropdown if target is disabled', function () { test('should not open dropdown if target is disabled', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>' '<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
}) })
test('should not open dropdown if target is disabled', function () { test('should not open dropdown if target is disabled', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>' '<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
}) })
test('should add class open to menu if clicked', function () { test('should add class open to menu if clicked', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
}) })
test('should test if element has a # before assuming it\'s a selector', function () { test('should test if element has a # before assuming it\'s a selector', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<a href="/foo/" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' '<a href="/foo/" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
...@@ -87,17 +87,17 @@ $(function () { ...@@ -87,17 +87,17 @@ $(function () {
test('should remove open class if body clicked', function () { test('should remove open class if body clicked', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML) dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]') .find('[data-toggle="dropdown"]')
...@@ -111,23 +111,22 @@ $(function () { ...@@ -111,23 +111,22 @@ $(function () {
}) })
test('should remove open class if body clicked, with multiple drop downs', function () { test('should remove open class if body clicked, with multiple drop downs', function () {
var dropdownHTML = var dropdownHTML = '<ul class="nav">' +
'<ul class="nav">' ' <li><a href="#menu1">Menu 1</a></li>' +
+ ' <li><a href="#menu1">Menu 1</a></li>' ' <li class="dropdown" id="testmenu">' +
+ ' <li class="dropdown" id="testmenu">' ' <a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <b class="caret"></b></a>' +
+ ' <a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <b class="caret"></b></a>' ' <ul class="dropdown-menu" role="menu">' +
+ ' <ul class="dropdown-menu" role="menu">' ' <li><a href="#sub1">Submenu 1</a></li>' +
+ ' <li><a href="#sub1">Submenu 1</a></li>' ' </ul>' +
+ ' </ul>' ' </li>' +
+ ' </li>' '</ul>' +
+ '</ul>' '<div class="btn-group">' +
+ '<div class="btn-group">' ' <button class="btn">Actions</button>' +
+ ' <button class="btn">Actions</button>' ' <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>' +
+ ' <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>' ' <ul class="dropdown-menu">' +
+ ' <ul class="dropdown-menu">' ' <li><a href="#">Action 1</a></li>' +
+ ' <li><a href="#">Action 1</a></li>' ' </ul>' +
+ ' </ul>' '</div>',
+ '</div>',
dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]'), dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]'),
first = dropdowns.first(), first = dropdowns.first(),
last = dropdowns.last() last = dropdowns.last()
...@@ -150,17 +149,17 @@ $(function () { ...@@ -150,17 +149,17 @@ $(function () {
}) })
test('should fire show and hide event', function () { test('should fire show and hide event', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML) dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]') .find('[data-toggle="dropdown"]')
...@@ -184,17 +183,17 @@ $(function () { ...@@ -184,17 +183,17 @@ $(function () {
test('should fire shown and hiden event', function () { test('should fire shown and hiden event', function () {
var dropdownHTML = '<ul class="tabs">' var dropdownHTML = '<ul class="tabs">' +
+ '<li class="dropdown">' '<li class="dropdown">' +
+ '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
+ '<ul class="dropdown-menu">' '<ul class="dropdown-menu">' +
+ '<li><a href="#">Secondary link</a></li>' '<li><a href="#">Secondary link</a></li>' +
+ '<li><a href="#">Something else here</a></li>' '<li><a href="#">Something else here</a></li>' +
+ '<li class="divider"></li>' '<li class="divider"></li>' +
+ '<li><a href="#">Another link</a></li>' '<li><a href="#">Another link</a></li>' +
+ '</ul>' '</ul>' +
+ '</li>' '</li>' +
+ '</ul>', '</ul>',
dropdown = $(dropdownHTML) dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]') .find('[data-toggle="dropdown"]')
......
js/tests/unit/scrollspy.js
View file @ 4a01acaf
...@@ -19,16 +19,15 @@ $(function () { ...@@ -19,16 +19,15 @@ $(function () {
test('should switch active class on scroll', function () { test('should switch active class on scroll', function () {
var sectionHTML = '<div id="masthead"></div>' var sectionHTML = '<div id="masthead"></div>'
$section = $(sectionHTML).append('#qunit-fixture'), $section = $(sectionHTML).append('#qunit-fixture'),
topbarHTML = '<div class="topbar">' topbarHTML = '<div class="topbar">' +
+ '<div class="topbar-inner">' '<div class="topbar-inner">' +
+ '<div class="container">' '<div class="container">' +
+ '<h3><a href="#">Bootstrap</a></h3>' '<h3><a href="#">Bootstrap</a></h3>' +
+ '<ul class="nav">' '<li><a href="#masthead">Overview</a></li>' +
+ '<li><a href="#masthead">Overview</a></li>' '</ul>' +
+ '</ul>' '</div>' +
+ '</div>' '</div>' +
+ '</div>' '</div>',
+ '</div>',
$topbar = $(topbarHTML).scrollspy() $topbar = $(topbarHTML).scrollspy()
ok($topbar.find('.active', true)) ok($topbar.find('.active', true))
......
js/tests/unit/tab.js
View file @ 4a01acaf
...@@ -17,11 +17,10 @@ $(function () { ...@@ -17,11 +17,10 @@ $(function () {
}) })
test('should activate element by tab id', function () { test('should activate element by tab id', function () {
var tabsHTML = var tabsHTML = '<ul class="tabs">' +
'<ul class="tabs">' '<li><a href="#home">Home</a></li>' +
+ '<li><a href="#home">Home</a></li>' '<li><a href="#profile">Profile</a></li>' +
+ '<li><a href="#profile">Profile</a></li>' '</ul>'
+ '</ul>'
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture') $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture')
...@@ -33,11 +32,10 @@ $(function () { ...@@ -33,11 +32,10 @@ $(function () {
}) })
test('should activate element by tab id', function () { test('should activate element by tab id', function () {
var pillsHTML = var pillsHTML = '<ul class="pills">' +
'<ul class="pills">' '<li><a href="#home">Home</a></li>' +
+ '<li><a href="#home">Home</a></li>' '<li><a href="#profile">Profile</a></li>' +
+ '<li><a href="#profile">Profile</a></li>' '</ul>'
+ '</ul>'
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture') $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture')
...@@ -65,15 +63,14 @@ $(function () { ...@@ -65,15 +63,14 @@ $(function () {
}) })
test('show and shown events should reference correct relatedTarget', function () { test('show and shown events should reference correct relatedTarget', function () {
var dropHTML = var dropHTML = '<ul class="drop">' +
'<ul class="drop">' '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>' +
+ '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>' '<ul class="dropdown-menu">' +
+ '<ul class="dropdown-menu">' '<li><a href="#1-1" data-toggle="tab">1-1</a></li>' +
+ '<li><a href="#1-1" data-toggle="tab">1-1</a></li>' '<li><a href="#1-2" data-toggle="tab">1-2</a></li>' +
+ '<li><a href="#1-2" data-toggle="tab">1-2</a></li>' '</ul>' +
+ '</ul>' '</li>' +
+ '</li>' '</ul>'
+ '</ul>'
$(dropHTML).find('ul>li:first a').tab('show').end() $(dropHTML).find('ul>li:first a').tab('show').end()
.find('ul>li:last a').on('show', function (event) { .find('ul>li:last a').on('show', function (event) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment