mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-18 15:54:26 +01:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
This commit is contained in:
commit
2452768259
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -1983,7 +1983,7 @@ table .span12 {
|
||||
.navbar-search .search-query :-moz-placeholder {
|
||||
color: #eeeeee;
|
||||
}
|
||||
.navbar-search .search-query ::-webkit-input-placeholder {
|
||||
.navbar-search .search-query::-webkit-input-placeholder {
|
||||
color: #eeeeee;
|
||||
}
|
||||
.navbar-search .search-query:hover {
|
||||
|
@ -14,12 +14,6 @@
|
||||
// make code pretty
|
||||
window.prettyPrint && prettyPrint()
|
||||
|
||||
// table sort example
|
||||
if ($.fn.tablesorter) {
|
||||
$("#sortTableExample").tablesorter({ sortList: [[1,0]] })
|
||||
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
|
||||
}
|
||||
|
||||
// add-ons
|
||||
$('.add-on :checkbox').on('click', function () {
|
||||
var $this = $(this)
|
||||
|
10
js/bootstrap-alert.js
vendored
10
js/bootstrap-alert.js
vendored
@ -36,9 +36,15 @@
|
||||
|
||||
, close: function ( e ) {
|
||||
var $this = $(this)
|
||||
, selector = $this.attr('data-target') || $this.attr('href')
|
||||
, $parent = $(selector)
|
||||
, selector = $this.attr('data-target')
|
||||
, $parent
|
||||
|
||||
if (!selector) {
|
||||
selector = $this.attr('href')
|
||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||
}
|
||||
|
||||
$parent = $(selector)
|
||||
$parent.trigger('close')
|
||||
|
||||
e && e.preventDefault()
|
||||
|
4
js/bootstrap-carousel.js
vendored
4
js/bootstrap-carousel.js
vendored
@ -143,8 +143,8 @@
|
||||
|
||||
$(function () {
|
||||
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
|
||||
var $this = $(this)
|
||||
, $target = $($this.attr('data-target') || $this.attr('href'))
|
||||
var $this = $(this), href
|
||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
|
||||
$target.carousel(options)
|
||||
e.preventDefault()
|
||||
|
6
js/bootstrap-collapse.js
vendored
6
js/bootstrap-collapse.js
vendored
@ -124,8 +124,10 @@
|
||||
|
||||
$(function () {
|
||||
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
|
||||
var $this = $(this)
|
||||
, target = $this.attr('data-target') || e.preventDefault() || $this.attr('href')
|
||||
var $this = $(this), href
|
||||
, target = $this.attr('data-target')
|
||||
|| e.preventDefault()
|
||||
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
|
||||
, option = $(target).data('collapse') ? 'toggle' : $this.data()
|
||||
$(target).collapse(option)
|
||||
})
|
||||
|
19
js/bootstrap-dropdown.js
vendored
19
js/bootstrap-dropdown.js
vendored
@ -27,7 +27,10 @@
|
||||
|
||||
var toggle = '[data-toggle="dropdown"]'
|
||||
, Dropdown = function ( element ) {
|
||||
$(element).bind('click', this.toggle)
|
||||
var $el = $(element).on('click.dropdown.data-api', this.toggle)
|
||||
$('html').on('click.dropdown.data-api', function () {
|
||||
$el.parent().removeClass('open')
|
||||
})
|
||||
}
|
||||
|
||||
Dropdown.prototype = {
|
||||
@ -36,15 +39,21 @@
|
||||
|
||||
, toggle: function ( e ) {
|
||||
var $this = $(this)
|
||||
, selector = $this.attr('data-target') || $this.attr('href')
|
||||
, $parent = $(selector)
|
||||
, selector = $this.attr('data-target')
|
||||
, $parent
|
||||
, isActive
|
||||
|
||||
if (!selector) {
|
||||
selector = $this.attr('href')
|
||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||
}
|
||||
|
||||
$parent = $(selector)
|
||||
$parent.length || ($parent = $this.parent())
|
||||
|
||||
isActive = $parent.hasClass('open')
|
||||
|
||||
clearMenus()
|
||||
|
||||
!isActive && $parent.toggleClass('open')
|
||||
|
||||
return false
|
||||
@ -76,7 +85,7 @@
|
||||
* =================================== */
|
||||
|
||||
$(function () {
|
||||
$(window).on('click.dropdown.data-api', clearMenus)
|
||||
$('html').on('click.dropdown.data-api', clearMenus)
|
||||
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||
})
|
||||
|
||||
|
4
js/bootstrap-modal.js
vendored
4
js/bootstrap-modal.js
vendored
@ -193,8 +193,8 @@
|
||||
|
||||
$(function () {
|
||||
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
|
||||
var $this = $(this)
|
||||
, $target = $($this.attr('data-target') || $this.attr('href'))
|
||||
var $this = $(this), href
|
||||
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
, option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
|
||||
|
||||
e.preventDefault()
|
||||
|
3
js/bootstrap-scrollspy.js
vendored
3
js/bootstrap-scrollspy.js
vendored
@ -27,10 +27,11 @@
|
||||
function ScrollSpy( element, options) {
|
||||
var process = $.proxy(this.process, this)
|
||||
, $element = $(element).is('body') ? $(window) : $(element)
|
||||
, href
|
||||
this.options = $.extend({}, $.fn.scrollspy.defaults, options)
|
||||
this.$scrollElement = $element.on('scroll.scroll.data-api', process)
|
||||
this.selector = (this.options.target
|
||||
|| $(element).attr('href')
|
||||
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|
||||
|| '') + ' .nav li > a'
|
||||
this.$body = $('body').on('click.scroll.data-api', this.selector, process)
|
||||
this.refresh()
|
||||
|
13
js/bootstrap-tab.js
vendored
13
js/bootstrap-tab.js
vendored
@ -36,9 +36,14 @@
|
||||
, show: function () {
|
||||
var $this = this.element
|
||||
, $ul = $this.closest('ul:not(.dropdown-menu)')
|
||||
, href = $this.attr('data-target') || $this.attr('href')
|
||||
, selector = $this.attr('data-target')
|
||||
, previous
|
||||
, $href
|
||||
, $target
|
||||
|
||||
if (!selector) {
|
||||
selector = $this.attr('href')
|
||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||
}
|
||||
|
||||
if ( $this.parent('li').hasClass('active') ) return
|
||||
|
||||
@ -49,10 +54,10 @@
|
||||
, relatedTarget: previous
|
||||
})
|
||||
|
||||
$href = $(href)
|
||||
$target = $(selector)
|
||||
|
||||
this.activate($this.parent('li'), $ul)
|
||||
this.activate($href, $href.parent(), function () {
|
||||
this.activate($target, $target.parent(), function () {
|
||||
$this.trigger({
|
||||
type: 'shown'
|
||||
, relatedTarget: previous
|
||||
|
1
js/bootstrap-tooltip.js
vendored
1
js/bootstrap-tooltip.js
vendored
@ -145,7 +145,6 @@
|
||||
break
|
||||
}
|
||||
|
||||
debugger
|
||||
if (this.options['z-index']) tp['z-index'] = this.options['z-index']
|
||||
|
||||
$tip
|
||||
|
2
js/tests/unit/bootstrap-popover.js
vendored
2
js/tests/unit/bootstrap-popover.js
vendored
@ -82,7 +82,7 @@ $(function () {
|
||||
})
|
||||
|
||||
popover.popover('show')
|
||||
console.log(popover)
|
||||
|
||||
ok($('.popover').length, 'popover was inserted')
|
||||
ok($('.popover').hasClass('foobar'), 'custom class is present')
|
||||
|
||||
|
1
js/tests/unit/bootstrap-tab.js
vendored
1
js/tests/unit/bootstrap-tab.js
vendored
@ -17,7 +17,6 @@ $(function () {
|
||||
+ '<li><a href="#profile">Profile</a></li>'
|
||||
+ '</ul>'
|
||||
|
||||
|
||||
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
|
||||
|
||||
$(tabsHTML).find('li:last a').tab('show')
|
||||
|
2
js/tests/unit/bootstrap-transition.js
vendored
2
js/tests/unit/bootstrap-transition.js
vendored
@ -7,7 +7,7 @@ $(function () {
|
||||
})
|
||||
|
||||
test("should provide an end object", function () {
|
||||
ok($.support.transition.end, 'end string is defined')
|
||||
ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
|
||||
})
|
||||
|
||||
})
|
Loading…
x
Reference in New Issue
Block a user