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

Fix Bug 33597 (+ disable clicking on btnCancel when frame is loading).

Browse source
This commit is contained in:
Julia Radzhabova 2016-12-05 17:08:58 +03:00
parent f58a06c621
commit dd1a531707
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -62,7 +62,7 @@ define([
'<div class="separator horizontal"/>', '<div class="separator horizontal"/>',
'<div class="footer" style="text-align: center;">', '<div class="footer" style="text-align: center;">',
'<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok" style="margin-right: 10px;">' + this.textSave + '</button>', '<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok" style="margin-right: 10px;">' + this.textSave + '</button>',
'<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn disabled" result="cancel">' + this.textClose + '</button>', '<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel">' + this.textClose + '</button>',
'</div>' '</div>'
].join(''); ].join('');

8
apps/common/main/resources/less/buttons.less
View file

@ -454,8 +454,8 @@
color: @gray-deep; color: @gray-deep;
background-color: @secondary; background-color: @secondary;
&:hover, &:hover:not(.disabled),
&.hover { &.hover:not(.disabled) {
background-color: @secondary-hover; background-color: @secondary-hover;
} }
@ -463,8 +463,8 @@
color: #fff; color: #fff;
background-color: @primary; background-color: @primary;
&:hover, &:hover:not(.disabled),
&.hover { &.hover:not(.disabled) {
background-color: @primary-hover; background-color: @primary-hover;
} }
} }

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

@ -158,7 +158,7 @@ define([
var me = this; var me = this;
// Syncronize focus with api // Syncronize focus with api
$(document.body).on('focus', 'input, textarea:not(#ce-cell-content)', function(e) { $(document.body).on('focus', 'input, textarea:not(#ce-cell-content)', function(e) {
if (this.isAppDisabled === true) return; if (me.isAppDisabled === true) return;
if (e && e.target && !/area_id/.test(e.target.id)) { if (e && e.target && !/area_id/.test(e.target.id)) {
if (/msg-reply/.test(e.target.className)) if (/msg-reply/.test(e.target.className))
@ -167,7 +167,8 @@ define([
}); });
$(document.body).on('blur', 'input, textarea', function(e) { $(document.body).on('blur', 'input, textarea', function(e) {
if (this.isAppDisabled === true) return; if (me.isAppDisabled === true || me.isFrameClosed) return;
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.target).parent().find(e.relatedTarget).length<1 /* Check if focus in combobox goes from input to it's menu button or menu items */
@ -284,6 +285,8 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
}, },
loadDocument: function(data) { loadDocument: function(data) {
@ -1617,6 +1620,7 @@ define([
break; break;
case 'queryClose': case 'queryClose':
if ($('body .asc-window:visible').length === 0) { if ($('body .asc-window:visible').length === 0) {
this.isFrameClosed = true;
this.api.asc_closeCellEditor(); this.api.asc_closeCellEditor();
Common.Gateway.internalMessage('canClose', {mr:data.data.mr, answer: true}); Common.Gateway.internalMessage('canClose', {mr:data.data.mr, answer: true});
} }
@ -1634,6 +1638,7 @@ define([
setChartData: function(chart) { setChartData: function(chart) {
if (typeof chart === 'object' && this.api) { if (typeof chart === 'object' && this.api) {
this.api.asc_addChartDrawingObject(chart); this.api.asc_addChartDrawingObject(chart);
this.isFrameClosed = false;
} }
}, },
@ -1656,6 +1661,7 @@ define([
setMergeData: function(merge) { setMergeData: function(merge) {
if (typeof merge === 'object' && this.api) { if (typeof merge === 'object' && this.api) {
this.api.asc_setData(merge); this.api.asc_setData(merge);
this.isFrameClosed = false;
} }
}, },