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

[PE] Change duration combobox in animation tab (show only seconds)

Browse source
This commit is contained in:
Julia Radzhabova 2022-12-08 16:40:09 +03:00
parent a1a2aa919f
commit d9ef7a349f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/ComboBox.js
View file

@ -710,8 +710,8 @@ define([
this.options.updateFormControl.call(this, this._selectedItem); this.options.updateFormControl.call(this, this._selectedItem);
}, },
setValue: function(value) { setValue: function(value, defValue) {
Common.UI.ComboBox.prototype.setValue.call(this, value); Common.UI.ComboBox.prototype.setValue.call(this, value, defValue);
if (this.options.updateFormControl) if (this.options.updateFormControl)
this.options.updateFormControl.call(this, this._selectedItem); this.options.updateFormControl.call(this, this._selectedItem);
}, },

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

@ -187,6 +187,7 @@ define([
this.toolbar = options.toolbar; this.toolbar = options.toolbar;
this.appConfig = options.mode; this.appConfig = options.mode;
this.$el = this.toolbar.toolbar.$el.find('#animation-panel'); this.$el = this.toolbar.toolbar.$el.find('#animation-panel');
var me = this;
var _set = Common.enumLock; var _set = Common.enumLock;
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());
@ -293,7 +294,7 @@ define([
this.lockedControls.push(this.btnAddAnimation); this.lockedControls.push(this.btnAddAnimation);
this.cmbDuration = new Common.UI.ComboBox({ this.cmbDuration = new Common.UI.ComboBoxCustom({
el: this.$el.find('#animation-spin-duration'), el: this.$el.find('#animation-spin-duration'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
@ -309,7 +310,10 @@ define([
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'top', dataHintDirection: 'top',
dataHintOffset: 'small' dataHintOffset: 'small',
updateFormControl: function(record) {
record && this.setRawValue(record.get('value') + ' ' + me.txtSec);
}
}); });
this.lockedControls.push(this.cmbDuration); this.lockedControls.push(this.cmbDuration);