Merge remote-tracking branch 'origin/fix/Repeat-and-duration-for-animation' into fix/Repeat-and-duration-for-animation
This commit is contained in:
commit
650e2d9e21
|
@ -182,7 +182,7 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
addNewEffect: function (type, group, groupName, replace) {
|
addNewEffect: function (type, group, groupName, replace) {
|
||||||
if (this._state.Effect == type) return;
|
if (this._state.Effect == type && this._state.EffectGroup == group && replace) return;
|
||||||
var parameter = this.view.setMenuParameters(type, groupName, undefined);
|
var parameter = this.view.setMenuParameters(type, groupName, undefined);
|
||||||
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace);
|
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace);
|
||||||
this._state.EffectGroup = group;
|
this._state.EffectGroup = group;
|
||||||
|
|
Loading…
Reference in a new issue