pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bugfix' (#744) from fix/bugfix into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/744
This commit is contained in:
Oleg Korshul
2025-10-03 14:16:47 +00:00
parent 59b395db1d e48b0a47e0
commit aeedc25162
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/resources/less/colors-table-ie-fix.less
View File

@ -235,7 +235,8 @@
@header-component-height-ie: 100%;
@header-component-width-ie: 40px;
@header-component-line-height-ie: 1.5;
@header-component-padding-ie: 1px 3px;
@header-component-padding-x-ie: 3px;
@header-component-padding-y-ie: 1px;
@header-component-margin-ie: 0;
@header-component-align-ie: stretch;

3
apps/common/main/resources/less/colors-table-night.less
View File

@ -323,7 +323,8 @@
--header-component-height: var(--x-small-btn-size);
--header-component-width: var(--x-small-btn-size);
--header-component-line-height: var(--x-small-btn-size);
--header-component-padding: 0;
--header-component-padding-x: 0px;
--header-component-padding-y: 0px;
--header-component-margin: 0 6px;
--header-component-align: center;

3
apps/common/main/resources/less/colors-table-white.less
View File

@ -325,7 +325,8 @@
--header-component-height: var(--x-small-btn-size);
--header-component-width: var(--x-small-btn-size);
--header-component-line-height: var(--x-small-btn-size);
--header-component-padding: 0;
--header-component-padding-x: 0px;
--header-component-padding-y: 0px;
--header-component-margin: 0 6px;
--header-component-align: center;

6
apps/common/main/resources/less/colors-table.less
View File

@ -363,7 +363,8 @@
// header button
--header-component-height: 100%;
--header-component-width: 40px;
--header-component-padding: 1px 3px;
--header-component-padding-x: 3px;
--header-component-padding-y: 1px;
--header-component-margin: 0;
--header-component-line-height: var(--line-height-base, 1.5);
--header-component-align: stretch;
@ -634,7 +635,8 @@
@header-component-height: var(--header-component-height);
@header-component-width: var(--header-component-width);
@header-component-line-height: var(--header-component-line-height);
@header-component-padding: var(--header-component-padding);
@header-component-padding-x: var(--header-component-padding-x);
@header-component-padding-y: var(--header-component-padding-y);
@header-component-margin: var(--header-component-margin);
@header-component-align: var(--header-component-align);

5
apps/common/main/resources/less/header.less
View File

@ -233,8 +233,8 @@
width: @header-component-width-ie;
width: @header-component-width;
border: 0;
padding: @header-component-padding-ie;
padding: @header-component-padding;
padding: @header-component-padding-y-ie @header-component-padding-x-ie;
padding: @header-component-padding-y @header-component-padding-x;
.icon {
width: @x-small-btn-icon-size-ie;
@ -480,6 +480,7 @@
line-height: 20px;
overflow: hidden;
margin: 0 6px;
margin: 0 calc((@header-component-width - @header-component-padding-x*2 - 20px)/2);
text-align: center;
}
}

24
apps/presentationeditor/main/app/view/DocumentPreview.js
View File

@ -142,7 +142,6 @@ define([
iconCls: 'toolbar__icon btn-pen-tool',
onlyIcon: true,
stopPropagation: true,
takeFocusOnClose: true,
hint: this.txtDraw,
hintAnchor: 'top',
hintContainer: '#pe-preview',
@ -244,8 +243,9 @@ define([
hintAnchor: 'top',
hintContainer: '#pe-preview'
});
this.btnPrev.on('click', _.bind(function() {
this.btnPrev.on('click', _.bind(function(btn) {
if (this.api) this.api.DemonstrationPrevSlide();
btn.cmpEl && btn.cmpEl.blur();
this.editComplete();
}, this));
@ -255,8 +255,9 @@ define([
hintAnchor: 'top',
hintContainer: '#pe-preview'
});
this.btnNext.on('click', _.bind(function() {
this.btnNext.on('click', _.bind(function(btn) {
if (this.api) this.api.DemonstrationNextSlide();
btn.cmpEl && btn.cmpEl.blur();
this.editComplete();
}, this));
@ -279,6 +280,7 @@ define([
if (this.api)
this.api.DemonstrationPlay ();
}
btn.cmpEl && btn.cmpEl.blur();
this.editComplete();
}, this));
@ -290,11 +292,6 @@ define([
});
this.btnClose.on('click', _.bind(function() {
if (this.api) this.api.EndDemonstration();
if (this.btnDraw) {
this.btnDraw.menu.clearAll();
this.btnDraw.toggle(false);
this.currentDrawTool = undefined;
}
}, this));
this.btnFullScreen = new Common.UI.Button({
@ -526,6 +523,11 @@ define([
},
onEndDemonstration: function( ) {
if (this.btnDraw) {
this.btnDraw.menu.clearAll();
this.btnDraw.toggle(false);
this.currentDrawTool = undefined;
}
this.hide();
Common.Utils.cancelFullscreen();
},
@ -553,11 +555,7 @@ define([
},
editComplete: function() {
var me = this;
setTimeout(function() {
$(me.el).focus();
me.api && me.api.asc_enableKeyEvents(true);
}, 10);
this.api && this.api.asc_enableKeyEvents(true);
},
txtDraw: 'Draw',