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

Refactoring

Browse source
This commit is contained in:
OVSharova 2022-01-13 17:44:20 +03:00
parent 078c7123dd
commit eede2b9b06
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,15 +72,12 @@ define([
'animation:addanimation': _.bind(this.onAddAnimation, this), 'animation:addanimation': _.bind(this.onAddAnimation, this),
'animation:startselect': _.bind(this.onStartSelect, this), 'animation:startselect': _.bind(this.onStartSelect, this),
'animation:checkrewind': _.bind(this.onCheckRewindChange,this), 'animation:checkrewind': _.bind(this.onCheckRewindChange,this),
//'animation:repeat': _.bind(this.onRepeatChange, this),
'animation:additional': _.bind(this.onAnimationAdditional, this), 'animation:additional': _.bind(this.onAnimationAdditional, this),
'animation:trigger': _.bind(this.onTriggerClick, this), 'animation:trigger': _.bind(this.onTriggerClick, this),
'animation:triggerclickof': _.bind(this.onTriggerClickOfClick, this), 'animation:triggerclickof': _.bind(this.onTriggerClickOfClick, this),
'animation:moveearlier': _.bind(this.onMoveEarlier, this), 'animation:moveearlier': _.bind(this.onMoveEarlier, this),
'animation:movelater': _.bind(this.onMoveLater, this), 'animation:movelater': _.bind(this.onMoveLater, this),
'animation:repeatchangebefore': _.bind(this.onRepeatChange, this), 'animation:repeatchange': _.bind(this.onRepeatChange, this),
'animation:repeatchangeafter': _.bind(this.onRepeatChange, this),
'animation:repeatshow': _.bind(this.onRepeatComboOpen, this),
'animation:repeatfocusin': _.bind(this.onRepeatComboOpen, this), 'animation:repeatfocusin': _.bind(this.onRepeatComboOpen, this),
'animation:repeatselected': _.bind(this.onRepeatSelected, this) 'animation:repeatselected': _.bind(this.onRepeatSelected, this)
@ -218,9 +215,11 @@ define([
if (!value) { if (!value) {
value = this._state.Repeat; value = this._state.Repeat;
combo.setRawValue(value); combo.setRawValue(value);
if(!_.isNumber(record.value)) if(isNaN(record.value)) {
record.value = value; record.value = value;
if(value < 0)
record.displayValue = combo.store.findWhere({value: value}).get('displayValue');
}
return false; return false;
} }
} }

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

@ -119,16 +119,16 @@ define([
if (me.cmbRepeat) { if (me.cmbRepeat) {
me.cmbRepeat.on('changed:before', function (combo, record) { me.cmbRepeat.on('changed:before', function (combo, record) {
me.fireEvent('animation:repeatchangebefore', [true, combo, record]); me.fireEvent('animation:repeatchange', [true, combo, record]);
}, me); }, me);
me.cmbRepeat.on('changed:after', function (combo, record) { me.cmbRepeat.on('changed:after', function (combo, record) {
me.fireEvent('animation:repeatchangeafter', [false, combo, record]); me.fireEvent('animation:repeatchange', [false, combo, record]);
}, me); }, me);
me.cmbRepeat.on('selected', function (combo, record) { me.cmbRepeat.on('selected', function (combo, record) {
me.fireEvent('animation:repeatselected', [combo, record]); me.fireEvent('animation:repeatselected', [combo, record]);
}, me); }, me);
me.cmbRepeat.on('show:after', function (combo) { me.cmbRepeat.on('show:after', function (combo) {
me.fireEvent('animation:repeatshow', [true, combo]); me.fireEvent('animation:repeatfocusin', [true, combo]);
}, me); }, me);
me.cmbRepeat.on('combo:focusin', function (combo) { me.cmbRepeat.on('combo:focusin', function (combo) {
me.fireEvent('animation:repeatfocusin', [false, combo]); me.fireEvent('animation:repeatfocusin', [false, combo]);