diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 1030b0eab..6b090a487 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -621,12 +621,14 @@ define(function(){ 'use strict'; textTeeter: 'Teeter', textSpin: 'Spin', textGrowShrink: 'Grow/Shrink', + textShrinkTurn: 'Shrink & Turn', textDesaturate: 'Desaturate', textDarken: 'Darken', textLighten: 'Lighten', textTransparency: 'Transparency', textObjectColor: 'Object Color', textComplementaryColor: 'Complementary Color', + textComplementaryColor2: 'Complementary Color 2', textLineColor: 'Line Color', textFillColor: 'Fill Color', textBrushColor: 'Brush Color', @@ -644,10 +646,11 @@ define(function(){ 'use strict'; textExciting: 'Exciting', textBox: 'Box', textCircle: 'Circle', + textPlus: 'Plus', + textDiamond: 'Diamond', textDissolveIn: 'Dissolve In', textBlinds: 'Blinds', textCheckerboard: 'Checkerboard', - textDiamond: 'Diamond', textPeekIn: 'Peek In', textStrips: 'Strips', textExpand: 'Expand', @@ -659,6 +662,16 @@ define(function(){ 'use strict'; textCenterRevolve: 'Center Revolve', textFloatDown: 'Float Down', textSpinner: 'Spinner', + textBasicSwivel: 'Basic Swivel', + textBoomerang: 'Boomerang', + textCredits: 'Credits', + textCuverUp: 'Cuver Up', + textDrop: 'Drop', + textFloat: 'Float', + textPinwheel: 'Pinwheel', + textSpiralIn: 'Spiral In', + textWhip: 'Whip', + getEffectGroupData: function (){ return[ @@ -672,45 +685,57 @@ define(function(){ 'use strict'; getEffectData: function (){ return[ - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_APPEAR, iconCls: 'column-normal', caption: this.textAppear}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FADE, iconCls: 'column-normal', caption: this.textFade}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'column-normal', caption: this.textFlyIn}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FLOAT, iconCls: 'column-normal', caption: this.textFloatIn}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_SPLIT, iconCls: 'column-normal', caption: this.textSplit}, - {group: 'menu-effect-group-entrance', type: ?, iconCls: 'column-normal', caption: this.textWipe}, - {group: 'menu-effect-group-entrance', type: ?, iconCls: 'column-normal', caption: this.textShape}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_WHEEL, iconCls: 'column-normal', caption: this.textWheel}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'column-normal', caption: this.textRandomBars}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'column-normal', caption: this.textGrowTurn}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_ZOOM, iconCls: 'column-normal', caption: this.textZoom}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_SWIVEL, iconCls: 'column-normal', caption: this.textSwivel}, - {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_BOUNCE, iconCls: 'column-normal', caption: this.textBounce}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_PULSE, iconCls: 'column-normal', caption: this.textPulse}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'column-normal', caption: this.textColorPulse}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_TEETER, iconCls: 'column-normal', caption: this.textTeeter}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_SPIN, iconCls: 'column-normal', caption: this.textSplit}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'column-normal', caption: this.textGrowShrink}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_DESATURATE, iconCls: 'column-normal', caption: this.textDesaturate}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'column-normal', caption: this.textDarken}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_LIGHTEN, iconCls: 'column-normal', caption: this.textLighten}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'column-normal', caption: this.textTransparency}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'column-normal', caption: this.textObjectColor}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'column-normal', caption: this.textComplementaryColor}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'column-normal', caption: this.textLineColor}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'column-normal', caption: this.textFillColor}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BRUSH_COLOR, iconCls: 'column-normal', caption: this.textBrushColor}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_UNDERLINE, iconCls: 'column-normal', caption: this.textUnderline}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BOLD_FLASH, iconCls: 'column-normal', caption: this.textBoldFlash}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BOLD_REVEAL, iconCls: 'column-normal', caption: this.textBoldReveal}, - {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_WAVE, iconCls: 'column-normal', caption: this.textWave}, - {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_DISAPPEAR, iconCls: 'column-normal', caption: this.textDisappear}, - {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FADE, iconCls: 'column-normal', caption: this.textFade}, - {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FLY_OUT_TO, iconCls: 'column-normal', caption: this.textFlyOut}, - {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FLOAT, iconCls: 'column-normal', caption: this.textFloatOut}, - {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_SPLIT, iconCls: 'column-normal', caption: this.textSplit}, - {group: 'menu-effect-group-exit', type: ?, iconCls: 'column-normal', caption: x}, - {group: 'menu-effect-group-exit', type: ?, iconCls: 'column-normal', caption: this.textWipe}, - {group: 'menu-effect-group-exit', type: ?, iconCls: 'column-normal', caption: this.textShape} + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_APPEAR, iconCls: 'transition-push', caption: this.textAppear}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FADE, iconCls: 'transition-push', caption: this.textFade}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'transition-push', caption: this.textFlyIn}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_FLOAT, iconCls: 'transition-push', caption: this.textFloatIn}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_SPLIT, iconCls: 'transition-push', caption: this.textSplit}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'transition-wipe', caption: this.textWipe}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_BOX, iconCls: 'transition-push', caption: this.textBox}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_CIRCLE, iconCls: 'transition-push', caption: this.textCircle}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_PLUS, iconCls: 'transition-push', caption: this.textPlus}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_DIAMOND, iconCls: 'transition-push', caption: this.textDiamond}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_WHEEL, iconCls: 'transition-push', caption: this.textWheel}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'transition-push', caption: this.textRandomBars}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'transition-push', caption: this.textGrowTurn}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_ZOOM, iconCls: 'transition-zoom', caption: this.textZoom}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_SWIVEL, iconCls: 'transition-push', caption: this.textSwivel}, + {group: 'menu-effect-group-entrance', type: Asc.AscFormat.ENTRANCE_BOUNCE, iconCls: 'transition-push', caption: this.textBounce}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_PULSE, iconCls: 'transition-push', caption: this.textPulse}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'transition-push', caption: this.textColorPulse}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_TEETER, iconCls: 'transition-push', caption: this.textTeeter}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_SPIN, iconCls: 'transition-split', caption: this.textSplit}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'transition-push', caption: this.textGrowShrink}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_DESATURATE, iconCls: 'transition-push', caption: this.textDesaturate}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'transition-push', caption: this.textDarken}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_LIGHTEN, iconCls: 'transition-push', caption: this.textLighten}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'transition-push', caption: this.textTransparency}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'transition-push', caption: this.textObjectColor}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'transition-push', caption: this.textComplementaryColor}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'transition-push', caption: this.textLineColor}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'transition-push', caption: this.textFillColor}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BRUSH_COLOR, iconCls: 'transition-push', caption: this.textBrushColor}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_UNDERLINE, iconCls: 'transition-push', caption: this.textUnderline}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BOLD_FLASH, iconCls: 'transition-push', caption: this.textBoldFlash}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_BOLD_REVEAL, iconCls: 'transition-push', caption: this.textBoldReveal}, + {group: 'menu-effect-group-emphasis', type: Asc.AscFormat.EMPHASIS_WAVE, iconCls: 'transition-push', caption: this.textWave}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_DISAPPEAR, iconCls: 'transition-push', caption: this.textDisappear}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FADE, iconCls: 'transition-push', caption: this.textFade}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FLY_OUT_TO, iconCls: 'transition-push', caption: this.textFlyOut}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_FLOAT, iconCls: 'transition-push', caption: this.textFloatOut}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_SPLIT, iconCls: 'transition-split', caption: this.textSplit}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_WIPE_FROM, iconCls: 'transition-wipe', caption: this.textWipe}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_BOX, iconCls: 'transition-push', caption: this.textBox}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_CIRCLE, iconCls: 'transition-push', caption: this.textCircle}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_PLUS, iconCls: 'transition-push', caption: this.textPlus}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_DIAMOND, iconCls: 'transition-push', caption: this.textDiamond}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_WHEEL, iconCls: 'transition-push', caption: this.textWheel}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_RANDOM_BARS, iconCls: 'transition-push', caption: this.textRandomBars}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'transition-push', caption: this.textShrinkTurn}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_ZOOM, iconCls: 'transition-push', caption: this.textZoom}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_BASIC_SWIVEL, iconCls: 'transition-push', caption: this.textSwivel}, + {group: 'menu-effect-group-exit', type: Asc.AscFormat.EXIT_BOUNCE, iconCls: 'transition-push', caption: this.textBounce} + // {group: 'menu-effect-group-motion', type: Asc.AscFormat.EXIT_BOUNCE, iconCls: 'transition-push', caption: this.textBounce}, ]; }, @@ -725,8 +750,49 @@ define(function(){ 'use strict'; getEffectFullData: function (){ return[ - {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_APPEAR, caption: this.textAppear }, - {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_BOX, caption: this.textBox }, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_APPEAR, caption: this.textAppear}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_BLINDS, caption: this.textBlinds}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_BOX, caption: this.textBox}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_CHECKERBOARD, caption: this.textCheckerboard}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_CIRCLE, caption: this.textCircle}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_DISSOLVE_IN, caption: this.textDissolveIn}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_FLY_IN_FROM, caption: this.textFlyIn}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_PEEK_IN_FROM, caption: this.textPeekIn}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_PLUS, caption: this.textPlus}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_RANDOM_BARS, caption: this.textRandomBars}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_SPLIT, caption: this.textSplit}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_STRIPS, caption: this.textStrips}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_WEDGE, caption: this.textWedge}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_WHEEL, caption: this.textWheel}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-basic', type: Asc.AscFormat.ENTRANCE_WIPE_FROM, caption: this.textWipe}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-subtle', type: Asc.AscFormat.ENTRANCE_EXPAND, caption: this.textExpand}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-subtle', type: Asc.AscFormat.ENTRANCE_FADE, caption: this.textFade}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-subtle', type: Asc.AscFormat.ENTRANCE_SWIVEL, caption: this.textSwivel}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-subtle', type: Asc.AscFormat.ENTRANCE_ZOOM, caption: this.textZoom}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_BASIC_ZOOM, caption: this.textBasicZoom}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_CENTER_REVOLVE, caption: this.textCenterRevolve}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_CENTER_COMPRESS , caption: this.textCompress}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_FLOAT_DOWN, caption: this.textFloatDown}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_FLOAT_UP, caption: this.textFloatUp}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_GROW_AND_TURN, caption: this.textGrowTurn}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_RISE_UP, caption: this.textRiseUp}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_SPINNER, caption: this.textSpinner}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-moderate', type: Asc.AscFormat.ENTRANCE_STRETCH, caption: this.textStretch}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_BASIC_SWIVEL, caption: this.textBasicSwivel}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_BOOMERANG, caption: this.textBoomerang}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_BOUNCE, caption: this.textBounce}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_CREDITS, caption: this.textCredits}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_CURVE_UP, caption: this.textCuverUp}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_DROP, caption: this.textDrop}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_FLIP, caption: this.textFlip}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_FLOAT, caption: this.textFloat}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_PINWHEEL, caption: this.textPinwheel}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_SPIRAL_IN, caption: this.textSpiralIn}, + {group: 'menu-effect-group-entrance', level:'menu-effect-level-exciting', type: Asc.AscFormat.ENTRANCE_WHIP, caption: this.textWhip}, + {group: 'menu-effect-group-emphasis', level:'menu-effect-level-basic', type: Asc.AscFormat.EMPHASIS_FILL_COLOR, caption: this.textFillColor}, + + ]; }