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

Fix Bug 57652

Browse source
This commit is contained in:
Julia Radzhabova 2022-06-25 22:36:11 +03:00
parent 7975609bd4
commit 22f765387f
6 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -8,10 +8,10 @@
<section class="panel static">
<div class="group no-mask small">
<div class="elset">
<span class="btn-slot" id="slot-btn-print"></span>
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
<span class="btn-slot" id="slot-btn-print"></span>
</div>
</div>
<div class="separator long"></div>

9
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -191,7 +191,7 @@ define([
lock: [_set.cantPrint, _set.disableOnStart],
signals: ['disabled'],
dataHint: '1',
dataHintDirection: 'top',
dataHintDirection: 'bottom',
dataHintTitle: 'P'
});
this.toolbarControls.push(this.btnPrint);
@ -203,7 +203,7 @@ define([
lock: [_set.lostConnect, _set.disableOnStart],
signals: ['disabled'],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintDirection: 'top',
dataHintTitle: 'S'
});
this.toolbarControls.push(this.btnSave);
@ -2419,8 +2419,11 @@ define([
this.synchTooltip.hide();
if (!mode.enableDownload)
this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else
} else {
this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
!mode.canPrint && this.btnPrint.hide();
}
this.mode = mode;

4
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -8,10 +8,10 @@
<section class="panel static">
<div class="group no-mask small">
<div class="elset">
<span class="btn-slot" id="slot-btn-print"></span>
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
<span class="btn-slot" id="slot-btn-print"></span>
</div>
</div>
<div class="separator long"></div>

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -211,7 +211,7 @@ define([
lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart],
signals: ['disabled'],
dataHint: '1',
dataHintDirection: 'top',
dataHintDirection: 'bottom',
dataHintTitle: 'P'
});
me.slideOnlyControls.push(me.btnPrint);
@ -223,7 +223,7 @@ define([
lock: [_set.lostConnect],
signals: ['disabled'],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintDirection: 'top',
dataHintTitle: 'S'
});
me.btnCollabChanges = me.btnSave;
@ -1588,8 +1588,10 @@ define([
this.synchTooltip.hide();
if (!mode.enableDownload)
this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else
} else {
this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
!mode.canPrint && this.btnPrint.hide();
}
this.mode = mode;
},

4
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -8,10 +8,10 @@
<section class="panel static">
<div class="group no-mask small">
<div class="elset">
<span class="btn-slot" id="slot-btn-print"></span>
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-save" data-layout-name="toolbar-save"></span>
<span class="btn-slot" id="slot-btn-print"></span>
</div>
</div>
<div class="separator long"></div>

5
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -783,7 +783,7 @@ define([
lock : [_set.editCell, _set.cantPrint, _set.disableOnStart],
signals: ['disabled'],
dataHint : '1',
dataHintDirection: 'top',
dataHintDirection: 'bottom',
dataHintTitle: 'P'
});
@ -794,7 +794,7 @@ define([
lock : [_set.lostConnect],
signals : ['disabled'],
dataHint : '1',
dataHintDirection: 'bottom',
dataHintDirection: 'top',
dataHintTitle: 'S'
});
me.btnCollabChanges = me.btnSave;
@ -2792,6 +2792,7 @@ define([
this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else {
this.mode = mode;
!mode.canPrint && this.btnPrint.hide();
this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
}