From ac7b7ca290e3a83cf1753fd3c567a1e7f0d4e235 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 6 Aug 2021 06:05:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1hanges=20for=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/controller/Toolbar.js | 3 +- .../main/app/controller/Transitions.js | 211 ++++++++------- .../main/app/template/Transitions.template | 36 --- .../main/app/view/Toolbar.js | 1 - .../main/app/view/Transitions.js | 244 +++++++++--------- apps/presentationeditor/main/locale/en.json | 39 ++- .../main/resources/less/transitions.less | 28 +- 7 files changed, 296 insertions(+), 266 deletions(-) delete mode 100644 apps/presentationeditor/main/app/template/Transitions.template diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index c2271a249..579a7c63e 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -131,8 +131,7 @@ define([ 'add:slide' : this.onAddSlide.bind(this), 'change:slide' : this.onChangeSlide.bind(this), 'change:compact' : this.onClickChangeCompact, - 'add:chart' : this.onSelectChart, - 'transit:settab' : this.setTrantitTab + 'add:chart' : this.onSelectChart }, 'FileMenu': { 'menu:hide': this.onFileMenu.bind(this, 'hide'), diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js index 0383185df..279b4f4f5 100644 --- a/apps/presentationeditor/main/app/controller/Transitions.js +++ b/apps/presentationeditor/main/app/controller/Transitions.js @@ -49,8 +49,7 @@ define([ PE.Controllers.Transitions = Backbone.Controller.extend(_.extend({ models : [], - collections : [ - ], + collections : [], views : [ 'PE.Views.Transitions' ], @@ -62,24 +61,27 @@ define([ initialize: function () { this.addListeners({ - 'PE.Views.Transitions': { 'transit:preview': _.bind(this.onPreviewClick, this), - 'transit:parametrs': _.bind(this.onParametrClick,this), - 'transit:duration': _.bind(this.onDurationChange,this), - 'transit:applytoall': _.bind(this.onApplyToAllClick,this), + 'transit:parametrs': _.bind(this.onParametrClick, this), + 'transit:duration': _.bind(this.onDurationChange, this), + 'transit:applytoall': _.bind(this.onApplyToAllClick, this), 'transit:selecteffect': _.bind(this.onEffectSelect, this), - 'transit:startonclick': _.bind(this.onStartOnClickChange,this), - 'transit:delay': _.bind(this.onDelayChange,this), - 'transit:checkdelay': _.bind(this.onCheckDelayChange,this) + 'transit:startonclick': _.bind(this.onStartOnClickChange, this), + 'transit:delay': _.bind(this.onDelayChange, this), + 'transit:checkdelay': _.bind(this.onCheckDelayChange, this) + }, + 'Toolbar': { + 'tab:active': _.bind(this.onActiveTab, this) } }); }, + onLaunch: function () { this._state = {}; - //Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, + setConfig: function (config) { this.appConfig = config.mode; @@ -88,7 +90,7 @@ define([ mode: config.mode }); return this; - }, + }, setApi: function (api) { this.api = api; @@ -96,43 +98,28 @@ define([ this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this)); return this; }, - onApiCountPagesRestricted: function (count){ - if (this._state.no_slides !== (count<=0)) { - this._state.no_slides = (count<=0); - this.lockToolbar(PE.enumLock.noSlides, this._state.no_slides); - } - }, - loadDocument: function(data) { - this.document = data.doc; - }, - - SetDisabled: function(state) { - /*if (this.dlgChanges) - this.dlgChanges.close(); - this.view && this.view.SetDisabled(state, this.langs);*/ - //this.setPreviewMode(state); + onApiCountPagesRestricted: function (count) { + /*if (this._state.no_slides !== (count <= 0))*/ + this._state.no_slides = (count <= 0); }, createToolbarPanel: function() { return this.view.getPanel(); - }, + }, getView: function(name) { return !name && this.view ? this.view : Backbone.Controller.prototype.getView.call(this, name); }, - onAppReady: function (config) { - var me = this; - - }, - onPreviewClick: function(){ + onPreviewClick: function() { if (this.api) { this.api.SlideTransitionPlay(); } }, - onParametrClick: function (item){ + + onParametrClick: function (item) { this.EffectType = item.value; if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); @@ -143,8 +130,9 @@ define([ this.api.SetSlideProps(props); } }, - onDurationChange: function(field, newValue, oldValue, eOpts){ - if (this.api && !this._noApply) { + + onDurationChange: function(field, newValue, oldValue, eOpts) { + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_TransitionDuration(field.getNumberValue()*1000); @@ -152,17 +140,19 @@ define([ this.api.SetSlideProps(props); } }, - onStartOnClickChange: function(field, newValue, oldValue, eOpts){ - if (this.api && !this._noApply) { + + onStartOnClickChange: function(field, newValue, oldValue, eOpts) { + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); - transition.put_SlideAdvanceOnMouseClick(field.getValue()=='checked'); + transition.put_SlideAdvanceOnMouseClick(field.getValue() == 'checked'); props.put_transition(transition); this.api.SetSlideProps(props); } }, - onDelayChange: function(field, newValue, oldValue, eOpts){ - if (this.api && !this._noApply) { + + onDelayChange: function(field, newValue, oldValue, eOpts) { + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); transition.put_SlideAdvanceDuration(field.getNumberValue()*1000); @@ -170,30 +160,34 @@ define([ this.api.SetSlideProps(props); } }, - onCheckDelayChange: function(field, newValue, oldValue, eOpts){ - this.view.numDelay.setDisabled(field.getValue()!=='checked'); - if (this.api && !this._noApply) { + + onCheckDelayChange: function(field, newValue, oldValue, eOpts) { + this.view.numDelay.setDisabled(field.getValue() !== 'checked'); + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); - transition.put_SlideAdvanceAfter(field.getValue()=='checked'); + transition.put_SlideAdvanceAfter(field.getValue() == 'checked'); props.put_transition(transition); this.api.SetSlideProps(props); } }, - onApplyToAllClick: function (){ + + onApplyToAllClick: function () { if (this.api) this.api.SlideTransitionApplyToAll(); }, - onEffectSelect:function (combo, record){ + + onEffectSelect: function (combo, record) { var type = record.get('value'); + if (this.Effect !== type && - !((this.Effect===Asc.c_oAscSlideTransitionTypes.Wipe || this.Effect===Asc.c_oAscSlideTransitionTypes.UnCover || this.Effect===Asc.c_oAscSlideTransitionTypes.Cover)&& - (type===Asc.c_oAscSlideTransitionTypes.Wipe || type===Asc.c_oAscSlideTransitionTypes.UnCover || type===Asc.c_oAscSlideTransitionTypes.Cover)) ) - { - var parametr=this.view.setMenuParametrs(type); - if(parametr) + !((this.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&& + (type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) { + var parametr = this.view.setMenuParametrs(type); + if (parametr) this.onParametrClick(parametr); } this.Effect = type; + if (this.api && !this._noApply) { var props = new Asc.CAscSlideProps(); var transition = new Asc.CAscSlideTransition(); @@ -203,71 +197,45 @@ define([ this.api.SetSlideProps(props); } }, - onFocusObject:function(selectedObjects){ + + onFocusObject: function(selectedObjects) { var me = this; - for (var i=0; i0) { - value = transition.get_TransitionOption(); - me.setMenuParametrs(this._state.Effect, value); - this._state.EffectType = value; - } - - value = transition.get_TransitionDuration(); + var value = transition.get_TransitionDuration(); if (Math.abs(this._state.Duration - value) > 0.001 || (this._state.Duration === null || value === null) && (this._state.Duration !== value) || (this._state.Duration === undefined || value === undefined) && (this._state.Duration !== value)) { - me.numDuration.setValue((value !== null && value !== undefined) ? value / 1000. : '', true); this._state.Duration = value; } @@ -275,22 +243,51 @@ define([ if (Math.abs(this._state.Delay - value) > 0.001 || (this._state.Delay === null || value === null) && (this._state.Delay !== value) || (this._state.Delay === undefined || value === undefined) && (this._state.Delay !== value)) { - me.numDelay.setValue((value !== null && value !== undefined) ? value / 1000. : '', true); this._state.Delay = value; } - value = transition.get_SlideAdvanceOnMouseClick(); - if (this._state.OnMouseClick !== value) { - me.chStartOnClick.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true); - this._state.OnMouseClick = value; - } - value = transition.get_SlideAdvanceAfter(); - if (this._state.AdvanceAfter !== value) { - me.chDelay.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true); - me.numDelay.setDisabled(me.chDelay.getValue() !== 'checked'); - this._state.AdvanceAfter = value; - } + this._state.OnMouseClick = transition.get_SlideAdvanceOnMouseClick(); + this._state.AdvanceAfter = transition.get_SlideAdvanceAfter(); } + }, + + onActiveTab: function(tab) { + if (tab == 'transit') { + this._state.onactivetab = true; + this.setLocked(); + this.setSettings(); + } + else this._state.onactivetab = false; + }, + + lockToolbar: function (causes, lock, opts) { + Common.Utils.lockControls(causes, lock, opts, this.view.lockedControls); + }, + + setLocked: function() { + if (this._state.lockedtransition != undefined) + this.lockToolbar(PE.enumLock.transitLock, this._state.lockedtransition); + if (this._state.no_slides != undefined) + this.lockToolbar(PE.enumLock.noSlides, this._state.no_slides); + }, + + setSettings: function () { + var me = this.view; + + if (this._state.Effect !== undefined) { + var item = me.listEffects.store.findWhere({value: this._state.Effect}); + me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]); + } + + if (me.btnParametrs.menu.items.length > 0 && this._state.EffectType !== undefined) + me.setMenuParametrs(this._state.Effect, this._state.EffectType); + + me.numDuration.setValue((this._state.Duration !== null && this._state.Duration !== undefined) ? this._state.Duration / 1000. : '', true); + me.numDelay.setValue((this._state.Delay !== null && this._state.Delay !== undefined) ? this._state.Delay / 1000. : '', true); + me.chStartOnClick.setValue((this._state.OnMouseClick !== null && this._state.OnMouseClick !== undefined) ? this._state.OnMouseClick : 'indeterminate', true); + me.chDelay.setValue((this._state.AdvanceAfter !== null && this._state.AdvanceAfter !== undefined) ? this._state.AdvanceAfter : 'indeterminate', true); + me.numDelay.setDisabled(me.chDelay.getValue() !== 'checked' || me.chDelay.disabled); } + }, PE.Controllers.Transitions || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/template/Transitions.template b/apps/presentationeditor/main/app/template/Transitions.template deleted file mode 100644 index c3d5cab86..000000000 --- a/apps/presentationeditor/main/app/template/Transitions.template +++ /dev/null @@ -1,36 +0,0 @@ -
-
- -
- -
-
-
-
- - -
-
- -
-
-
-
-
- -
-
- - -
-
-
-
-
- -
-
- -
-
-
\ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index e92f46904..7cef4962a 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1039,7 +1039,6 @@ define([ var _injectComponent = function (id, cmp) { Common.Utils.injectComponent($host.find(id), cmp); }; - //this.fireEvent('transit:settab',[$host]); _injectComponent('#slot-field-fontname', this.cmbFontName); _injectComponent('#slot-field-fontsize', this.cmbFontSize); _injectComponent('#slot-btn-changeslide', this.btnChangeSlide); diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index c6f1271d6..fcce0a006 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -43,7 +43,6 @@ define([ - 'text!presentationeditor/main/app/template/Transitions.template', 'common/main/lib/util/utils', 'common/main/lib/component/Button', 'common/main/lib/component/DataView', @@ -52,55 +51,62 @@ define([ 'presentationeditor/main/app/view/SlideSettings', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/Window' -], function (template) { +], function () { 'use strict'; - PE.Views.Transitions = Common.UI.BaseView.extend(_.extend((function(){ + PE.Views.Transitions = Common.UI.BaseView.extend(_.extend((function() { function setEvents() { var me = this; - if(me.listEffects){ - me.listEffects.on('click', _.bind(function (combo,record){ - me.fireEvent('transit:selecteffect',[combo,record]); - },me)); + if (me.listEffects) { + me.listEffects.on('click', _.bind(function (combo, record) { + me.fireEvent('transit:selecteffect', [combo, record]); + }, me)); } - if(me.btnPreview){ - me.btnPreview.on('click', _.bind(function(btn){ + + if (me.btnPreview) { + me.btnPreview.on('click', _.bind(function(btn) { me.fireEvent('transit:preview', [me.btnPreview]); }, me)); } - if(me.btnParametrs) { - me.btnParametrs.on('click', function (e) { - me.fireEvent('transit:parametrs', ['current']); + + if (me.btnParameters) { + me.btnParameters.on('click', function (e) { + me.fireEvent('transit:Parameters', ['current']); }); - me.btnParametrs.menu.on('item:click', function (menu, item, e) { - me.fireEvent('transit:parametrs', [item]); + me.btnParameters.menu.on('item:click', function (menu, item, e) { + me.fireEvent('transit:Parameters', [item]); }); } - if(me.btnApplyToAll){ - me.btnApplyToAll.on('click', _.bind(function(btn){ + + if (me.btnApplyToAll) { + me.btnApplyToAll.on('click', _.bind(function(btn) { me.fireEvent('transit:applytoall', [me.btnApplyToAll]); }, me)); } - if(me.numDuration){ + + if (me.numDuration) { me.numDuration.on('change', function(bth) { me.fireEvent('transit:duration', [me.numDuration]); - },me); + }, me); } - if(me.numDelay){ + + if (me.numDelay) { me.numDelay.on('change', function(bth) { me.fireEvent('transit:delay', [me.numDelay]); - },me); + }, me); } - if(me.chStartOnClick){ - me.chStartOnClick.on('change',_.bind(function (e){ - me.fireEvent('transit:startonclick',[ me.chStartOnClick,me.chStartOnClick.value, me.chStartOnClick.lastValue]); - },me)); + + if (me.chStartOnClick) { + me.chStartOnClick.on('change', _.bind(function (e) { + me.fireEvent('transit:startonclick', [me.chStartOnClick, me.chStartOnClick.value, me.chStartOnClick.lastValue]); + }, me)); } - if(me.chDelay){ - me.chDelay.on('change',_.bind(function (e){ - me.fireEvent('transit:checkdelay',[ me.chDelay,me.chDelay.value, me.chDelay.lastValue]); - },me)); + + if (me.chDelay) { + me.chDelay.on('change', _.bind(function (e) { + me.fireEvent('transit:checkdelay', [me.chDelay, me.chDelay.value, me.chDelay.lastValue]); + }, me)); } } @@ -112,22 +118,22 @@ define([ initialize: function (options) { Common.UI.BaseView.prototype.initialize.call(this, options); - this.toolbar=options.toolbar; + this.toolbar = options.toolbar; this.appConfig = options.mode; - this.$el=this.toolbar.toolbar.$el.find('#transitions-panel'); - var _set=PE.enumLock; - this.lockedControls=[]; + this.$el = this.toolbar.toolbar.$el.find('#transitions-panel'); + var _set = PE.enumLock; + this.lockedControls = []; this._arrEffectName = [ - {title: this.textNone, imageUrl:"btn-text", value: Asc.c_oAscSlideTransitionTypes.None, id: Common.UI.getId()}, - {title: this.textFade, imageUrl:"btn-insertimage", value: Asc.c_oAscSlideTransitionTypes.Fade, id: Common.UI.getId()}, - {title: this.textPush, imageUrl:"btn-insertshape", value: Asc.c_oAscSlideTransitionTypes.Push, id: Common.UI.getId()}, - {title: this.textWipe, imageUrl:"btn-insertchart", value: Asc.c_oAscSlideTransitionTypes.Wipe, id: Common.UI.getId()}, - {title: this.textSplit, imageUrl:"btn-textart", value: Asc.c_oAscSlideTransitionTypes.Split, id: Common.UI.getId()}, - {title: this.textUnCover, imageUrl:"btn-menu-comments", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()}, - {title: this.textCover, imageUrl:"btn-editheader", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()}, - {title: this.textClock, imageUrl:"btn-datetime", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()}, - {title: this.textZoom, imageUrl:"btn-addslide", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()} + {title: this.textNone, imageUrl: "btn-text", value: Asc.c_oAscSlideTransitionTypes.None, id: Common.UI.getId()}, + {title: this.textFade, imageUrl: "btn-insertimage", value: Asc.c_oAscSlideTransitionTypes.Fade, id: Common.UI.getId()}, + {title: this.textPush, imageUrl: "btn-insertshape", value: Asc.c_oAscSlideTransitionTypes.Push, id: Common.UI.getId()}, + {title: this.textWipe, imageUrl: "btn-insertchart", value: Asc.c_oAscSlideTransitionTypes.Wipe, id: Common.UI.getId()}, + {title: this.textSplit, imageUrl: "btn-textart", value: Asc.c_oAscSlideTransitionTypes.Split, id: Common.UI.getId()}, + {title: this.textUnCover, imageUrl: "btn-menu-comments", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()}, + {title: this.textCover, imageUrl: "btn-editheader", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()}, + {title: this.textClock, imageUrl: "btn-datetime", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()}, + {title: this.textZoom, imageUrl: "btn-addslide", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()} ]; this.listEffects = new Common.UI.ComboDataView({ @@ -135,7 +141,7 @@ define([ itemWidth: 87, itemHeight: 40, enableKeyEvents: true, - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock], + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock], beforeOpenHandler: function (e) { var cmp = this, menu = cmp.openButton.menu; @@ -145,7 +151,7 @@ define([ menu.menuAlignEl = cmp.cmpEl; menu.menuAlign = 'tl-tl'; menu.cmpEl.css({ - 'width': cmp.cmpEl.width()- cmp.openButton.$el.width(), + 'width': cmp.cmpEl.width() - cmp.openButton.$el.width(), 'min-height': cmp.cmpEl.height() }); } @@ -164,41 +170,41 @@ define([ this.listEffects.menuPicker.store.add(this._arrEffectName); this.listEffects.fieldPicker.itemTemplate = _.template([ - '
', - '
', - '
', - '
<%= title %>
', + '
', + '
', + '
', + '
<%= title %>
', '
', '
' ].join('')); - this.listEffects.menuPicker.itemTemplate =this.listEffects.fieldPicker.itemTemplate; + this.listEffects.menuPicker.itemTemplate = this.listEffects.fieldPicker.itemTemplate; this.btnPreview = new Common.UI.Button({ - cls: 'btn-toolbar ',// x-huge icon-top', + cls: 'btn-toolbar ', // x-huge icon-top', caption: this.txtPreview, split: false, iconCls: 'toolbar__icon btn-preview', - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.btnPreview); - this.btnParametrs = new Common.UI.Button({ + this.btnParameters = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - caption: this.txtParametrs, + caption: this.txtParameters, iconCls: 'toolbar__icon icon btn-insertshape', menu: new Common.UI.Menu({ maxHeight:115, - items: this.createParametrsMenuItems()}), - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + items: this.createParametersMenuItems()}), + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); - this.lockedControls.push(this.btnParametrs); + this.lockedControls.push(this.btnParameters); this.btnApplyToAll = new Common.UI.Button({ cls: 'btn-toolbar', caption: this.txtApplyToAll, split: true, iconCls: 'toolbar__icon btn-changeslide', - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.btnApplyToAll); @@ -207,10 +213,10 @@ define([ step: 1, width: 50, value: '', - defaultUnit : this.txtSec, + defaultUnit: this.txtSec, maxValue: 300, minValue: 0, - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.numDuration); @@ -219,24 +225,24 @@ define([ step: 1, width: 60, value: '', - defaultUnit : this.txtSec, + defaultUnit: this.txtSec, maxValue: 300, minValue: 0, - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.numDelay); this.chStartOnClick = new Common.UI.CheckBox({ el: this.$el.find('#transit-checkbox-startonclick'), labelText: this.strStartOnClick, - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.chStartOnClick); this.chDelay = new Common.UI.CheckBox({ el: this.$el.find('#transit-checkbox-delay'), labelText: this.strDelay, - lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock] + lock:[_set.slideDeleted, _set.noSlides, _set.disableOnStart, _set.transitLock] }); this.lockedControls.push(this.chDelay); @@ -248,21 +254,21 @@ define([ render: function (el) { this.boxSdk = $('#editor_sdk'); - if ( el ) el.html( this.getPanel() ); + if (el) el.html(this.getPanel()); return this; }, - createParametrsMenuItems: function() + createParametersMenuItems: function() { - var arrEffectType =[ - {caption: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly}, - {caption: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Fade_Through_Black}, - {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Param_Left}, - {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Param_Top}, - {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Param_Right}, - {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Param_Bottom}, - {caption: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Param_TopLeft}, - {caption: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Param_TopRight}, + var arrEffectType = [ + {caption: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly}, + {caption: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Fade_Through_Black}, + {caption: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Param_Left}, + {caption: this.textTop, value: Asc.c_oAscSlideTransitionParams.Param_Top}, + {caption: this.textRight, value: Asc.c_oAscSlideTransitionParams.Param_Right}, + {caption: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Param_Bottom}, + {caption: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Param_TopLeft}, + {caption: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Param_TopRight}, {caption: this.textBottomLeft, value: Asc.c_oAscSlideTransitionParams.Param_BottomLeft}, {caption: this.textBottomRight, value: Asc.c_oAscSlideTransitionParams.Param_BottomRight}, {caption: this.textVerticalIn, value: Asc.c_oAscSlideTransitionParams.Split_VerticalIn}, @@ -271,50 +277,50 @@ define([ {caption: this.textHorizontalOut, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalOut}, {caption: this.textClockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Clockwise}, {caption: this.textCounterclockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Counterclockwise}, - {caption: this.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge}, - {caption: this.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In}, - {caption: this.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out}, + {caption: this.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge}, + {caption: this.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In}, + {caption: this.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out}, {caption: this.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate} ]; - var itemsMenu=[]; - _.each(arrEffectType, function (item){ - itemsMenu.push( - { + var itemsMenu = []; + _.each(arrEffectType, function (item) { + itemsMenu.push({ caption: item.caption, value: item.value, checkable: true, toggleGroup: 'effects' - } - ); + }); }); return itemsMenu; }, + onAppReady: function (config) { var me = this; (new Promise(function (accept, reject) { accept(); - })).then(function(){ + })).then(function() { setEvents.call(me); }); }, getPanel: function () { - this.listEffects&&this.listEffects.render(this.$el.find('#transit-field-effects')); + this.listEffects && this.listEffects.render(this.$el.find('#transit-field-effects')); this.btnPreview && this.btnPreview.render(this.$el.find('#transit-button-preview')); - this.btnParametrs && this.btnParametrs.render(this.$el.find('#transit-button-parametrs')); + this.btnParameters && this.btnParameters.render(this.$el.find('#transit-button-Parameters')); this.btnApplyToAll && this.btnApplyToAll.render(this.$el.find('#transit-button-apply')); this.renderComponent('#transit-spin-duration', this.numDuration); this.renderComponent('#transit-spin-delay', this.numDelay); this.renderComponent('#transit-checkbox-startonclick', this.chStartOnClick); - this.$el.find("#label-duration").innerText=this.strDuration; - this.$el.find("#label-delay").innerText=this.strDelay; + this.$el.find("#label-duration").innerText = this.strDuration; + this.$el.find("#label-delay").innerText = this.strDelay; return this.$el; }, + renderComponent: function (compid, obj) { - var element=this.$el.find(compid); + var element = this.$el.find(compid); element.parent().append(obj.el); }, @@ -323,68 +329,70 @@ define([ this.fireEvent('show', this); }, - getButtons: function (type){ - if (type===undefined) + getButtons: function (type) { + if (type === undefined) return this.lockedControls; return []; }, + setDisabled: function (state) { - this.lockedControls && this.lockedControls.forEach(function (button){ + this.lockedControls && this.lockedControls.forEach(function (button) { button.setDisabled(state); - },this); + }, this); }, - setMenuParametrs:function (effect,value) + setMenuParameters: function (effect, value) { - var minMax=[-1,-1]; + var minMax = [-1, -1]; switch (effect) { case Asc.c_oAscSlideTransitionTypes.Fade: - minMax=[0,1]; + minMax = [0, 1]; break; case Asc.c_oAscSlideTransitionTypes.Push: - minMax=[2, 5]; + minMax = [2, 5]; break; case Asc.c_oAscSlideTransitionTypes.Wipe: - minMax=[2, 9]; + minMax = [2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Split: - minMax=[10, 13]; + minMax = [10, 13]; break; case Asc.c_oAscSlideTransitionTypes.UnCover: - minMax=[2, 9]; + minMax = [2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Cover: - minMax=[2, 9]; + minMax = [2, 9]; break; case Asc.c_oAscSlideTransitionTypes.Clock: - minMax=[14, 16]; + minMax = [14, 16]; break; case Asc.c_oAscSlideTransitionTypes.Zoom: - minMax=[17,19]; + minMax = [17, 19]; break; } + var selectedElement; - _.each(this.btnParametrs.menu.items,function (element,index){ - if(((indexminMax[1]))) - element.$el.css('display','none'); + _.each(this.btnParameters.menu.items, function (element, index) { + if (((index < minMax[0])||(index > minMax[1]))) + element.$el.css('display', 'none'); else { - element.$el.css('display',''); + element.$el.css('display', ''); + if (value != undefined) { - if (value == element.value) - selectedElement = element; + if (value == element.value) selectedElement = element; } } }); - - if(selectedElement==undefined) - selectedElement=this.btnParametrs.menu.items[minMax[0]]; - if(effect!=Asc.c_oAscSlideTransitionTypes.None) + if (selectedElement == undefined) + selectedElement = this.btnParameters.menu.items[minMax[0]]; + + if (effect != Asc.c_oAscSlideTransitionTypes.None) selectedElement.setChecked(true); - if(!this.listEffects.isDisabled()) { - this.numDelay.setDisabled(this.chDelay.getValue()!=='checked'); - this.btnParametrs.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); + if (!this.listEffects.isDisabled()) { + this.numDelay.setDisabled(this.chDelay.getValue() !== 'checked'); + this.btnParameters.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.btnPreview.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); this.numDuration.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None); } @@ -392,9 +400,9 @@ define([ }, - txtSec:'s', - txtPreview:'Preview', - txtParametrs: 'Parametrs', + txtSec: 's', + txtPreview: 'Preview', + txtParameters: 'Parameters', txtApplyToAll: 'Apply to All Slides', strDuration: 'Duration', strDelay: 'Delay', diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 05d49feb3..0d96c580b 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -2008,5 +2008,42 @@ "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", - "PE.Views.Toolbar.txtUngroup": "Ungroup" + "PE.Views.Toolbar.txtUngroup": "Ungroup", + "PE.Views.Transitions.txtSec": "s", + "PE.Views.Transitions.txtPreview": "Preview", + "PE.Views.Transitions.txtParameters": "Parameters", + "PE.Views.Transitions.txtApplyToAll": "Apply to All Slides", + "PE.Views.Transitions.strDuration": "Duration", + "PE.Views.Transitions.strDelay": "Delay", + "PE.Views.Transitions.strStartOnClick": "Start On Click", + "PE.Views.Transitions.textNone": "None", + "PE.Views.Transitions.textFade": "Fade", + "PE.Views.Transitions.textPush": "Push", + "PE.Views.Transitions.textWipe": "Wipe", + "PE.Views.Transitions.textSplit": "Split", + "PE.Views.Transitions.textUnCover": "UnCover", + "PE.Views.Transitions.textCover": "Cover", + "PE.Views.Transitions.textClock": "Clock", + "PE.Views.Transitions.textZoom": "Zoom", + "PE.Views.Transitions.textSmoothly": "Smoothly", + "PE.Views.Transitions.textBlack": "Through Black", + "PE.Views.Transitions.textLeft": "Left", + "PE.Views.Transitions.textTop": "Top", + "PE.Views.Transitions.textRight": "Right", + "PE.Views.Transitions.textBottom": "Bottom", + "PE.Views.Transitions.textTopLeft": "Top-Left", + "PE.Views.Transitions.textTopRight": "Top-Right", + "PE.Views.Transitions.textBottomLeft": "Bottom-Left", + "PE.Views.Transitions.textBottomRight": "Bottom-Right", + "PE.Views.Transitions.textVerticalIn": "Vertical In", + "PE.Views.Transitions.textVerticalOut": "Vertical Out", + "PE.Views.Transitions.textHorizontalIn": "Horizontal In", + "PE.Views.Transitions.textHorizontalOut": "Horizontal Out", + "PE.Views.Transitions.textClockwise": "Clockwise", + "PE.Views.Transitions.textCounterclockwise": "Counterclockwise", + "PE.Views.Transitions.textWedge": "Wedge", + "PE.Views.Transitions.textZoomIn": "Zoom In", + "PE.Views.Transitions.textZoomOut": "Zoom Out", + "PE.Views.Transitions.textZoomRotate": "Zoom and Rotate", + "PE.Views.Toolbar.textTabTransitions": "Transitions" } \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/less/transitions.less b/apps/presentationeditor/main/resources/less/transitions.less index 33aeeb9f5..356cd658e 100644 --- a/apps/presentationeditor/main/resources/less/transitions.less +++ b/apps/presentationeditor/main/resources/less/transitions.less @@ -17,6 +17,7 @@ border-color: @border-preview-select; } + .style{ background: transparent; } @@ -24,7 +25,7 @@ .btn { border: none; &:hover { - background-color: transparent; + background: transparent; } .icon { @@ -33,4 +34,29 @@ } } + + .combo-dataview + { + &.disabled { + .item { + &:hover:not(.selected) { + border-color: transparent; + } + .btn{ + background: transparent; + cursor: default; + &:active, + &.active { + .icon {opacity: @component-normal-icon-opacity;} + } + } + } + } + } + + .spinner + { + margin-left: 10px; + } + } \ No newline at end of file