diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 4e1d43cdf..ecc840e9d 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -787,6 +787,8 @@ define(function(){ 'use strict'; textHorizontal: 'Horizontal', textIn: 'In', textOut: 'Out', + textWedge: 'Wedge', + textFlip: 'Flip', getEffectGroupData: function () { return [ diff --git a/apps/presentationeditor/main/app/view/AnimationDialog.js b/apps/presentationeditor/main/app/view/AnimationDialog.js index 31bd14dba..7c6232558 100644 --- a/apps/presentationeditor/main/app/view/AnimationDialog.js +++ b/apps/presentationeditor/main/app/view/AnimationDialog.js @@ -152,7 +152,7 @@ define([ fillEffect: function () { var arr = _.where(this.allEffects, {group: this._state.activeGroup, level: this.activeLevel }); this.lstEffectList.store.reset(arr); - var item = (this._state.activeEffect)?this.lstEffectList.store.findWhere({value: this._state.activeEffect}):this.lstEffectList.store.at(0); + var item = (this._state.activeEffect != undefined)?this.lstEffectList.store.findWhere({value: this._state.activeEffect}):this.lstEffectList.store.at(0); this.lstEffectList.selectRecord(item); this._state.activeEffect = item.get('value'); },