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
839b0c89
Commit
839b0c89
authored
12 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
shiiiit
parent
0992a859
1 merge request
!7111
2.3.1 wip
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/js/bootstrap-modal.js
+1
-1
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap.js
+1
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-modal.js
+1
-1
js/bootstrap-modal.js
js/tests/unit/bootstrap-modal.js
+17
-0
js/tests/unit/bootstrap-modal.js
with
21 additions
and
4 deletions
+21
-4
docs/assets/js/bootstrap-modal.js
+
1
-
1
View file @
839b0c89
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
}
}
,
removeBackdrop
:
function
()
{
,
removeBackdrop
:
function
()
{
this
.
$backdrop
.
remove
()
this
.
$backdrop
&&
this
.
$backdrop
.
remove
()
this
.
$backdrop
=
null
this
.
$backdrop
=
null
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
1
-
1
View file @
839b0c89
...
@@ -946,7 +946,7 @@
...
@@ -946,7 +946,7 @@
}
}
,
removeBackdrop
:
function
()
{
,
removeBackdrop
:
function
()
{
this
.
$backdrop
.
remove
()
this
.
$backdrop
&&
this
.
$backdrop
.
remove
()
this
.
$backdrop
=
null
this
.
$backdrop
=
null
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
839b0c89
This diff is collapsed.
Click to expand it.
js/bootstrap-modal.js
+
1
-
1
View file @
839b0c89
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
}
}
,
removeBackdrop
:
function
()
{
,
removeBackdrop
:
function
()
{
this
.
$backdrop
.
remove
()
this
.
$backdrop
&&
this
.
$backdrop
.
remove
()
this
.
$backdrop
=
null
this
.
$backdrop
=
null
}
}
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-modal.js
+
17
-
0
View file @
839b0c89
...
@@ -117,4 +117,21 @@ $(function () {
...
@@ -117,4 +117,21 @@ $(function () {
})
})
.
modal
(
"
toggle
"
)
.
modal
(
"
toggle
"
)
})
})
test
(
"
should allow modal close with 'backdrop:false'
"
,
function
()
{
stop
()
$
.
support
.
transition
=
false
var
div
=
$
(
"
<div>
"
,
{
id
:
'
modal-test
'
,
"
data-backdrop
"
:
false
})
div
.
bind
(
"
shown
"
,
function
()
{
ok
(
$
(
'
#modal-test
'
).
is
(
"
:visible
"
),
'
modal visible
'
)
div
.
modal
(
"
hide
"
)
})
.
bind
(
"
hidden
"
,
function
()
{
ok
(
!
$
(
'
#modal-test
'
).
is
(
"
:visible
"
),
'
modal hidden
'
)
div
.
remove
()
start
()
})
.
modal
(
"
show
"
)
})
})
})
\ No newline at end of file
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