Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
c595db19
Commit
c595db19
authored
11 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#10911
- add loading event for use with remote option :|
parent
499cca21
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
dist/js/bootstrap.js
+3
-1
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
+1
-1
docs-assets/js/raw-files.js
javascript.html
+4
-0
javascript.html
js/modal.js
+3
-1
js/modal.js
with
12 additions
and
4 deletions
+12
-4
dist/js/bootstrap.js
+
3
-
1
View file @
c595db19
...
@@ -787,7 +787,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -787,7 +787,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
this
.
$backdrop
=
this
.
$backdrop
=
this
.
isShown
=
null
this
.
isShown
=
null
if
(
this
.
options
.
remote
)
this
.
$element
.
find
(
'
.modal-content
'
).
load
(
this
.
options
.
remote
)
if
(
this
.
options
.
remote
)
this
.
$element
.
find
(
'
.modal-content
'
).
load
(
this
.
options
.
remote
,
$
.
proxy
(
function
()
{
this
.
$element
.
trigger
(
'
loaded.bs.modal
'
)
},
this
))
}
}
Modal
.
DEFAULTS
=
{
Modal
.
DEFAULTS
=
{
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
c595db19
This diff is collapsed.
Click to expand it.
docs-assets/js/raw-files.js
+
1
-
1
View file @
c595db19
This diff is collapsed.
Click to expand it.
javascript.html
+
4
-
0
View file @
c595db19
...
@@ -403,6 +403,10 @@ $('#myModal').modal({
...
@@ -403,6 +403,10 @@ $('#myModal').modal({
<td>
hidden.bs.modal
</td>
<td>
hidden.bs.modal
</td>
<td>
This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).
</td>
<td>
This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).
</td>
</tr>
</tr>
<tr>
<td>
loaded.bs.modal
</td>
<td>
This event is fired when the modal has loaded content using the remote option.
</td>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
<!-- /.table-responsive -->
</div>
<!-- /.table-responsive -->
...
...
This diff is collapsed.
Click to expand it.
js/modal.js
+
3
-
1
View file @
c595db19
...
@@ -18,7 +18,9 @@
...
@@ -18,7 +18,9 @@
this
.
$backdrop
=
this
.
$backdrop
=
this
.
isShown
=
null
this
.
isShown
=
null
if
(
this
.
options
.
remote
)
this
.
$element
.
find
(
'
.modal-content
'
).
load
(
this
.
options
.
remote
)
if
(
this
.
options
.
remote
)
this
.
$element
.
find
(
'
.modal-content
'
).
load
(
this
.
options
.
remote
,
$
.
proxy
(
function
()
{
this
.
$element
.
trigger
(
'
loaded.bs.modal
'
)
},
this
))
}
}
Modal
.
DEFAULTS
=
{
Modal
.
DEFAULTS
=
{
...
...
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
Menu
Explore
Projects
Groups
Snippets