Fix Bug 35851.
This commit is contained in:
parent
90ae0245bd
commit
ceb67537ac
|
@ -196,7 +196,7 @@ define([
|
||||||
$(document.body).on('blur', 'input, textarea', function(e) {
|
$(document.body).on('blur', 'input, textarea', function(e) {
|
||||||
if (!me.isModalShowed) {
|
if (!me.isModalShowed) {
|
||||||
if (!e.relatedTarget ||
|
if (!e.relatedTarget ||
|
||||||
!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* Check if focus in combobox goes from input to it's menu button or menu items */
|
!/area_id/.test(e.target.id) && (e.relatedTarget.localName != 'input' || $(e.target).parent().find(e.relatedTarget).length<1) /* Check if focus in combobox goes from input to it's menu button or menu items */
|
||||||
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
||||||
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
||||||
me.api.asc_enableKeyEvents(true);
|
me.api.asc_enableKeyEvents(true);
|
||||||
|
|
|
@ -192,7 +192,7 @@ define([
|
||||||
$(document.body).on('blur', 'input, textarea', function(e) {
|
$(document.body).on('blur', 'input, textarea', function(e) {
|
||||||
if (!me.isModalShowed) {
|
if (!me.isModalShowed) {
|
||||||
if (!e.relatedTarget ||
|
if (!e.relatedTarget ||
|
||||||
!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* Check if focus in combobox goes from input to it's menu button or menu items */
|
!/area_id/.test(e.target.id) && (e.relatedTarget.localName != 'input' || $(e.target).parent().find(e.relatedTarget).length<1) /* Check if focus in combobox goes from input to it's menu button or menu items */
|
||||||
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
||||||
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
||||||
me.api.asc_enableKeyEvents(true);
|
me.api.asc_enableKeyEvents(true);
|
||||||
|
|
|
@ -201,7 +201,7 @@ define([
|
||||||
|
|
||||||
if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible())) {
|
if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible())) {
|
||||||
if (!e.relatedTarget ||
|
if (!e.relatedTarget ||
|
||||||
!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* Check if focus in combobox goes from input to it's menu button or menu items */
|
!/area_id/.test(e.target.id) && (e.relatedTarget.localName != 'input' || $(e.target).parent().find(e.relatedTarget).length<1) /* Check if focus in combobox goes from input to it's menu button or menu items */
|
||||||
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
&& (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */
|
||||||
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
&& (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ {
|
||||||
me.api.asc_enableKeyEvents(true);
|
me.api.asc_enableKeyEvents(true);
|
||||||
|
|
Loading…
Reference in a new issue