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

Merge pull request #1505 from ONLYOFFICE/fix/pe-transitions

Browse source 
[PE] Add icon to transitions tab
This commit is contained in:
Julia Radzhabova 2022-01-21 13:17:16 +03:00 committed by GitHub
parent c57670fc71 c124383a0f
commit 8aa3b4ef40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/resources/less/label.less
View file

@ -8,7 +8,7 @@
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
padding: 0; padding: 0;
margin: 0; margin-top: -2px;
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
vertical-align: middle; vertical-align: middle;

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

@ -151,8 +151,8 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group small"> <div class="group small">
<div class="elset font-normal"> <div class="elset font-normal">
<label id="transit-duration"></label> <span class="btn-slot text" id="transit-duration"></span>
<span id="transit-spin-duration" class="btn-slot text spinner" style="margin-left: 10px;"></span> <span id="transit-spin-duration" class="btn-slot text spinner"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot text" id="transit-button-preview"></span> <span class="btn-slot text" id="transit-button-preview"></span>
@ -165,7 +165,7 @@
</div> </div>
<div class="elset font-normal"> <div class="elset font-normal">
<span class="btn-slot text" id="transit-checkbox-delay"></span> <span class="btn-slot text" id="transit-checkbox-delay"></span>
<div id="transit-spin-delay" class="btn-slot text spinner" style="margin-left: 10px;"></div> <div id="transit-spin-delay" class="btn-slot text spinner" style="margin-left: 5px;"></div>
</div> </div>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>

12
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -233,6 +233,14 @@ define([
}); });
this.lockedControls.push(this.numDuration); this.lockedControls.push(this.numDuration);
this.lblDuration = new Common.UI.Label({
el: this.$el.find('#transit-duration'),
iconCls: 'toolbar__icon animation-duration',
caption: this.strDuration,
lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock]
});
this.lockedControls.push(this.lblDuration);
this.numDelay = new Common.UI.MetricSpinner({ this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-delay'), el: this.$el.find('#transit-spin-delay'),
step: 1, step: 1,
@ -270,7 +278,6 @@ define([
Common.Utils.lockControls(PE.enumLock.disableOnStart, true, {array: this.lockedControls}); Common.Utils.lockControls(PE.enumLock.disableOnStart, true, {array: this.lockedControls});
this.$el.find('#transit-duration').text(this.strDuration);
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
}, },
@ -335,7 +342,6 @@ define([
this.renderComponent('#transit-spin-duration', this.numDuration); this.renderComponent('#transit-spin-duration', this.numDuration);
this.renderComponent('#transit-spin-delay', this.numDelay); this.renderComponent('#transit-spin-delay', this.numDelay);
this.renderComponent('#transit-checkbox-startonclick', this.chStartOnClick); this.renderComponent('#transit-checkbox-startonclick', this.chStartOnClick);
this.$el.find("#label-duration").innerText = this.strDuration;
this.$el.find("#label-delay").innerText = this.strDelay; this.$el.find("#label-delay").innerText = this.strDelay;
return this.$el; return this.$el;
}, },
@ -417,6 +423,7 @@ define([
this.btnParameters.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.btnParameters.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
this.lblDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
} }
return (selectedElement)?selectedElement.value:-1; return (selectedElement)?selectedElement.value:-1;
}, },
@ -429,7 +436,6 @@ define([
strDuration: 'Duration', strDuration: 'Duration',
strDelay: 'Delay', strDelay: 'Delay',
strStartOnClick: 'Start On Click', strStartOnClick: 'Start On Click',
textNone: 'None', textNone: 'None',
textFade: 'Fade', textFade: 'Fade',
textPush: 'Push', textPush: 'Push',