Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/refactor

Browse source
This commit is contained in:
Julia Radzhabova 2016-10-14 17:13:51 +03:00
parent 3e5fff37e8 963202b919
commit ccd2a7fcea
6 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Main.js
View file

@ -163,8 +163,10 @@ define([
$(document.body).on('blur', 'input, textarea', function(e) { $(document.body).on('blur', 'input, textarea', function(e) {
if (!me.isModalShowed) { if (!me.isModalShowed) {
if (!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* When focus in combobox goes from input to it's menu button or menu items */ if (!e.relatedTarget ||
|| !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 */
&& (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" */ {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;

2
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -169,7 +169,7 @@
font-size: 12px; font-size: 12px;
> label { > label {
white-space: initial; white-space: normal;
} }
#status-users-list { #status-users-list {

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -151,8 +151,10 @@ define([
$(document.body).on('blur', 'input, textarea', function(e) { $(document.body).on('blur', 'input, textarea', function(e) {
if (!me.isModalShowed) { if (!me.isModalShowed) {
if (!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* When focus in combobox goes from input to it's menu button or menu items */ if (!e.relatedTarget ||
|| !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 */
&& (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" */ {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;

2
apps/presentationeditor/main/resources/less/statusbar.less
View file

@ -118,7 +118,7 @@
font-size: 12px; font-size: 12px;
> label { > label {
white-space: initial; white-space: normal;
} }
#status-users-list { #status-users-list {

9
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -159,13 +159,16 @@ define([
$(document.body).on('blur', 'input, textarea', function(e) { $(document.body).on('blur', 'input, textarea', function(e) {
if (this.isAppDisabled === true) return; if (this.isAppDisabled === true) return;
if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible()) && if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible())) {
(!/area_id/.test(e.target.id) && $(e.target).parent().find(e.relatedTarget).length<1 /* When focus in combobox goes from input to it's menu button or menu items */ if (!e.relatedTarget ||
|| !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 */
&& (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" */ {
me.api.asc_enableKeyEvents(true); me.api.asc_enableKeyEvents(true);
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
me.dontCloseDummyComment = false; me.dontCloseDummyComment = false;
} }
}
}).on('dragover', function(e) { }).on('dragover', function(e) {
var event = e.originalEvent; var event = e.originalEvent;
if (event.target && $(event.target).closest('#editor_sdk').length<1 ) { if (event.target && $(event.target).closest('#editor_sdk').length<1 ) {

2
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -66,7 +66,7 @@
right: 0; right: 0;
> label { > label {
white-space: initial; white-space: normal;
} }
#status-users-list { #status-users-list {