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

Fix bugs

Browse source
This commit is contained in:
OVSharova 2021-12-23 13:53:47 +03:00
parent b955f70022
commit 5f81e7311a
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -253,26 +253,28 @@
<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">
<div class="btn-slot" style="width: 82px;" id="animation-trigger"></div> <div class="btn-slot text" id="animation-trigger"></div>
</div> </div>
</div> </div>
<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">
<div class = "text">
<label id="animation-repeat"></label> <label id="animation-repeat"></label>
<span id="animation-spin-repeat" class="btn-slot text spinner" ></span> <span id="animation-spin-repeat" class="btn-slot text spinner" ></span>
</div> </div>
</div>
<div class="elset font-normal"> <div class="elset font-normal">
<span class="btn-slot text" id="animation-checkbox-rewind"></span> <span class="btn-slot text" id="animation-checkbox-rewind"></span>
</div> </div>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group small" style="width: 120px; min-width: 100px;"> <div class="group small" >
<div class="elset"> <div class="elset">
<div class="btn-slot" id="animation-moveearlier"></div> <div class="btn-slot text" id="animation-moveearlier"></div>
</div> </div>
<div class="elset font-normal"> <div class="elset font-normal">
<div class="btn-slot" id="animation-movelater"></div> <div class="btn-slot text" id="animation-movelater"></div>
</div> </div>
</div> </div>
</section> </section>

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

@ -62,7 +62,7 @@ define([
me.fireEvent('animation:selecteffect', [combo, record]); me.fireEvent('animation:selecteffect', [combo, record]);
}, me)); }, me));
me.listEffectsMore.on('click', _.bind(function () { me.listEffectsMore.on('click', _.bind(function () {
me.fireEvent('animation:additional', [true]); // replace effect me.fireEvent('animation:additional', [me.listEffects.menuPicker.getSelectedRec().get('value') != AscFormat.ANIM_PRESET_NONE]); // replace effect
}, me)); }, me));
} }
@ -159,6 +159,7 @@ define([
this.lockedControls = []; this.lockedControls = [];
this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData()); this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData());
_.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;});
this._arrEffectOptions = []; this._arrEffectOptions = [];
var itemWidth = 87, var itemWidth = 87,
itemHeight = 40; itemHeight = 40;
@ -259,7 +260,7 @@ define([
this.numDuration = new Common.UI.MetricSpinner({ this.numDuration = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-duration'), el: this.$el.find('#animation-spin-duration'),
step: 1, step: 1,
width: 52, width: 55,
value: '', value: '',
defaultUnit: this.txtSec, defaultUnit: this.txtSec,
maxValue: 300, maxValue: 300,
@ -304,7 +305,7 @@ define([
this.numDelay = new Common.UI.MetricSpinner({ this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-delay'), el: this.$el.find('#animation-spin-delay'),
step: 1, step: 1,
width: 52, width: 55,
value: '', value: '',
defaultUnit: this.txtSec, defaultUnit: this.txtSec,
maxValue: 300, maxValue: 300,
@ -318,7 +319,8 @@ define([
this.cmbStart = new Common.UI.ComboBox({ this.cmbStart = new Common.UI.ComboBox({
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'width: 150px;', menuStyle: 'min-width: 100%;',
editable: false,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
data: [ data: [
{value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick}, {value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick},
@ -343,7 +345,7 @@ define([
this.numRepeat = new Common.UI.MetricSpinner({ this.numRepeat = new Common.UI.MetricSpinner({
el: this.$el.find('#animation-spin-repeat'), el: this.$el.find('#animation-spin-repeat'),
step: 1, step: 1,
width: 88, width: 55,
value: '', value: '',
maxValue: 1000, maxValue: 1000,
minValue: 0, minValue: 0,

2
apps/presentationeditor/main/app/view/AnimationDialog.js
View file

@ -70,7 +70,7 @@ define([
this._state.activeGroup = this.EffectGroupData[0].id; this._state.activeGroup = this.EffectGroupData[0].id;
this._state.activeGroupValue = this.EffectGroupData[0].value; this._state.activeGroupValue = this.EffectGroupData[0].value;
this.EffectGroupData.forEach(function (item) {item.displayValue = item.caption;}); this.EffectGroupData.forEach(function (item) {item.displayValue = item.caption;});
if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE)){ if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE) && (this.options.activeEffect !== AscFormat.ANIM_PRESET_MULTIPLE)){
this._state.activeEffect = this.options.activeEffect; this._state.activeEffect = this.options.activeEffect;
this._state.activeGroupValue = this.options.groupValue; this._state.activeGroupValue = this.options.groupValue;
this._state.activeGroup = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue}).id; this._state.activeGroup = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue}).id;

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

@ -221,7 +221,7 @@ define([
this.numDuration = new Common.UI.MetricSpinner({ this.numDuration = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-duration'), el: this.$el.find('#transit-spin-duration'),
step: 1, step: 1,
width: 50, width: 55,
value: '', value: '',
defaultUnit: this.txtSec, defaultUnit: this.txtSec,
maxValue: 300, maxValue: 300,
@ -236,7 +236,7 @@ define([
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,
width: 60, width: 55,
value: '', value: '',
defaultUnit: this.txtSec, defaultUnit: this.txtSec,
maxValue: 300, maxValue: 300,