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

[PE] Add additional animation

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-07 11:36:30 +03:00
parent 920d8a5b4f
commit a981c11a80
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ define([
})).show(); })).show();
}, },
onAnimationAdditional: function() { onAnimationAdditional: function(replace) { // replace or add new additional effect
(new PE.Views.AnimationDialog({ (new PE.Views.AnimationDialog({
api : this.api, api : this.api,
activeEffect : this._state.Effect activeEffect : this._state.Effect

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

@ -62,10 +62,12 @@ define([
me.fireEvent('animation:selecteffect', [combo, record]); me.fireEvent('animation:selecteffect', [combo, record]);
}, me)); }, me));
me.listEffectsMore.on('click', _.bind(function () { me.listEffectsMore.on('click', _.bind(function () {
me.fireEvent('animation:additional'); me.fireEvent('animation:additional', [true]); // replace effect
}, me)); }, me));
} }
me.btnAddAnimation && me.btnAddAnimation.menu.on('item:click', function (menu, item, e) {
(item.value=='more') && me.fireEvent('animation:additional', [false]); // add effect
});
if (me.btnPreview) { if (me.btnPreview) {
me.btnPreview.on('click', _.bind(function(btn) { me.btnPreview.on('click', _.bind(function(btn) {
me.fireEvent('animation:preview', [me.btnPreview]); me.fireEvent('animation:preview', [me.btnPreview]);
@ -333,12 +335,15 @@ define([
(new Promise(function (accept, reject) { (new Promise(function (accept, reject) {
accept(); accept();
})).then(function() { })).then(function() {
setEvents.call(me);
me.btnAddAnimation.setMenu( new Common.UI.Menu({ me.btnAddAnimation.setMenu( new Common.UI.Menu({
style: 'width: 370px;padding-top: 12px;', style: 'width: 370px;padding-top: 12px;',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-addanimation" class="menu-animation"></div>')} {template: _.template('<div id="id-toolbar-menu-addanimation" class="menu-animation"></div>')},
{caption: '--'},
{
caption: me.textMoreEffects,
value: 'more'
}
] ]
})); }));
@ -348,8 +353,11 @@ define([
var picker = new Common.UI.DataView({ var picker = new Common.UI.DataView({
el: $('#id-toolbar-menu-addanimation'), el: $('#id-toolbar-menu-addanimation'),
parentMenu: menu, parentMenu: menu,
outerMenu: {menu: me.btnAddAnimation.menu, index: 0},
showLast: false, showLast: false,
restoreHeight: 465, restoreHeight: 300,
style: 'max-height: 300px;',
scrollAlwaysVisible: true,
groups: new Common.UI.DataViewGroupStore(Common.define.effectData.getEffectGroupData()), groups: new Common.UI.DataViewGroupStore(Common.define.effectData.getEffectGroupData()),
store: new Common.UI.DataViewStore(Common.define.effectData.getEffectData()), store: new Common.UI.DataViewStore(Common.define.effectData.getEffectData()),
itemTemplate: _.template([ itemTemplate: _.template([
@ -364,8 +372,11 @@ define([
me.fireEvent('animation:addanimation', [picker, record]); me.fireEvent('animation:addanimation', [picker, record]);
}); });
menu.off('show:before', onShowBefore); menu.off('show:before', onShowBefore);
me.btnAddAnimation.menu.setInnerMenu([{menu: picker, index: 0}]);
}; };
me.btnAddAnimation.menu.on('show:before', onShowBefore); me.btnAddAnimation.menu.on('show:before', onShowBefore);
setEvents.call(me);
}); });
}, },