Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
masonstrap
Commits
6483ff00
Commit
6483ff00
authored
Nov 13, 2012
by
Thomas Park
Browse files
index: updated bootstrap.js to 2.2.1
parent
79e3ce8a
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
js/bootstrap.js
View file @
6483ff00
/* ===================================================
* bootstrap-transition.js v2.
1
.1
* bootstrap-transition.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -20,13 +20,13 @@
!
function
(
$
)
{
$
(
function
()
{
"
use strict
"
;
// jshint ;_;
"
use strict
"
;
// jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$
(
function
()
{
$
.
support
.
transition
=
(
function
()
{
...
...
@@ -58,7 +58,7 @@
})
}(
window
.
jQuery
);
/* ==========================================================
* bootstrap-alert.js v2.
1
.1
* bootstrap-alert.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -142,12 +142,10 @@
/* ALERT DATA-API
* ============== */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.alert.data-api
'
,
dismiss
,
Alert
.
prototype
.
close
)
})
$
(
document
).
on
(
'
click.alert.data-api
'
,
dismiss
,
Alert
.
prototype
.
close
)
}(
window
.
jQuery
);
/* ============================================================
* bootstrap-button.js v2.
1
.1
* bootstrap-button.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -233,16 +231,14 @@
/* BUTTON DATA-API
* =============== */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.button.data-api
'
,
'
[data-toggle^=button]
'
,
function
(
e
)
{
var
$btn
=
$
(
e
.
target
)
if
(
!
$btn
.
hasClass
(
'
btn
'
))
$btn
=
$btn
.
closest
(
'
.btn
'
)
$btn
.
button
(
'
toggle
'
)
})
$
(
document
).
on
(
'
click.button.data-api
'
,
'
[data-toggle^=button]
'
,
function
(
e
)
{
var
$btn
=
$
(
e
.
target
)
if
(
!
$btn
.
hasClass
(
'
btn
'
))
$btn
=
$btn
.
closest
(
'
.btn
'
)
$btn
.
button
(
'
toggle
'
)
})
}(
window
.
jQuery
);
/* ==========================================================
* bootstrap-carousel.js v2.
1
.1
* bootstrap-carousel.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -337,9 +333,7 @@
,
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
,
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
,
that
=
this
,
e
=
$
.
Event
(
'
slide
'
,
{
relatedTarget
:
$next
[
0
]
})
,
e
this
.
sliding
=
true
...
...
@@ -347,6 +341,10 @@
$next
=
$next
.
length
?
$next
:
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
e
=
$
.
Event
(
'
slide
'
,
{
relatedTarget
:
$next
[
0
]
})
if
(
$next
.
hasClass
(
'
active
'
))
return
if
(
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
slide
'
))
{
...
...
@@ -406,18 +404,16 @@
/* CAROUSEL DATA-API
* ================= */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.carousel.data-api
'
,
'
[data-slide]
'
,
function
(
e
)
{
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
()
})
$
(
document
).
on
(
'
click.carousel.data-api
'
,
'
[data-slide]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
))
//strip for ie7
,
options
=
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
$target
.
carousel
(
options
)
e
.
preventDefault
()
})
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-collapse.js v2.
1
.1
* bootstrap-collapse.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -561,20 +557,18 @@
/* COLLAPSIBLE DATA-API
* ==================== */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.collapse.data-api
'
,
'
[data-toggle=collapse]
'
,
function
(
e
)
{
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
()
$this
[
$
(
target
).
hasClass
(
'
in
'
)
?
'
addClass
'
:
'
removeClass
'
](
'
collapsed
'
)
$
(
target
).
collapse
(
option
)
})
$
(
document
).
on
(
'
click.collapse.data-api
'
,
'
[data-toggle=collapse]
'
,
function
(
e
)
{
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
()
$this
[
$
(
target
).
hasClass
(
'
in
'
)
?
'
addClass
'
:
'
removeClass
'
](
'
collapsed
'
)
$
(
target
).
collapse
(
option
)
})
}(
window
.
jQuery
);
/* ============================================================
* bootstrap-dropdown.js v2.
1
.1
* bootstrap-dropdown.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -675,8 +669,9 @@
}
function
clearMenus
()
{
getParent
(
$
(
toggle
))
.
removeClass
(
'
open
'
)
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
}
function
getParent
(
$this
)
{
...
...
@@ -713,17 +708,14 @@
/* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */
$
(
function
()
{
$
(
'
html
'
)
.
on
(
'
click.dropdown.data-api touchstart.dropdown.data-api
'
,
clearMenus
)
$
(
'
body
'
)
.
on
(
'
click.dropdown touchstart.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api touchstart.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.dropdown.data-api touchstart.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
})
$
(
document
)
.
on
(
'
click.dropdown.data-api touchstart.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.dropdown touchstart.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.dropdown.data-api touchstart.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.dropdown.data-api touchstart.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
}(
window
.
jQuery
);
/* =========================================================
* bootstrap-modal.js v2.
1
.1
* bootstrap-modal.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -773,8 +765,6 @@
if
(
this
.
isShown
||
e
.
isDefaultPrevented
())
return
$
(
'
body
'
).
addClass
(
'
modal-open
'
)
this
.
isShown
=
true
this
.
escape
()
...
...
@@ -796,13 +786,12 @@
that
.
$element
.
addClass
(
'
in
'
)
.
attr
(
'
aria-hidden
'
,
false
)
.
focus
()
that
.
enforceFocus
()
transition
?
that
.
$element
.
one
(
$
.
support
.
transition
.
end
,
function
()
{
that
.
$element
.
trigger
(
'
shown
'
)
})
:
that
.
$element
.
trigger
(
'
shown
'
)
that
.
$element
.
one
(
$
.
support
.
transition
.
end
,
function
()
{
that
.
$element
.
focus
().
trigger
(
'
shown
'
)
})
:
that
.
$element
.
focus
().
trigger
(
'
shown
'
)
})
}
...
...
@@ -820,8 +809,6 @@
this
.
isShown
=
false
$
(
'
body
'
).
removeClass
(
'
modal-open
'
)
this
.
escape
()
$
(
document
).
off
(
'
focusin.modal
'
)
...
...
@@ -891,9 +878,11 @@
this
.
$backdrop
=
$
(
'
<div class="modal-backdrop
'
+
animate
+
'
" />
'
)
.
appendTo
(
document
.
body
)
if
(
this
.
options
.
backdrop
!=
'
static
'
)
{
this
.
$backdrop
.
click
(
$
.
proxy
(
this
.
hide
,
this
))
}
this
.
$backdrop
.
click
(
this
.
options
.
backdrop
==
'
static
'
?
$
.
proxy
(
this
.
$element
[
0
].
focus
,
this
.
$element
[
0
])
:
$
.
proxy
(
this
.
hide
,
this
)
)
if
(
doAnimate
)
this
.
$backdrop
[
0
].
offsetWidth
// force reflow
...
...
@@ -943,25 +932,24 @@
/* MODAL DATA-API
* ============== */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.modal.data-api
'
,
'
[data-toggle="modal"]
'
,
function
(
e
)
{
var
$this
=
$
(
this
)
,
href
=
$this
.
attr
(
'
href
'
)
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
)))
//strip for ie7
,
option
=
$target
.
data
(
'
modal
'
)
?
'
toggle
'
:
$
.
extend
({
remote
:
!
/#/
.
test
(
href
)
&&
href
},
$target
.
data
(),
$this
.
data
())
$
(
document
).
on
(
'
click.modal.data-api
'
,
'
[data-toggle="modal"]
'
,
function
(
e
)
{
var
$this
=
$
(
this
)
,
href
=
$this
.
attr
(
'
href
'
)
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
)))
//strip for ie7
,
option
=
$target
.
data
(
'
modal
'
)
?
'
toggle
'
:
$
.
extend
({
remote
:
!
/#/
.
test
(
href
)
&&
href
},
$target
.
data
(),
$this
.
data
())
e
.
preventDefault
()
e
.
preventDefault
()
$target
.
modal
(
option
)
.
one
(
'
hide
'
,
function
()
{
$this
.
focus
()
})
})
$target
.
modal
(
option
)
.
one
(
'
hide
'
,
function
()
{
$this
.
focus
()
})
})
}(
window
.
jQuery
);
/* ===========================================================
* bootstrap-tooltip.js v2.1.1
}(
window
.
jQuery
);
/* ===========================================================
* bootstrap-tooltip.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
...
...
@@ -1081,9 +1069,9 @@
inside
=
/in/
.
test
(
placement
)
$tip
.
remove
()
.
detach
()
.
css
({
top
:
0
,
left
:
0
,
display
:
'
block
'
})
.
appendTo
(
inside
?
this
.
$element
:
document
.
body
)
.
insertAfter
(
this
.
$element
)
pos
=
this
.
getPosition
(
inside
)
...
...
@@ -1106,7 +1094,7 @@
}
$tip
.
css
(
tp
)
.
offset
(
tp
)
.
addClass
(
placement
)
.
addClass
(
'
in
'
)
}
...
...
@@ -1128,18 +1116,18 @@
function
removeWithAnimation
()
{
var
timeout
=
setTimeout
(
function
()
{
$tip
.
off
(
$
.
support
.
transition
.
end
).
remove
()
$tip
.
off
(
$
.
support
.
transition
.
end
).
detach
()
},
500
)
$tip
.
one
(
$
.
support
.
transition
.
end
,
function
()
{
clearTimeout
(
timeout
)
$tip
.
remove
()
$tip
.
detach
()
})
}
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
removeWithAnimation
()
:
$tip
.
remove
()
$tip
.
detach
()
return
this
}
...
...
@@ -1197,8 +1185,9 @@
this
.
enabled
=
!
this
.
enabled
}
,
toggle
:
function
()
{
this
[
this
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
,
toggle
:
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
self
[
self
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
}
,
destroy
:
function
()
{
...
...
@@ -1231,12 +1220,11 @@
,
trigger
:
'
hover
'
,
title
:
''
,
delay
:
0
,
html
:
tru
e
,
html
:
fals
e
}
}(
window
.
jQuery
);
/* ===========================================================
* bootstrap-popover.js v2.1.1
}(
window
.
jQuery
);
/* ===========================================================
* bootstrap-popover.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -1338,7 +1326,7 @@
})
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-scrollspy.js v2.
1
.1
* bootstrap-scrollspy.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -1488,7 +1476,7 @@
})
}(
window
.
jQuery
);
/* ========================================================
* bootstrap-tab.js v2.
1
.1
* bootstrap-tab.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -1538,7 +1526,7 @@
if
(
$this
.
parent
(
'
li
'
).
hasClass
(
'
active
'
)
)
return
previous
=
$ul
.
find
(
'
.active
a
'
).
last
(
)[
0
]
previous
=
$ul
.
find
(
'
.active
:
last
a
'
)[
0
]
e
=
$
.
Event
(
'
show
'
,
{
relatedTarget
:
previous
...
...
@@ -1614,15 +1602,13 @@
/* TAB DATA-API
* ============ */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
click.tab.data-api
'
,
'
[data-toggle="tab"], [data-toggle="pill"]
'
,
function
(
e
)
{
e
.
preventDefault
()
$
(
this
).
tab
(
'
show
'
)
})
$
(
document
).
on
(
'
click.tab.data-api
'
,
'
[data-toggle="tab"], [data-toggle="pill"]
'
,
function
(
e
)
{
e
.
preventDefault
()
$
(
this
).
tab
(
'
show
'
)
})
}(
window
.
jQuery
);
/* =============================================================
* bootstrap-typeahead.js v2.
1
.1
* bootstrap-typeahead.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -1797,7 +1783,7 @@
.
on
(
'
keypress
'
,
$
.
proxy
(
this
.
keypress
,
this
))
.
on
(
'
keyup
'
,
$
.
proxy
(
this
.
keyup
,
this
))
if
(
$
.
browser
.
chrome
||
$
.
browser
.
webkit
||
$
.
browser
.
msie
)
{
if
(
this
.
eventSupported
(
'
keydown
'
)
)
{
this
.
$element
.
on
(
'
keydown
'
,
$
.
proxy
(
this
.
keydown
,
this
))
}
...
...
@@ -1806,6 +1792,15 @@
.
on
(
'
mouseenter
'
,
'
li
'
,
$
.
proxy
(
this
.
mouseenter
,
this
))
}
,
eventSupported
:
function
(
eventName
)
{
var
isSupported
=
eventName
in
this
.
$element
if
(
!
isSupported
)
{
this
.
$element
.
setAttribute
(
eventName
,
'
return;
'
)
isSupported
=
typeof
this
.
$element
[
eventName
]
===
'
function
'
}
return
isSupported
}
,
move
:
function
(
e
)
{
if
(
!
this
.
shown
)
return
...
...
@@ -1844,6 +1839,9 @@
switch
(
e
.
keyCode
)
{
case
40
:
// down arrow
case
38
:
// up arrow
case
16
:
// shift
case
17
:
// ctrl
case
18
:
// alt
break
case
9
:
// tab
...
...
@@ -1911,18 +1909,16 @@
/* TYPEAHEAD DATA-API
* ================== */
$
(
function
()
{
$
(
'
body
'
).
on
(
'
focus.typeahead.data-api
'
,
'
[data-provide="typeahead"]
'
,
function
(
e
)
{
var
$this
=
$
(
this
)
if
(
$this
.
data
(
'
typeahead
'
))
return
e
.
preventDefault
()
$this
.
typeahead
(
$this
.
data
())
})
$
(
document
).
on
(
'
focus.typeahead.data-api
'
,
'
[data-provide="typeahead"]
'
,
function
(
e
)
{
var
$this
=
$
(
this
)
if
(
$this
.
data
(
'
typeahead
'
))
return
e
.
preventDefault
()
$this
.
typeahead
(
$this
.
data
())
})
}(
window
.
jQuery
);
/* ==========================================================
* bootstrap-affix.js v2.
1
.1
* bootstrap-affix.js v2.
2
.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
...
...
@@ -1951,7 +1947,9 @@
var
Affix
=
function
(
element
,
options
)
{
this
.
options
=
$
.
extend
({},
$
.
fn
.
affix
.
defaults
,
options
)
this
.
$window
=
$
(
window
).
on
(
'
scroll.affix.data-api
'
,
$
.
proxy
(
this
.
checkPosition
,
this
))
this
.
$window
=
$
(
window
)
.
on
(
'
scroll.affix.data-api
'
,
$
.
proxy
(
this
.
checkPosition
,
this
))
.
on
(
'
click.affix.data-api
'
,
$
.
proxy
(
function
()
{
setTimeout
(
$
.
proxy
(
this
.
checkPosition
,
this
),
1
)
},
this
))
this
.
$element
=
$
(
element
)
this
.
checkPosition
()
}
...
...
js/bootstrap.min.js
View file @
6483ff00
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment