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

Merge pull request #2949 from ONLYOFFICE/fix/AnimPane

Browse Source 
Fix/anim pane
This commit is contained in:
Sergey Luzyanin
2024-04-19 12:16:28 +02:00
committed by GitHub
parent 03ad9d8086 f44e31fbd7
commit fb76d37705
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,6 +630,22 @@ define([
updateThemeColors: function (){
this.view.updateColors();
},
getAnimationPanelTip: function (effect) {
var result;
if (effect) {
var nodeType = effect[0] === AscFormat.NODE_TYPE_CLICKEFFECT ? this.view.textStartOnClick :
(effect[0] === AscFormat.NODE_TYPE_WITHEFFECT ? this.view.textStartWithPrevious :
(effect[0] === AscFormat.NODE_TYPE_AFTEREFFECT ? this.view.textStartAfterPrevious : ''));
var presetClass = _.findWhere(Common.define.effectData.getEffectGroupData(), {value: effect[1]});
presetClass = presetClass ? presetClass.caption : '';
var preset = _.findWhere(Common.define.effectData.getEffectData(), {value: effect[2]});
preset = preset ? preset.displayValue : '';
var name = effect[3] || '';
result = nodeType + '\n' + presetClass + '\n' + preset + ' : ' + name;
}
return result;
}
}, PE.Controllers.Animation || {}));

22
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -493,12 +493,16 @@ define([
}
if (event.get_Type() == Asc.c_oAscContextMenuTypes.AnimEffect) {
showPoint[0] += event.get_ButtonWidth() + 2;
showPoint[1] += event.get_ButtonHeight() + 2;
menu.menuAlign = 'tr-br';
if (me.documentHolder.cmpEl.offset().top + showPoint[1] + menu.menuRoot.outerHeight() > Common.Utils.innerHeight() - 10) {
showPoint[1] -= event.get_ButtonHeight() + 4;
menu.menuAlign = 'br-tr';
if (event.get_ButtonWidth()) {
showPoint[0] += event.get_ButtonWidth() + 2;
showPoint[1] += event.get_ButtonHeight() + 2;
menu.menuAlign = 'tr-br';
if (me.documentHolder.cmpEl.offset().top + showPoint[1] + menu.menuRoot.outerHeight() > Common.Utils.innerHeight() - 10) {
showPoint[1] -= event.get_ButtonHeight() + 4;
menu.menuAlign = 'br-tr';
}
} else {
menu.menuAlign = 'tl-tr';
}
}
@ -948,7 +952,11 @@ define([
break;
}
} else if (type===Asc.c_oAscMouseMoveDataTypes.EffectInfo) {
ToolTip = moveData.get_Info();
var tip = moveData.get_EffectText();
if (!tip) {
tip = me.getApplication().getController('Animation').getAnimationPanelTip(moveData.get_EffectDescription()) || '';
}
ToolTip = tip;
}
var recalc = false;
screenTip.isHidden = false;

1
apps/presentationeditor/main/app/view/DocumentHolder.js
View File

@ -2474,7 +2474,6 @@ define([
me.animEffectMenu = new Common.UI.Menu({
restoreHeightAndTop: true,
scrollToCheckedItem: false,
menuAlign: 'tr-br',
style: 'min-width: auto;',
initMenu: function(value){
me.menuAnimStartOnClick.setChecked(value.effect === AscFormat.NODE_TYPE_CLICKEFFECT, true);