Skip to content

Y
Yii Bootstrap
You need to sign in or sign up before continuing.
Commit 6e2475d7 by Hikonobu Kurihara
Options

Updated bootstrap.js for CKEditor

https://github.com/twitter/bootstrap/issues/6996
parent ae8672c3
Showing with 3 additions and 3 deletions
assets/js/bootstrap.js
...@@ -906,7 +906,8 @@ ...@@ -906,7 +906,8 @@
, enforceFocus: function () { , enforceFocus: function () {
var that = this var that = this
$(document).on('focusin.modal', function (e) { $(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() that.$element.focus()
} }
}) })
...@@ -2273,4 +2274,4 @@ ...@@ -2273,4 +2274,4 @@
}) })
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment