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

[PE] Add more effect menu item

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-07 01:13:24 +03:00
parent c1e74dda56
commit 920d8a5b4f
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,8 @@ define([
'animation:addanimation': _.bind(this.onAddAnimation, this), 'animation:addanimation': _.bind(this.onAddAnimation, this),
'animation:startselect': _.bind(this.onStartSelect, this), 'animation:startselect': _.bind(this.onStartSelect, this),
'animation:checkrewind': _.bind(this.onCheckRewindChange,this), 'animation:checkrewind': _.bind(this.onCheckRewindChange,this),
'animation:repeat': _.bind(this.onRepeatChange, this) 'animation:repeat': _.bind(this.onRepeatChange, this),
'animation:additional': _.bind(this.onAnimationAdditional, this)
}, },
'Toolbar': { 'Toolbar': {
'tab:active': _.bind(this.onActiveTab, this) 'tab:active': _.bind(this.onActiveTab, this)
@ -136,6 +137,13 @@ define([
})).show(); })).show();
}, },
onAnimationAdditional: function() {
(new PE.Views.AnimationDialog({
api : this.api,
activeEffect : this._state.Effect
})).show();
},
onAddAnimation: function(picker, record) { onAddAnimation: function(picker, record) {
var type = record.get('value'); var type = record.get('value');
var group = _.findWhere(Common.define.effectData.getEffectGroupData(), {id: record.get('group')}).value; var group = _.findWhere(Common.define.effectData.getEffectGroupData(), {id: record.get('group')}).value;

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

@ -61,6 +61,9 @@ define([
me.listEffects.on('click', _.bind(function (combo, record) { me.listEffects.on('click', _.bind(function (combo, record) {
me.fireEvent('animation:selecteffect', [combo, record]); me.fireEvent('animation:selecteffect', [combo, record]);
}, me)); }, me));
me.listEffectsMore.on('click', _.bind(function () {
me.fireEvent('animation:additional');
}, me));
} }
if (me.btnPreview) { if (me.btnPreview) {
@ -132,6 +135,9 @@ define([
this._arrEffectOptions = []; this._arrEffectOptions = [];
var itemWidth = 87, var itemWidth = 87,
itemHeight = 40; itemHeight = 40;
this.listEffectsMore = new Common.UI.MenuItem({
caption: this.textMoreEffects
});
this.listEffects = new Common.UI.ComboDataView({ this.listEffects = new Common.UI.ComboDataView({
cls: 'combo-transitions combo-animation', cls: 'combo-transitions combo-animation',
itemWidth: itemWidth, itemWidth: itemWidth,
@ -144,6 +150,7 @@ define([
].join('')), ].join('')),
groups: new Common.UI.DataViewGroupStore([{id: 'none', value: -10, caption: this.textNone}].concat(Common.define.effectData.getEffectGroupData())), groups: new Common.UI.DataViewGroupStore([{id: 'none', value: -10, caption: this.textNone}].concat(Common.define.effectData.getEffectGroupData())),
store: new Common.UI.DataViewStore(this._arrEffectName), store: new Common.UI.DataViewStore(this._arrEffectName),
additionalMenuItems: [{caption: '--'}, this.listEffectsMore],
enableKeyEvents: true, enableKeyEvents: true,
//lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock], //lock: [_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock],
dataHint: '1', dataHint: '1',
@ -473,8 +480,9 @@ define([
textStartOnClick: 'On Click', textStartOnClick: 'On Click',
textStartWithPrevious: 'With Previous', textStartWithPrevious: 'With Previous',
textStartAfterPrevious: 'After Previous', textStartAfterPrevious: 'After Previous',
textNone: 'None' textNone: 'None',
textMoreEffects: 'Show More Effects'
} }
}()), PE.Views.Animation || {})); }()), PE.Views.Animation || {}));
}); });

3
apps/presentationeditor/main/resources/less/animation.less
View file

@ -25,6 +25,9 @@
.menu-picker-container .dataview { .menu-picker-container .dataview {
padding: 10px 0 0 2px; padding: 10px 0 0 2px;
} }
.dropdown-menu {
padding-bottom: 5px;
}
} }
.menu-animation .dataview { .menu-animation .dataview {