rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Comply to the new style.

Browse Source
This commit is contained in:
XhmikosR 2014-03-17 09:12:55 +02:00
parent 5ef9383f53
commit 7b0acf14d8
24 changed files with 171 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -232,7 +232,7 @@ module.exports = function (grunt) {
core: {
files: {
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css',
'dist/css/<%= pkg.name %>-theme.min.css': 'dist/css/<%= pkg.name %>-theme.css'
}
},
docs: {

1
docs/assets/js/_src/application.js
View File

@ -11,6 +11,7 @@
!function ($) {
'use strict';
$(function () {

3
docs/assets/js/_src/customizer.js
View File

@ -6,7 +6,10 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
/* global JSZip, less, saveAs, UglifyJS, __js, __less, __fonts */
window.onload = function () { // wait for load in a dumb way because B-0
'use strict';
var cw = '/*!\n' +
' * Bootstrap v3.1.1 (http://getbootstrap.com)\n' +
' * Copyright 2011-2014 Twitter, Inc.\n' +

1
docs/assets/js/ie10-viewport-bug-workaround.js
View File

@ -9,6 +9,7 @@
// http://getbootstrap.com/getting-started/#support-ie10-width
(function () {
'use strict';
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement('style')
msViewportStyle.appendChild(

2
docs/assets/js/ie8-responsive-file-warning.js
View File

@ -9,5 +9,5 @@
*/
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
if (window.location.protocol == 'file:') {
alert('ERROR: Bootstrap\'s responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.')
window.alert('ERROR: Bootstrap\'s responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.')
}

5
js/carousel.js
View File

@ -103,7 +103,7 @@
$next = this.$element.find('.item')[fallback]()
}
if ($next.hasClass('active')) return this.sliding = false
if ($next.hasClass('active')) return (this.sliding = false)
var relatedTarget = $next[0]
var slideEvent = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction })
@ -185,7 +185,8 @@
// =================
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
var $this = $(this), href
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to')

3
js/collapse.js
View File

@ -159,7 +159,8 @@
// =================
$(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
var $this = $(this), href
var href
var $this = $(this)
var target = $this.attr('data-target')
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7

2
js/modal.js
View File

@ -209,7 +209,7 @@
}
Modal.prototype.setScrollbar = function () {
var bodyPad = parseInt(this.$body.css('padding-right') || 0)
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
}

2
js/popover.js
View File

@ -72,7 +72,7 @@
}
Popover.prototype.arrow = function () {
return this.$arrow = this.$arrow || this.tip().find('.arrow')
return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
}
Popover.prototype.tip = function () {

1
js/scrollspy.js
View File

@ -43,7 +43,6 @@
this.offsets = $([])
this.targets = $([])
var self = this
this.$body

1
js/tests/unit/affix.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('affix plugin')

9
js/tests/unit/alert.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('alert plugin')
@ -29,8 +30,8 @@ $(function () {
var alertHTML = '<div class="alert-message warning fade in">' +
'<a class="close" href="#" data-dismiss="alert">×</a>' +
'<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' +
'</div>',
alert = $(alertHTML).bootstrapAlert()
'</div>'
var alert = $(alertHTML).bootstrapAlert()
alert.find('.close').click()
@ -43,8 +44,8 @@ $(function () {
var alertHTML = '<div class="alert-message warning fade in">' +
'<a class="close" href="#" data-dismiss="alert">×</a>' +
'<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' +
'</div>',
alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
'</div>'
var alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')

11
js/tests/unit/button.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('button plugin')
@ -88,8 +89,8 @@ $(function () {
})
test('should toggle active when btn children are clicked', function () {
var btn = $('<button class="btn" data-toggle="button">mdo</button>'),
inner = $('<i></i>')
var btn = $('<button class="btn" data-toggle="button">mdo</button>')
var inner = $('<i></i>')
btn
.append(inner)
.appendTo($('#qunit-fixture'))
@ -99,9 +100,9 @@ $(function () {
})
test('should toggle active when btn children are clicked within btn-group', function () {
var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>'),
btn = $('<button class="btn">fat</button>'),
inner = $('<i></i>')
var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>')
var btn = $('<button class="btn">fat</button>')
var inner = $('<i></i>')
btngroup
.append(btn.append(inner))
.appendTo($('#qunit-fixture'))

1
js/tests/unit/carousel.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('carousel plugin')

1
js/tests/unit/collapse.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('collapse plugin')

37
js/tests/unit/dropdown.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('dropdowns plugin')
@ -37,8 +38,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
'</ul>'
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@ -54,8 +55,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
'</ul>'
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@ -71,8 +72,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
'</ul>'
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@ -88,8 +89,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
'</ul>'
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@ -106,8 +107,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML)
'</ul>'
var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
@ -135,10 +136,10 @@ $(function () {
' <ul class="dropdown-menu">' +
' <li><a href="#">Action 1</a></li>' +
' </ul>' +
'</div>',
dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]'),
first = dropdowns.first(),
last = dropdowns.last()
'</div>'
var dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
var first = dropdowns.first()
var last = dropdowns.last()
ok(dropdowns.length == 2, 'Should be two dropdowns')
@ -168,8 +169,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML)
'</ul>'
var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
@ -202,8 +203,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
'</ul>',
dropdown = $(dropdownHTML)
'</ul>'
var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()

1
js/tests/unit/modal.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('modal plugin')

3
js/tests/unit/popover.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('popover plugin')
@ -83,7 +84,7 @@ $(function () {
test('should not duplicate HTML object', function () {
$.support.transition = false
$div = $('<div>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
var $div = $('<div>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
var popover = $('<a href="#">@fat</a>')
.appendTo('#qunit-fixture')

22
js/tests/unit/scrollspy.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('scrollspy plugin')
@ -26,8 +27,9 @@ $(function () {
})
test('should switch active class on scroll', function () {
var sectionHTML = '<div id="masthead"></div>',
topbarHTML = '<div class="topbar">' +
var sectionHTML = '<div id="masthead"></div>'
$(sectionHTML).append('#qunit-fixture')
var topbarHTML = '<div class="topbar">' +
'<div class="topbar-inner">' +
'<div class="container">' +
'<h3><a href="#">Bootstrap</a></h3>' +
@ -35,8 +37,8 @@ $(function () {
'</ul>' +
'</div>' +
'</div>' +
'</div>',
$topbar = $(topbarHTML).bootstrapScrollspy()
'</div>'
var $topbar = $(topbarHTML).bootstrapScrollspy()
$(sectionHTML).append('#qunit-fixture')
ok($topbar.find('.active', true))
@ -69,9 +71,9 @@ $(function () {
'</p>' +
'</div>' +
'</div>' +
'</div>',
$section = $(sectionHTML).appendTo('#qunit-fixture'),
$scrollSpy = $section
'</div>'
var $section = $(sectionHTML).appendTo('#qunit-fixture')
var $scrollSpy = $section
.show()
.find('#scrollspy-example')
.bootstrapScrollspy({ target: '#ss-target' })
@ -97,9 +99,9 @@ $(function () {
'<div id="one" style="height: 500px;"></div>' +
'<div id="two" style="height: 300px;"></div>' +
'<div id="three" style="height: 10px;"></div>' +
'</div>',
$section = $(sectionHTML).appendTo('#qunit-fixture'),
$scrollSpy = $section
'</div>'
var $section = $(sectionHTML).appendTo('#qunit-fixture')
var $scrollSpy = $section
.show()
.filter('#content')
$scrollSpy.bootstrapScrollspy({ target: '#navigation', offset: $scrollSpy.position().top })

1
js/tests/unit/tab.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('tabs plugin')

59
js/tests/unit/tooltip.js
View File

@ -1,4 +1,5 @@
$(function () {
'use strict';
module('tooltip plugin')
@ -65,8 +66,8 @@ $(function () {
test('should assign a unique id tooltip element', function () {
$('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
.bootstrapTooltip('show'),
id = $('.tooltip').attr('id')
.bootstrapTooltip('show')
var id = $('.tooltip').attr('id')
ok($('#' + id).length == 1 && id.indexOf('tooltip') === 0, 'generated prefixed and unique tooltip id')
})
@ -367,9 +368,9 @@ $(function () {
test('should place tooltip on top of element', function () {
var container = $('<div />').appendTo('body')
.css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}),
p = $('<p style="margin-top:200px" />').appendTo(container),
tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>')
.css({ position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300 })
var p = $('<p style="margin-top:200px" />').appendTo(container)
var tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>')
.css({ marginTop: 200 })
.appendTo(p)
.bootstrapTooltip({ placement: 'top', animate: false })
@ -389,12 +390,12 @@ $(function () {
test('should add position class before positioning so that position-specific styles are taken into account', function () {
$('head').append('<style id="test"> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>')
var container = $('<div />').appendTo('body'),
target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
var container = $('<div />').appendTo('body')
var target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'right', viewport: null })
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
// this is some dumb hack shit because sub pixels in firefox
var top = Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2))
@ -482,12 +483,12 @@ $(function () {
test('should adjust the tip\'s top when up against the top of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
var container = $('<div />').appendTo('body'),
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
var container = $('<div />').appendTo('body')
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
ok(Math.round(tooltip.offset().top) === 12)
target.bootstrapTooltip('hide')
@ -497,12 +498,12 @@ $(function () {
test('should adjust the tip\'s top when up against the bottom of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
var container = $('<div />').appendTo('body'),
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
var container = $('<div />').appendTo('body')
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
ok(Math.round(tooltip.offset().top) === Math.round($(window).height() - 12 - tooltip[0].offsetHeight))
target.bootstrapTooltip('hide')
@ -512,12 +513,12 @@ $(function () {
test('should adjust the tip\'s left when up against the left of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
var container = $('<div />').appendTo('body'),
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
var container = $('<div />').appendTo('body')
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
ok(Math.round(tooltip.offset().left) === 12)
target.bootstrapTooltip('hide')
@ -527,12 +528,12 @@ $(function () {
test('should adjust the tip\'s left when up against the right of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
var container = $('<div />').appendTo('body'),
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
var container = $('<div />').appendTo('body')
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
ok(Math.round(tooltip.offset().left) === Math.round($(window).width() - 12 - tooltip[0].offsetWidth))
target.bootstrapTooltip('hide')
@ -543,12 +544,12 @@ $(function () {
$('head').append('<style id="test"> .tooltip, .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
$('head').append('<style id="viewport-style"> .container-viewport { position: absolute; top: 50px; left: 60px; width: 300px; height: 300px; } </style>')
var container = $('<div />', {class: 'container-viewport'}).appendTo('body'),
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
var container = $('<div />', { 'class': 'container-viewport' }).appendTo('body')
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
.appendTo(container)
.bootstrapTooltip({ placement: 'bottom', viewport: '.container-viewport' })
.bootstrapTooltip('show'),
tooltip = container.find('.tooltip')
.bootstrapTooltip('show')
var tooltip = container.find('.tooltip')
ok(Math.round(tooltip.offset().left) === Math.round(60 + container.width() - tooltip[0].offsetWidth))
target.bootstrapTooltip('hide')

4
js/tooltip.js
View File

@ -378,11 +378,11 @@
}
Tooltip.prototype.tip = function () {
return this.$tip = this.$tip || $(this.options.template)
return (this.$tip = this.$tip || $(this.options.template))
}
Tooltip.prototype.arrow = function () {
return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
}
Tooltip.prototype.validate = function () {

3
js/transition.js
View File

@ -34,7 +34,8 @@
// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
var called = false, $el = this
var called = false
var $el = this
$(this).one($.support.transition.end, function () { called = true })
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
setTimeout(callback, duration)