Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
59153205
Commit
59153205
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
run make on js files
parent
3875a9f3
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/js/bootstrap-carousel.js
+1
-1
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-popover.js
+4
-0
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-tooltip.js
+4
-0
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap.js
+9
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
docs/javascript.html
+7
-1
docs/javascript.html
with
26 additions
and
4 deletions
+26
-4
docs/assets/js/bootstrap-carousel.js
+
1
-
1
View file @
59153205
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
}
}
,
slide
:
function
(
type
,
next
)
{
,
slide
:
function
(
type
,
next
)
{
var
$active
=
this
.
$element
.
find
(
'
.active
'
)
var
$active
=
this
.
$element
.
find
(
'
.
item.
active
'
)
,
$next
=
next
||
$active
[
type
]()
,
$next
=
next
||
$active
[
type
]()
,
isCycling
=
this
.
interval
,
isCycling
=
this
.
interval
,
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
,
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-popover.js
+
4
-
0
View file @
59153205
...
@@ -71,6 +71,10 @@
...
@@ -71,6 +71,10 @@
return
this
.
$tip
return
this
.
$tip
}
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
popover
'
)
}
})
})
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-tooltip.js
+
4
-
0
View file @
59153205
...
@@ -235,6 +235,10 @@
...
@@ -235,6 +235,10 @@
this
[
this
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
this
[
this
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
}
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
tooltip
'
)
}
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
9
-
1
View file @
59153205
...
@@ -332,7 +332,7 @@
...
@@ -332,7 +332,7 @@
}
}
,
slide
:
function
(
type
,
next
)
{
,
slide
:
function
(
type
,
next
)
{
var
$active
=
this
.
$element
.
find
(
'
.active
'
)
var
$active
=
this
.
$element
.
find
(
'
.
item.
active
'
)
,
$next
=
next
||
$active
[
type
]()
,
$next
=
next
||
$active
[
type
]()
,
isCycling
=
this
.
interval
,
isCycling
=
this
.
interval
,
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
,
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
...
@@ -1188,6 +1188,10 @@
...
@@ -1188,6 +1188,10 @@
this
[
this
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
this
[
this
.
tip
().
hasClass
(
'
in
'
)
?
'
hide
'
:
'
show
'
]()
}
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
tooltip
'
)
}
}
}
...
@@ -1291,6 +1295,10 @@
...
@@ -1291,6 +1295,10 @@
return
this
.
$tip
return
this
.
$tip
}
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
popover
'
)
}
})
})
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
59153205
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
7
-
1
View file @
59153205
...
@@ -830,6 +830,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -830,6 +830,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h4>
.tooltip('toggle')
</h4>
<h4>
.tooltip('toggle')
</h4>
<p>
Toggles an element's tooltip.
</p>
<p>
Toggles an element's tooltip.
</p>
<pre
class=
"prettyprint linenums"
>
$('#element').tooltip('toggle')
</pre>
<pre
class=
"prettyprint linenums"
>
$('#element').tooltip('toggle')
</pre>
<h4>
.tooltip('destroy')
</h4>
<p>
Destroys an element's tooltip.
</p>
<pre
class=
"prettyprint linenums"
>
$('#element').tooltip('destroy')
</pre>
</section>
</section>
...
@@ -896,7 +899,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -896,7 +899,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>
trigger
</td>
<td>
trigger
</td>
<td>
string
</td>
<td>
string
</td>
<td>
'hover'
</td>
<td>
'hover'
</td>
<td>
how
tooltip
is triggered - hover | focus | manual
</td>
<td>
how
popover
is triggered - hover | focus | manual
</td>
</tr>
</tr>
<tr>
<tr>
<td>
title
</td>
<td>
title
</td>
...
@@ -942,6 +945,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -942,6 +945,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h4>
.popover('toggle')
</h4>
<h4>
.popover('toggle')
</h4>
<p>
Toggles an elements popover.
</p>
<p>
Toggles an elements popover.
</p>
<pre
class=
"prettyprint linenums"
>
$('#element').popover('toggle')
</pre>
<pre
class=
"prettyprint linenums"
>
$('#element').popover('toggle')
</pre>
<h4>
.popover('destroy')
</h4>
<p>
Destroys an element's popover.
</p>
<pre
class=
"prettyprint linenums"
>
$('#element').popover('destroy')
</pre>
</section>
</section>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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