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

Fix trigger button

Browse source
This commit is contained in:
OVSharova 2021-12-09 04:10:01 +03:00
parent 39d99bc762
commit 859f2174e6
3 changed files with 29 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/presentationeditor/main/app/controller/Animation.js
View file

@ -190,11 +190,8 @@ define([
onTriggerClick: function (value) { onTriggerClick: function (value) {
if(this.api) { if(this.api) {
if(value==this.view.triggers.ClickSequence) if(value.value == this.view.triggers.ClickSequence) {
{ this.AnimationProperties.asc_putTriggerClickSequence(true);
this._state.Trigger = this.view.triggers.ClickSequence;
this._state.TriggerValue = true;
this.AnimationProperties.asc_putTriggerClickSequence(this._state.TriggerValue);
this.api.asc_SetAnimationProperties(this.AnimationProperties); this.api.asc_SetAnimationProperties(this.AnimationProperties);
} }
} }
@ -202,15 +199,11 @@ define([
onTriggerClickOfClick: function (value) onTriggerClickOfClick: function (value)
{ {
if(this.api) if(this.api) {
{
// this._state.Trigger = this.view.triggers.ClickOf;
// this._state.TriggerValue = value.caption;
this.AnimationProperties.asc_putTriggerClickSequence(false); this.AnimationProperties.asc_putTriggerClickSequence(false);
this.AnimationProperties.asc_putTriggerObjectClick(value.caption); this.AnimationProperties.asc_putTriggerObjectClick(value.caption);
this.api.asc_SetAnimationProperties(this.AnimationProperties); this.api.asc_SetAnimationProperties(this.AnimationProperties);
} }
}, },
onEffectSelect: function (combo, record) { onEffectSelect: function (combo, record) {

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

@ -215,7 +215,6 @@
<span id="animation-spin-duration" class="btn-slot text spinner" ></span> <span id="animation-spin-duration" class="btn-slot text spinner" ></span>
</div> </div>
<div class="elset font-normal"> <div class="elset font-normal">
<label id="animation-label-trigger"></label>
<div class="btn-slot" style="width: 82px;" id="animation-trigger"></div> <div class="btn-slot" style="width: 82px;" id="animation-trigger"></div>
</div> </div>
</div> </div>

14
apps/presentationeditor/main/app/view/Animation.js
View file

@ -263,12 +263,11 @@ define([
this.cmbTrigger = new Common.UI.Button({ this.cmbTrigger = new Common.UI.Button({
parentEl: $('#animation-trigger'), parentEl: $('#animation-trigger'),
cls: 'btn-text-split-default', cls: 'btn-toolbar',
split: true, iconCls: 'toolbar__icon btn-contents',
width: 82, caption: this.strTrigger,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
style : 'min-width: 150px;',
items: [ items: [
{ {
caption: this.textOnClickSequence, caption: this.textOnClickSequence,
@ -286,8 +285,8 @@ define([
}] }]
}), }),
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'medium'
}); });
this.lockedControls.push(this.cmbTrigger); this.lockedControls.push(this.cmbTrigger);
this.btnClickOf = this.cmbTrigger.menu.items[1]; this.btnClickOf = this.cmbTrigger.menu.items[1];
@ -350,7 +349,6 @@ define([
this.$el.find('#animation-delay').text(this.strDelay); this.$el.find('#animation-delay').text(this.strDelay);
this.$el.find('#animation-label-start').text(this.strStart); this.$el.find('#animation-label-start').text(this.strStart);
this.$el.find('#animation-repeat').text(this.strRepeat); this.$el.find('#animation-repeat').text(this.strRepeat);
this.$el.find('#animation-label-trigger').text(this.strTrigger);
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
}, },
@ -417,14 +415,12 @@ define([
this.btnAnimationPane && this.btnAnimationPane.render(this.$el.find('#animation-button-pane')); this.btnAnimationPane && this.btnAnimationPane.render(this.$el.find('#animation-button-pane'));
this.btnAddAnimation && this.btnAddAnimation.render(this.$el.find('#animation-button-add-effect')); this.btnAddAnimation && this.btnAddAnimation.render(this.$el.find('#animation-button-add-effect'));
this.cmbStart && this.cmbStart.render(this.$el.find('#animation-start')); this.cmbStart && this.cmbStart.render(this.$el.find('#animation-start'));
//this.cmbTrigger && this.cmbTrigger.render(this.$el.find('#animation-trigger'));
this.renderComponent('#animation-spin-duration', this.numDuration); this.renderComponent('#animation-spin-duration', this.numDuration);
this.renderComponent('#animation-spin-delay', this.numDelay); this.renderComponent('#animation-spin-delay', this.numDelay);
this.renderComponent('#animation-spin-repeat', this.numRepeat); this.renderComponent('#animation-spin-repeat', this.numRepeat);
this.$el.find("#animation-duration").innerText = this.strDuration; this.$el.find("#animation-duration").innerText = this.strDuration;
this.$el.find("#animation-delay").innerText = this.strDelay; this.$el.find("#animation-delay").innerText = this.strDelay;
this.$el.find("#animation-label-start").innerText = this.strStart; this.$el.find("#animation-label-start").innerText = this.strStart;
this.$el.find("#animation-label-trigger").innerText = this.strTrigger;
this.$el.find("#animation-repeat").innerText = this.strRepeat; this.$el.find("#animation-repeat").innerText = this.strRepeat;
return this.$el; return this.$el;
}, },