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

rebuild and fix test

Browse Source
This commit is contained in:
Jacob Thornton 2012-05-31 10:24:23 -07:00
parent bcd5097c02
commit 4eaeea81fd
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/css/bootstrap.css vendored
View File

@ -4674,15 +4674,15 @@ a.badge:hover {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
-webkit-transition: width 0.6s ease; -webkit-transition: width 0.6s ease;
-moz-transition: width 0.6s ease; -moz-transition: width 0.6s ease;
-ms-transition: width 0.6s ease; -ms-transition: width 0.6s ease;
-o-transition: width 0.6s ease; -o-transition: width 0.6s ease;
transition: width 0.6s ease; transition: width 0.6s ease;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
} }
.progress-striped .bar { .progress-striped .bar {

4
docs/assets/js/bootstrap-tooltip.js vendored
View File

@ -84,9 +84,9 @@
, leave: function (e) { , leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type) var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide() if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
self.hoverState = 'out' self.hoverState = 'out'
this.timeout = setTimeout(function() { this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide() if (self.hoverState == 'out') self.hide()
@ -272,4 +272,4 @@
, delay: 0 , delay: 0
} }
}(window.jQuery); }(window.jQuery);

5
docs/assets/js/bootstrap.js vendored
View File

@ -968,9 +968,9 @@
, leave: function (e) { , leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type) var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide() if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
self.hoverState = 'out' self.hoverState = 'out'
this.timeout = setTimeout(function() { this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide() if (self.hoverState == 'out') self.hide()
@ -1156,7 +1156,8 @@
, delay: 0 , delay: 0
} }
}(window.jQuery);/* =========================================================== }(window.jQuery);
/* ===========================================================
* bootstrap-popover.js v2.0.3 * bootstrap-popover.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
js/tests/unit/bootstrap-tooltip.js vendored
View File

@ -116,16 +116,16 @@ $(function () {
test("should show tooltip if leave event hasn't occured before delay expires", function () { test("should show tooltip if leave event hasn't occured before delay expires", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.tooltip({ delay: 200 }) .tooltip({ delay: 150 })
stop() stop()
tooltip.trigger('mouseenter') tooltip.trigger('mouseenter')
setTimeout(function () { setTimeout(function () {
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
setTimeout(function () {
ok(!$(".tooltip").is('.fade.in'), 'tooltip has faded in')
start()
}, 200)
}, 100) }, 100)
setTimeout(function () {
ok($(".tooltip").is('.fade.in'), 'tooltip has faded in')
start()
}, 200)
}) })
test("should detect if title string is html or text: foo", function () { test("should detect if title string is html or text: foo", function () {