pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 11:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3121 from ONLYOFFICE/fix/random-transition

Browse Source 
[PE] Add random type for transition
This commit is contained in:
Julia Radzhabova
2024-08-11 12:55:17 +03:00
committed by GitHub
parent 78c89b8741 543875c9a4
commit 1bc32e5ceb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/presentationeditor/main/app/view/Transitions.js
View File

@ -129,7 +129,8 @@ define([
{title: this.textUnCover, imageUrl: "btn-transition-uncover", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()},
{title: this.textCover, imageUrl: "btn-transition-cover", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()},
{title: this.textClock, imageUrl: "btn-transition-clock", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()},
{title: this.textZoom, imageUrl: "btn-transition-zoom", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId(),cls: 'last-item'}
{title: this.textZoom, imageUrl: "btn-transition-zoom", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()},
{title: this.textRandom, imageUrl: "btn-transition-random", value: Asc.c_oAscSlideTransitionTypes.Random, id: Common.UI.getId(), cls: 'last-item'}
];
this._arrEffectName.forEach(function (item) {
item.tip = item.title;
@ -424,7 +425,10 @@ define([
if (!this.listEffects.isDisabled()) {
this.numDelay.setDisabled(this.chDelay.getValue() !== 'checked');
this.btnParameters.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.btnParameters.setDisabled(
effect === Asc.c_oAscSlideTransitionTypes.None ||
effect === Asc.c_oAscSlideTransitionTypes.Random
);
this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.lblDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
@ -448,6 +452,7 @@ define([
textCover: 'Cover',
textClock: 'Clock',
textZoom: 'Zoom',
textRandom: 'Random',
textMorph: 'Morph',
textSmoothly: 'Smoothly',
textBlack: 'Through Black',

1
apps/presentationeditor/main/locale/en.json
View File

@ -2862,6 +2862,7 @@
"PE.Views.Transitions.textWedge": "Wedge",
"PE.Views.Transitions.textWipe": "Wipe",
"PE.Views.Transitions.textZoom": "Zoom",
"PE.Views.Transitions.textRandom": "Random",
"PE.Views.Transitions.textZoomIn": "Zoom In",
"PE.Views.Transitions.textZoomOut": "Zoom Out",
"PE.Views.Transitions.textZoomRotate": "Zoom and Rotate",