pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-27 09:47:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE] For bugs 65197, 65191, 59528

Browse Source
This commit is contained in:
Julia Radzhabova
2023-11-23 13:21:18 +03:00
parent 431a69b90e
commit 93708fe1d8
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/presentationeditor/main/app/controller/Animation.js
View File

@ -79,9 +79,10 @@ define([
'animation:repeatchange': _.bind(this.onRepeatChange, this),
'animation:repeatfocusin': _.bind(this.onRepeatComboOpen, 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)
'animation:durationchange': _.bind(this.onDurationChange, this),
'animation:durationfocusin': _.bind(this.onRepeatComboOpen, this),
'animation:durationselected': _.bind(this.onDurationSelected, this),
'animation:addeffectshow': _.bind(this.onAddEffectShow, this)
},
'Toolbar': {
@ -368,15 +369,18 @@ define([
onFocusObject: function(selectedObjects) {
this.AnimationProperties = null;
this._state.lockEmphasis = false;
for (var i = 0; i<selectedObjects.length; i++) {
var type = selectedObjects[i].get_ObjectType();
var animatedObjects = this.api.asc_getAnimatedObjectsStack();
for (var i = 0; i<animatedObjects.length; i++) {
var type = animatedObjects[i].get_ObjectType();
if (type === Asc.c_oAscTypeSelectElement.Animation) {
this.AnimationProperties = selectedObjects[i].get_ObjectValue();
this.AnimationProperties = animatedObjects[i].get_ObjectValue();
} else if (type===Asc.c_oAscTypeSelectElement.Slide) {
this._state.timingLock = selectedObjects[i].get_ObjectValue().get_LockTiming();
this._state.timingLock = animatedObjects[i].get_ObjectValue().get_LockTiming();
} else if (type===Asc.c_oAscTypeSelectElement.Shape) {
var value = selectedObjects[i].get_ObjectValue();
this._state.lockEmphasis = value.get_FromGroup() || value.get_FromChart() || value.get_FromSmartArt() || value.get_FromSmartArtInternal();
var value = animatedObjects[i].get_ObjectValue();
this._state.lockEmphasis = this._state.lockEmphasis || value.get_FromGroup() || value.get_FromChart() || value.get_FromSmartArt() || value.get_FromSmartArtInternal();
} else if (type===Asc.c_oAscTypeSelectElement.Table) {
this._state.lockEmphasis = true;
}
}
if (this._state.onactivetab)
@ -575,6 +579,21 @@ define([
this.api && this.api.asc_onShowAnimTab(!!this._state.onactivetab);
},
onAddEffectShow: function(picker) {
var me = this;
if (!this.arrEmphasisAddEffect) {
this.arrEmphasisAddEffect = picker.store.filter(function(item, index){
return (item.get('group') === 'menu-effect-group-emphasis') && !(item.get('value') === AscFormat.EMPHASIS_GROW_SHRINK || item.get('value') === AscFormat.EMPHASIS_SPIN ||
item.get('value') === AscFormat.EMPHASIS_TRANSPARENCY || item.get('value') === AscFormat.EMPHASIS_PULSE ||
item.get('value') === AscFormat.EMPHASIS_TEETER || item.get('value') === AscFormat.EMPHASIS_BLINK);
});
}
this.arrEmphasisAddEffect.forEach(function(item){
item.set('disabled', !!me._state.lockEmphasis);
});
picker.scroller.update({alwaysVisibleY: true});
},
lockToolbar: function (causes, lock, opts) {
Common.Utils.lockControls(causes, lock, opts, this.view.lockedControls);
},

2
apps/presentationeditor/main/app/view/Animation.js
View File

@ -521,7 +521,7 @@ define([
});
menu.off('show:before', onShowBefore);
menu.on('show:after', function () {
picker.scroller.update({alwaysVisibleY: true});
me.fireEvent('animation:addeffectshow', [picker]);
});
me.btnAddAnimation.menu.setInnerMenu([{menu: picker, index: 0}]);
};

4
apps/presentationeditor/main/resources/less/animation.less
View File

@ -37,12 +37,12 @@
margin-bottom: @scaled-two-px-value;
}
&:hover {
&:hover:not(.disabled) {
.box-shadow(0 0 0 2px @border-preview-hover-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover);
}
&.selected {
&.selected:not(.disabled) {
.box-shadow(0 0 0 2px @border-preview-select-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
}