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

Update duration an repeat fields

Browse source
This commit is contained in:
OVSharova 2022-01-18 02:55:01 +03:00
parent 309562657a
commit 3884581d0a
4 changed files with 138 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,6 @@ define([
'PE.Views.Animation': {
'animation:preview': _.bind(this.onPreviewClick, this),
'animation:parameters': _.bind(this.onParameterClick, this),
'animation:duration': _.bind(this.onDurationChange, this),
'animation:selecteffect': _.bind(this.onEffectSelect, this),
'animation:delay': _.bind(this.onDelayChange, this),
'animation:animationpane': _.bind(this.onAnimationPane, this),
@ -79,7 +78,10 @@ define([
'animation:movelater': _.bind(this.onMoveLater, this),
'animation:repeatchange': _.bind(this.onRepeatChange, this),
'animation:repeatfocusin': _.bind(this.onRepeatComboOpen, this),
'animation:repeatselected': _.bind(this.onRepeatSelected, this)
'animation:repeatselected': _.bind(this.onRepeatSelected, this),
'animation:durationchange': _.bind(this.onDurationChange, this),
'animation:durationfocusin': _.bind(this.onRepeatComboOpen, this),
'animation:durationselected': _.bind(this.onDurationSelected, this)
},
'Toolbar': {
@ -183,13 +185,53 @@ define([
if (this._state.Effect == type) return;
var parameter = this.view.setMenuParameters(type, groupName, undefined);
this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace);
this._state.EffectGroups = group;
this._state.EffectGroup = group;
this._state.Effect = type;
},
onDurationChange: function(field, newValue, oldValue, eOpts) {
onDurationChange: function(before,combo, record, e) {
var value,
me = this;
if(before)
{
var item = combo.store.findWhere({
displayValue: record.value
});
if (!item) {
value = /^\+?(\d*(\.|,).?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
if (!value) {
value = this._state.Duration;
combo.setRawValue(value);
if(isNaN(record.value)) {
record.value = value;
if(value < 0)
record.displayValue = combo.store.findWhere({value: value}).get('displayValue');
}
return false;
}
}
} else {
value = Common.Utils.String.parseFloat(record.value);
if(!record.displayValue)
value = value > 600 ? 600 :
value < 0 ? 0.01 : value.toFixed(2);
combo.setValue(value);
this.setDuration(value);
}
},
onDurationSelected: function (combo, record) {
this.setDuration(record.value);
},
setDuration: function(valueRecord) {
if (this.api) {
this.AnimationProperties.asc_putDuration(field.getNumberValue() * 1000);
var value = valueRecord < 0 ? valueRecord : valueRecord * 1000;
this.AnimationProperties.asc_putDuration(value);
this.api.asc_SetAnimationProperties(this.AnimationProperties);
}
},
@ -200,6 +242,7 @@ define([
this.api.asc_SetAnimationProperties(this.AnimationProperties);
}
},
onRepeatChange: function (before,combo, record, e){
var value,
me = this;
@ -231,17 +274,18 @@ define([
value < 1 ? 1 : Math.floor((value+0.4)*2)/2;
combo.setValue(value);
if (this.api) {
this.AnimationProperties.asc_putRepeatCount(value);
this.api.asc_SetAnimationProperties(this.AnimationProperties);
}
this.setRepeat(value);
}
},
onRepeatSelected: function (combo, record) {
this.setRepeat(record.value);
},
setRepeat: function(valueRecord) {
if (this.api) {
this.AnimationProperties.asc_putRepeatCount(record.value);
var value = valueRecord < 0 ? valueRecord : valueRecord * 1000;
this.AnimationProperties.asc_putRepeatCount(value);
this.api.asc_SetAnimationProperties(this.AnimationProperties);
}
},
@ -339,7 +383,7 @@ define([
if (this._state.Effect !== value || this._state.EffectGroup !== group) {
this._state.Effect = value;
this._state.EffectGroup = group;
this.setViewRepeatAndDuration(this._state.EffectGroup, this._state.Effect);
group = view.listEffects.groups.findWhere({value: this._state.EffectGroup});
item = store.findWhere(group ? {group: group.get('id'), value: this._state.Effect} : {value: this._state.Effect});
if (item) {
@ -397,12 +441,9 @@ define([
this._state.noAnimationParam = view.setMenuParameters(this._state.Effect, _.findWhere(this.EffectGroups,{value: this._state.EffectGroup}).id, this._state.EffectOption)===undefined;
value = this.AnimationProperties.asc_getDuration();
if (Math.abs(this._state.Duration - value) > 0.001 ||
(this._state.Duration === null || value === null) && (this._state.Duration !== value) ||
(this._state.Duration === undefined || value === undefined) && (this._state.Duration !== value)) {
this._state.Duration = value;
view.numDuration.setValue((this._state.Duration !== null && this._state.Duration !== undefined) ? this._state.Duration / 1000. : '', true);
}
this._state.Duration = (value<0) ? value : value/1000;
view.cmbDuration.setValue( this._state.Duration !== undefined ? this._state.Duration : 1);
value = this.AnimationProperties.asc_getDelay();
if (Math.abs(this._state.Delay - value) > 0.001 ||
(this._state.Delay === null || value === null) && (this._state.Delay !== value) ||
@ -410,7 +451,8 @@ define([
this._state.Delay = value;
view.numDelay.setValue((this._state.Delay !== null && this._state.Delay !== undefined) ? this._state.Delay / 1000. : '', true);
}
this._state.Repeat = this.AnimationProperties.asc_getRepeatCount();
value =this.AnimationProperties.asc_getRepeatCount();
this._state.Repeat = (value<0) ? value : value/1000;
view.cmbRepeat.setValue( this._state.Repeat !== undefined ? this._state.Repeat : 1);
this._state.StartSelect = this.AnimationProperties.asc_getStartType();
@ -429,6 +471,7 @@ define([
this.setTriggerList();
}
this.setLocked();
},
setTriggerList: function (){
@ -444,6 +487,41 @@ define([
this.view.cmbTrigger.menu.items[0].setChecked(this._state.trigger == this.view.triggers.ClickSequence);
},
setViewRepeatAndDuration: function(group, type) {
if(type == AscFormat.ANIM_PRESET_NONE) return;
this._state.noAnimationDuration = this._state.noAnimationRepeat = false;
if((group == AscFormat.PRESET_CLASS_ENTR && type == AscFormat.ENTRANCE_APPEAR) || (group == AscFormat.PRESET_CLASS_EXIT && type == AscFormat.EXIT_DISAPPEAR)) {
this._state.noAnimationDuration = this._state.noAnimationRepeat = true;
}
else if((group == AscFormat.PRESET_CLASS_EMPH) &&
(type == AscFormat.EMPHASIS_BOLD_REVEAL || type == AscFormat.EMPHASIS_TRANSPARENCY)) {
this._state.noAnimationRepeat = true;
if(this.view.cmbDuration.store.length == 6) {
this.view.cmbDuration.setData([{value: 20, displayValue: 20},
{value: 5, displayValue: 5},
{value: 3, displayValue: 3},
{value: 2, displayValue: 2},
{value: 1, displayValue: 1},
{value: 0.5, displayValue: 0.5},
{value: AscFormat.untilNextClick, displayValue: this.view.textUntilNextClick},
{value: AscFormat.untilNextSlide, displayValue: this.view.textUntilEndOfSlide}]);
}
}
if((this.view.cmbDuration.store.length == 8) && ((this._state.EffectGroup != AscFormat.PRESET_CLASS_EMPH) ||
((this._state.EffectGroup == AscFormat.PRESET_CLASS_EMPH) && (this._state.Effect != AscFormat.EMPHASIS_BOLD_REVEAL) && (this._state.Effect != AscFormat.EMPHASIS_TRANSPARENCY)))) {
this.view.cmbDuration.setData([{value: 20, displayValue: 20},
{value: 5, displayValue: 5},
{value: 3, displayValue: 3},
{value: 2, displayValue: 2},
{value: 1, displayValue: 1},
{value: 0.5, displayValue: 0.5}]);
}
},
onActiveTab: function(tab) {
if (tab == 'animate') {
this._state.onactivetab = true;
@ -472,6 +550,11 @@ define([
this.lockToolbar(PE.enumLock.noMoveAnimationEarlier, this._state.noMoveAnimationEarlier);
if (PE.enumLock.noAnimationPreview != undefined)
this.lockToolbar(PE.enumLock.noAnimationPreview, this._state.noAnimationPreview);
if (PE.enumLock.noAnimationRepeat != undefined)
this.lockToolbar(PE.enumLock.noAnimationRepeat, this._state.noAnimationRepeat);
if (PE.enumLock.noAnimationDuration != undefined)
this.lockToolbar(PE.enumLock.noAnimationDuration, this._state.noAnimationDuration);
}

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

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

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

@ -98,9 +98,21 @@ define([
}, me));
}
if (me.numDuration) {
me.numDuration.on('change', function(bth) {
me.fireEvent('animation:duration', [me.numDuration]);
if (me.cmbDuration) {
me.cmbDuration.on('changed:before', function (combo, record) {
me.fireEvent('animation:durationchange', [true, combo, record]);
}, me);
me.cmbDuration.on('changed:after', function (combo, record) {
me.fireEvent('animation:durationchange', [false, combo, record]);
}, me);
me.cmbDuration.on('selected', function (combo, record) {
me.fireEvent('animation:durationselected', [combo, record]);
}, me);
me.cmbDuration.on('show:after', function (combo) {
me.fireEvent('animation:durationfocusin', [true, combo]);
}, me);
me.cmbDuration.on('combo:focusin', function (combo) {
me.fireEvent('animation:durationfocusin', [false, combo]);
}, me);
}
@ -270,20 +282,25 @@ define([
this.lockedControls.push(this.btnAddAnimation);
this.numDuration = new Common.UI.MetricSpinner({
this.cmbDuration = new Common.UI.ComboBox({
el: this.$el.find('#animation-spin-duration'),
step: 1,
width: 55,
value: '',
defaultUnit: this.txtSec,
maxValue: 300,
minValue: 0,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
cls: 'input-group-nr',
menuStyle: 'min-width: 100%;',
editable: true,
data: [
{value: 20, displayValue: 20},
{value: 5, displayValue: 5},
{value: 3, displayValue: 3},
{value: 2, displayValue: 2},
{value: 1, displayValue: 1},
{value: 0.5, displayValue: 0.5}
],
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration],
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: 'small'
});
this.lockedControls.push(this.numDuration);
this.lockedControls.push(this.cmbDuration);
this.cmbTrigger = new Common.UI.Button({
parentEl: $('#animation-trigger'),
@ -361,7 +378,7 @@ define([
cls: 'input-group-nr',
menuStyle: 'min-width: 100%;',
editable: true,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat],
data: [
{value: 1, displayValue: this.textNoRepeat},
{value: 2, displayValue: "2"},
@ -474,9 +491,9 @@ define([
this.btnAnimationPane && this.btnAnimationPane.render(this.$el.find('#animation-button-pane'));
this.btnAddAnimation && this.btnAddAnimation.render(this.$el.find('#animation-button-add-effect'));
this.cmbStart && this.cmbStart.render(this.$el.find('#animation-start'));
this.renderComponent('#animation-spin-duration', this.numDuration);
//this.renderComponent('#animation-spin-duration', this.cmbDuration);
this.renderComponent('#animation-spin-delay', this.numDelay);
this.renderComponent('#animation-spin-repeat', this.cmbRepeat);
//this.renderComponent('#animation-spin-repeat', this.cmbRepeat);
this.$el.find("#animation-duration").innerText = this.strDuration;
this.$el.find("#animation-delay").innerText = this.strDelay;
this.$el.find("#animation-label-start").innerText = this.strStart;
@ -489,8 +506,6 @@ define([
element.parent().append(obj.el);
},
show: function () {
Common.UI.BaseView.prototype.show.call(this);
this.fireEvent('show', this);

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

@ -93,7 +93,9 @@ define([
noTriggerObjects: 'no-trigger-objects',
noMoveAnimationEarlier: 'no-move-animation-earlier',
noMoveAnimationLater: 'no-move-animation-later',
noAnimationPreview: 'no-animation-preview'
noAnimationPreview: 'no-animation-preview',
noAnimationRepeat: 'no-animation-repeat',
noAnimationDuration: 'no-animation-duration'
};
PE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend((function(){