Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
Yii Bootstrap
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Common
Yii Bootstrap
Commits
6e2475d7
Commit
6e2475d7
authored
Apr 30, 2013
by
Hikonobu Kurihara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated bootstrap.js for CKEditor
https://github.com/twitter/bootstrap/issues/6996
parent
ae8672c3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
bootstrap.js
assets/js/bootstrap.js
+3
-3
No files found.
assets/js/bootstrap.js
View file @
6e2475d7
...
...
@@ -906,7 +906,8 @@
,
enforceFocus
:
function
()
{
var
that
=
this
$
(
document
).
on
(
'focusin.modal'
,
function
(
e
)
{
if
(
that
.
$element
[
0
]
!==
e
.
target
&&
!
that
.
$element
.
has
(
e
.
target
).
length
)
{
//if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
if
(
that
.
$element
[
0
]
!==
e
.
target
&&
!
that
.
$element
.
has
(
e
.
target
).
length
&&
!
$
(
e
.
target
.
parentNode
).
hasClass
(
'cke_dialog_ui_input_select'
)
&&
!
$
(
e
.
target
.
parentNode
).
hasClass
(
'cke_dialog_ui_input_text'
))
{
that
.
$element
.
focus
()
}
})
...
...
@@ -2273,4 +2274,4 @@
})
}(
window
.
jQuery
);
\ No newline at end of file
}(
window
.
jQuery
);
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