mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Comply to the new style.
This commit is contained in:
parent
5ef9383f53
commit
7b0acf14d8
24 changed files with 171 additions and 152 deletions
|
@ -232,7 +232,7 @@ module.exports = function (grunt) {
|
||||||
core: {
|
core: {
|
||||||
files: {
|
files: {
|
||||||
'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css',
|
'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: {
|
docs: {
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
|
|
||||||
!function ($) {
|
!function ($) {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,10 @@
|
||||||
* details, see http://creativecommons.org/licenses/by/3.0/.
|
* 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
|
window.onload = function () { // wait for load in a dumb way because B-0
|
||||||
|
'use strict';
|
||||||
var cw = '/*!\n' +
|
var cw = '/*!\n' +
|
||||||
' * Bootstrap v3.1.1 (http://getbootstrap.com)\n' +
|
' * Bootstrap v3.1.1 (http://getbootstrap.com)\n' +
|
||||||
' * Copyright 2011-2014 Twitter, Inc.\n' +
|
' * Copyright 2011-2014 Twitter, Inc.\n' +
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
// http://getbootstrap.com/getting-started/#support-ie10-width
|
// http://getbootstrap.com/getting-started/#support-ie10-width
|
||||||
|
|
||||||
(function () {
|
(function () {
|
||||||
|
'use strict';
|
||||||
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
|
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
|
||||||
var msViewportStyle = document.createElement('style')
|
var msViewportStyle = document.createElement('style')
|
||||||
msViewportStyle.appendChild(
|
msViewportStyle.appendChild(
|
||||||
|
|
|
@ -9,5 +9,5 @@
|
||||||
*/
|
*/
|
||||||
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
|
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
|
||||||
if (window.location.protocol == 'file:') {
|
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.')
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
$next = this.$element.find('.item')[fallback]()
|
$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 relatedTarget = $next[0]
|
||||||
var slideEvent = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction })
|
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) {
|
$(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 $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||||
var options = $.extend({}, $target.data(), $this.data())
|
var options = $.extend({}, $target.data(), $this.data())
|
||||||
var slideIndex = $this.attr('data-slide-to')
|
var slideIndex = $this.attr('data-slide-to')
|
||||||
|
|
|
@ -159,7 +159,8 @@
|
||||||
// =================
|
// =================
|
||||||
|
|
||||||
$(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
|
$(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')
|
var target = $this.attr('data-target')
|
||||||
|| e.preventDefault()
|
|| e.preventDefault()
|
||||||
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
||||||
|
|
|
@ -209,7 +209,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Modal.prototype.setScrollbar = function () {
|
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)
|
if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Popover.prototype.arrow = function () {
|
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 () {
|
Popover.prototype.tip = function () {
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
|
|
||||||
this.offsets = $([])
|
this.offsets = $([])
|
||||||
this.targets = $([])
|
this.targets = $([])
|
||||||
|
|
||||||
var self = this
|
var self = this
|
||||||
|
|
||||||
this.$body
|
this.$body
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('affix plugin')
|
module('affix plugin')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('alert plugin')
|
module('alert plugin')
|
||||||
|
|
||||||
|
@ -29,8 +30,8 @@ $(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).bootstrapAlert()
|
var alert = $(alertHTML).bootstrapAlert()
|
||||||
|
|
||||||
alert.find('.close').click()
|
alert.find('.close').click()
|
||||||
|
|
||||||
|
@ -43,8 +44,8 @@ $(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).appendTo('#qunit-fixture').bootstrapAlert()
|
var alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
|
||||||
|
|
||||||
ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
|
ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('button plugin')
|
module('button plugin')
|
||||||
|
|
||||||
|
@ -88,8 +89,8 @@ $(function () {
|
||||||
})
|
})
|
||||||
|
|
||||||
test('should toggle active when btn children are clicked', function () {
|
test('should toggle active when btn children are clicked', function () {
|
||||||
var btn = $('<button class="btn" data-toggle="button">mdo</button>'),
|
var btn = $('<button class="btn" data-toggle="button">mdo</button>')
|
||||||
inner = $('<i></i>')
|
var inner = $('<i></i>')
|
||||||
btn
|
btn
|
||||||
.append(inner)
|
.append(inner)
|
||||||
.appendTo($('#qunit-fixture'))
|
.appendTo($('#qunit-fixture'))
|
||||||
|
@ -99,9 +100,9 @@ $(function () {
|
||||||
})
|
})
|
||||||
|
|
||||||
test('should toggle active when btn children are clicked within btn-group', function () {
|
test('should toggle active when btn children are clicked within btn-group', function () {
|
||||||
var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>'),
|
var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>')
|
||||||
btn = $('<button class="btn">fat</button>'),
|
var btn = $('<button class="btn">fat</button>')
|
||||||
inner = $('<i></i>')
|
var inner = $('<i></i>')
|
||||||
btngroup
|
btngroup
|
||||||
.append(btn.append(inner))
|
.append(btn.append(inner))
|
||||||
.appendTo($('#qunit-fixture'))
|
.appendTo($('#qunit-fixture'))
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('carousel plugin')
|
module('carousel plugin')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('collapse plugin')
|
module('collapse plugin')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('dropdowns plugin')
|
module('dropdowns plugin')
|
||||||
|
|
||||||
|
@ -37,8 +38,8 @@ $(function () {
|
||||||
'<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"]').bootstrapDropdown().click()
|
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
|
||||||
|
|
||||||
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
})
|
})
|
||||||
|
@ -54,8 +55,8 @@ $(function () {
|
||||||
'<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"]').bootstrapDropdown().click()
|
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
|
||||||
|
|
||||||
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
})
|
})
|
||||||
|
@ -71,8 +72,8 @@ $(function () {
|
||||||
'<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"]').bootstrapDropdown().click()
|
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
|
||||||
|
|
||||||
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
})
|
})
|
||||||
|
@ -88,8 +89,8 @@ $(function () {
|
||||||
'<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"]').bootstrapDropdown().click()
|
var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
|
||||||
|
|
||||||
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
})
|
})
|
||||||
|
@ -106,8 +107,8 @@ $(function () {
|
||||||
'<li><a href="#">Another link</a></li>' +
|
'<li><a href="#">Another link</a></li>' +
|
||||||
'</ul>' +
|
'</ul>' +
|
||||||
'</li>' +
|
'</li>' +
|
||||||
'</ul>',
|
'</ul>'
|
||||||
dropdown = $(dropdownHTML)
|
var dropdown = $(dropdownHTML)
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
.find('[data-toggle="dropdown"]')
|
.find('[data-toggle="dropdown"]')
|
||||||
.bootstrapDropdown()
|
.bootstrapDropdown()
|
||||||
|
@ -135,10 +136,10 @@ $(function () {
|
||||||
' <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"]'),
|
var dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
|
||||||
first = dropdowns.first(),
|
var first = dropdowns.first()
|
||||||
last = dropdowns.last()
|
var last = dropdowns.last()
|
||||||
|
|
||||||
ok(dropdowns.length == 2, 'Should be two dropdowns')
|
ok(dropdowns.length == 2, 'Should be two dropdowns')
|
||||||
|
|
||||||
|
@ -168,8 +169,8 @@ $(function () {
|
||||||
'<li><a href="#">Another link</a></li>' +
|
'<li><a href="#">Another link</a></li>' +
|
||||||
'</ul>' +
|
'</ul>' +
|
||||||
'</li>' +
|
'</li>' +
|
||||||
'</ul>',
|
'</ul>'
|
||||||
dropdown = $(dropdownHTML)
|
var dropdown = $(dropdownHTML)
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
.find('[data-toggle="dropdown"]')
|
.find('[data-toggle="dropdown"]')
|
||||||
.bootstrapDropdown()
|
.bootstrapDropdown()
|
||||||
|
@ -202,8 +203,8 @@ $(function () {
|
||||||
'<li><a href="#">Another link</a></li>' +
|
'<li><a href="#">Another link</a></li>' +
|
||||||
'</ul>' +
|
'</ul>' +
|
||||||
'</li>' +
|
'</li>' +
|
||||||
'</ul>',
|
'</ul>'
|
||||||
dropdown = $(dropdownHTML)
|
var dropdown = $(dropdownHTML)
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
.find('[data-toggle="dropdown"]')
|
.find('[data-toggle="dropdown"]')
|
||||||
.bootstrapDropdown()
|
.bootstrapDropdown()
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('modal plugin')
|
module('modal plugin')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('popover plugin')
|
module('popover plugin')
|
||||||
|
|
||||||
|
@ -83,7 +84,7 @@ $(function () {
|
||||||
test('should not duplicate HTML object', function () {
|
test('should not duplicate HTML object', function () {
|
||||||
$.support.transition = false
|
$.support.transition = false
|
||||||
|
|
||||||
$div = $('<div>').html('loves writing tests (╯°□°)╯︵ ┻━┻')
|
var $div = $('<div>').html('loves writing tests (╯°□°)╯︵ ┻━┻')
|
||||||
|
|
||||||
var popover = $('<a href="#">@fat</a>')
|
var popover = $('<a href="#">@fat</a>')
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('scrollspy plugin')
|
module('scrollspy plugin')
|
||||||
|
|
||||||
|
@ -26,8 +27,9 @@ $(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>'
|
||||||
topbarHTML = '<div class="topbar">' +
|
$(sectionHTML).append('#qunit-fixture')
|
||||||
|
var 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>' +
|
||||||
|
@ -35,8 +37,8 @@ $(function () {
|
||||||
'</ul>' +
|
'</ul>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'</div>',
|
'</div>'
|
||||||
$topbar = $(topbarHTML).bootstrapScrollspy()
|
var $topbar = $(topbarHTML).bootstrapScrollspy()
|
||||||
|
|
||||||
$(sectionHTML).append('#qunit-fixture')
|
$(sectionHTML).append('#qunit-fixture')
|
||||||
ok($topbar.find('.active', true))
|
ok($topbar.find('.active', true))
|
||||||
|
@ -69,9 +71,9 @@ $(function () {
|
||||||
'</p>' +
|
'</p>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'</div>',
|
'</div>'
|
||||||
$section = $(sectionHTML).appendTo('#qunit-fixture'),
|
var $section = $(sectionHTML).appendTo('#qunit-fixture')
|
||||||
$scrollSpy = $section
|
var $scrollSpy = $section
|
||||||
.show()
|
.show()
|
||||||
.find('#scrollspy-example')
|
.find('#scrollspy-example')
|
||||||
.bootstrapScrollspy({ target: '#ss-target' })
|
.bootstrapScrollspy({ target: '#ss-target' })
|
||||||
|
@ -97,9 +99,9 @@ $(function () {
|
||||||
'<div id="one" style="height: 500px;"></div>' +
|
'<div id="one" style="height: 500px;"></div>' +
|
||||||
'<div id="two" style="height: 300px;"></div>' +
|
'<div id="two" style="height: 300px;"></div>' +
|
||||||
'<div id="three" style="height: 10px;"></div>' +
|
'<div id="three" style="height: 10px;"></div>' +
|
||||||
'</div>',
|
'</div>'
|
||||||
$section = $(sectionHTML).appendTo('#qunit-fixture'),
|
var $section = $(sectionHTML).appendTo('#qunit-fixture')
|
||||||
$scrollSpy = $section
|
var $scrollSpy = $section
|
||||||
.show()
|
.show()
|
||||||
.filter('#content')
|
.filter('#content')
|
||||||
$scrollSpy.bootstrapScrollspy({ target: '#navigation', offset: $scrollSpy.position().top })
|
$scrollSpy.bootstrapScrollspy({ target: '#navigation', offset: $scrollSpy.position().top })
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('tabs plugin')
|
module('tabs plugin')
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
module('tooltip plugin')
|
module('tooltip plugin')
|
||||||
|
|
||||||
|
@ -65,8 +66,8 @@ $(function () {
|
||||||
test('should assign a unique id tooltip element', function () {
|
test('should assign a unique id tooltip element', function () {
|
||||||
$('<a href="#" rel="tooltip" title="Another tooltip"></a>')
|
$('<a href="#" rel="tooltip" title="Another tooltip"></a>')
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
id = $('.tooltip').attr('id')
|
var id = $('.tooltip').attr('id')
|
||||||
|
|
||||||
ok($('#' + id).length == 1 && id.indexOf('tooltip') === 0, 'generated prefixed and unique tooltip 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 () {
|
test('should place tooltip on top of element', function () {
|
||||||
var container = $('<div />').appendTo('body')
|
var container = $('<div />').appendTo('body')
|
||||||
.css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}),
|
.css({ position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300 })
|
||||||
p = $('<p style="margin-top:200px" />').appendTo(container),
|
var p = $('<p style="margin-top:200px" />').appendTo(container)
|
||||||
tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>')
|
var tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>')
|
||||||
.css({ marginTop: 200 })
|
.css({ marginTop: 200 })
|
||||||
.appendTo(p)
|
.appendTo(p)
|
||||||
.bootstrapTooltip({ placement: 'top', animate: false })
|
.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 () {
|
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>')
|
$('head').append('<style id="test"> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>')
|
||||||
|
|
||||||
var container = $('<div />').appendTo('body'),
|
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 target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'right', viewport: null })
|
.bootstrapTooltip({ placement: 'right', viewport: null })
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
// this is some dumb hack shit because sub pixels in firefox
|
// 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))
|
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 () {
|
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>')
|
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
|
||||||
|
|
||||||
var container = $('<div />').appendTo('body'),
|
var container = $('<div />').appendTo('body')
|
||||||
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
|
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
|
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
ok(Math.round(tooltip.offset().top) === 12)
|
ok(Math.round(tooltip.offset().top) === 12)
|
||||||
target.bootstrapTooltip('hide')
|
target.bootstrapTooltip('hide')
|
||||||
|
@ -497,12 +498,12 @@ $(function () {
|
||||||
test('should adjust the tip\'s top when up against the bottom of the viewport', 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>')
|
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
|
||||||
|
|
||||||
var container = $('<div />').appendTo('body'),
|
var container = $('<div />').appendTo('body')
|
||||||
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
|
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
|
.bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
ok(Math.round(tooltip.offset().top) === Math.round($(window).height() - 12 - tooltip[0].offsetHeight))
|
ok(Math.round(tooltip.offset().top) === Math.round($(window).height() - 12 - tooltip[0].offsetHeight))
|
||||||
target.bootstrapTooltip('hide')
|
target.bootstrapTooltip('hide')
|
||||||
|
@ -512,12 +513,12 @@ $(function () {
|
||||||
test('should adjust the tip\'s left when up against the left of the viewport', 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>')
|
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
|
||||||
|
|
||||||
var container = $('<div />').appendTo('body'),
|
var container = $('<div />').appendTo('body')
|
||||||
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
|
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
|
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
ok(Math.round(tooltip.offset().left) === 12)
|
ok(Math.round(tooltip.offset().left) === 12)
|
||||||
target.bootstrapTooltip('hide')
|
target.bootstrapTooltip('hide')
|
||||||
|
@ -527,12 +528,12 @@ $(function () {
|
||||||
test('should adjust the tip\'s left when up against the right of the viewport', 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>')
|
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
|
||||||
|
|
||||||
var container = $('<div />').appendTo('body'),
|
var container = $('<div />').appendTo('body')
|
||||||
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
|
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
|
.bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
ok(Math.round(tooltip.offset().left) === Math.round($(window).width() - 12 - tooltip[0].offsetWidth))
|
ok(Math.round(tooltip.offset().left) === Math.round($(window).width() - 12 - tooltip[0].offsetWidth))
|
||||||
target.bootstrapTooltip('hide')
|
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="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>')
|
$('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'),
|
var container = $('<div />', { 'class': 'container-viewport' }).appendTo('body')
|
||||||
target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
|
var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
|
||||||
.appendTo(container)
|
.appendTo(container)
|
||||||
.bootstrapTooltip({ placement: 'bottom', viewport: '.container-viewport' })
|
.bootstrapTooltip({ placement: 'bottom', viewport: '.container-viewport' })
|
||||||
.bootstrapTooltip('show'),
|
.bootstrapTooltip('show')
|
||||||
tooltip = container.find('.tooltip')
|
var tooltip = container.find('.tooltip')
|
||||||
|
|
||||||
ok(Math.round(tooltip.offset().left) === Math.round(60 + container.width() - tooltip[0].offsetWidth))
|
ok(Math.round(tooltip.offset().left) === Math.round(60 + container.width() - tooltip[0].offsetWidth))
|
||||||
target.bootstrapTooltip('hide')
|
target.bootstrapTooltip('hide')
|
||||||
|
|
|
@ -378,11 +378,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.tip = function () {
|
Tooltip.prototype.tip = function () {
|
||||||
return this.$tip = this.$tip || $(this.options.template)
|
return (this.$tip = this.$tip || $(this.options.template))
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.arrow = function () {
|
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 () {
|
Tooltip.prototype.validate = function () {
|
||||||
|
|
|
@ -34,7 +34,8 @@
|
||||||
|
|
||||||
// http://blog.alexmaccaw.com/css-transitions
|
// http://blog.alexmaccaw.com/css-transitions
|
||||||
$.fn.emulateTransitionEnd = function (duration) {
|
$.fn.emulateTransitionEnd = function (duration) {
|
||||||
var called = false, $el = this
|
var called = false
|
||||||
|
var $el = this
|
||||||
$(this).one($.support.transition.end, function () { called = true })
|
$(this).one($.support.transition.end, function () { called = true })
|
||||||
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
|
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
|
||||||
setTimeout(callback, duration)
|
setTimeout(callback, duration)
|
||||||
|
|
Loading…
Reference in a new issue