Delete Transitions from SS

This commit is contained in:
OVSharova 2021-08-07 18:44:26 +03:00
parent ac7b7ca290
commit cd7ca2a1a3
8 changed files with 55 additions and 453 deletions

View file

@ -137,8 +137,8 @@ define([
if (settingsType==Common.Utils.documentSettingsType.Slide) { if (settingsType==Common.Utils.documentSettingsType.Slide) {
this._settings[settingsType].locked = value.get_LockDelete(); this._settings[settingsType].locked = value.get_LockDelete();
this._settings[settingsType].lockedBackground = value.get_LockBackground(); this._settings[settingsType].lockedBackground = value.get_LockBackground();
this._settings[settingsType].lockedEffects = value.get_LockTransition(); /*this._settings[settingsType].lockedEffects = value.get_LockTransition();
this._settings[settingsType].lockedTransition = value.get_LockTransition(); this._settings[settingsType].lockedTransition = value.get_LockTransition();*/
this._settings[settingsType].lockedHeader = !!value.get_LockHeader && value.get_LockHeader(); this._settings[settingsType].lockedHeader = !!value.get_LockHeader && value.get_LockHeader();
} else { } else {
this._settings[settingsType].locked = value.get_Locked(); this._settings[settingsType].locked = value.get_Locked();
@ -182,8 +182,6 @@ define([
if (i == Common.Utils.documentSettingsType.Slide) { if (i == Common.Utils.documentSettingsType.Slide) {
if (pnl.locked!==undefined) if (pnl.locked!==undefined)
this.rightmenu.slideSettings.setLocked(this._state.no_slides || pnl.lockedBackground || pnl.locked, this.rightmenu.slideSettings.setLocked(this._state.no_slides || pnl.lockedBackground || pnl.locked,
this._state.no_slides || pnl.lockedEffects || pnl.locked,
this._state.no_slides || pnl.lockedTransition || pnl.locked,
this._state.no_slides || pnl.lockedHeader || pnl.locked); this._state.no_slides || pnl.lockedHeader || pnl.locked);
} else } else
pnl.panel.setLocked(pnl.locked); pnl.panel.setLocked(pnl.locked);
@ -220,7 +218,7 @@ define([
SetDisabled: function(disabled, allowSignature) { SetDisabled: function(disabled, allowSignature) {
this.setMode({isEdit: !disabled}); this.setMode({isEdit: !disabled});
if (this.rightmenu && this.rightmenu.paragraphSettings) { if (this.rightmenu && this.rightmenu.paragraphSettings) {
this.rightmenu.slideSettings.SetSlideDisabled(disabled, disabled, disabled, disabled); this.rightmenu.slideSettings.SetSlideDisabled(disabled, disabled);
this.rightmenu.paragraphSettings.disableControls(disabled); this.rightmenu.paragraphSettings.disableControls(disabled);
this.rightmenu.shapeSettings.disableControls(disabled); this.rightmenu.shapeSettings.disableControls(disabled);
this.rightmenu.textartSettings.disableControls(disabled); this.rightmenu.textartSettings.disableControls(disabled);

View file

@ -2411,7 +2411,7 @@ define([
if ( config.isEdit ) { if ( config.isEdit ) {
me.toolbar.setMode(config); me.toolbar.setMode(config);
var transitController = me.getApplication().getController('Transitions'); var transitController = me.getApplication().getController('Transitions');
transitController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel(); transitController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel();
Array.prototype.push.apply(me.toolbar.lockControls,transitController.getView().getButtons()); Array.prototype.push.apply(me.toolbar.lockControls,transitController.getView().getButtons());
Array.prototype.push.apply(me.toolbar.slideOnlyControls,transitController.getView().getButtons()); Array.prototype.push.apply(me.toolbar.slideOnlyControls,transitController.getView().getButtons());

View file

@ -63,7 +63,7 @@ define([
this.addListeners({ this.addListeners({
'PE.Views.Transitions': { 'PE.Views.Transitions': {
'transit:preview': _.bind(this.onPreviewClick, this), 'transit:preview': _.bind(this.onPreviewClick, this),
'transit:parametrs': _.bind(this.onParametrClick, this), 'transit:parameters': _.bind(this.onParameterClick, this),
'transit:duration': _.bind(this.onDurationChange, this), 'transit:duration': _.bind(this.onDurationChange, this),
'transit:applytoall': _.bind(this.onApplyToAllClick, this), 'transit:applytoall': _.bind(this.onApplyToAllClick, this),
'transit:selecteffect': _.bind(this.onEffectSelect, this), 'transit:selecteffect': _.bind(this.onEffectSelect, this),
@ -119,7 +119,7 @@ define([
} }
}, },
onParametrClick: function (item) { onParameterClick: function (item) {
this.EffectType = item.value; this.EffectType = item.value;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps(); var props = new Asc.CAscSlideProps();
@ -182,9 +182,9 @@ define([
if (this.Effect !== type && if (this.Effect !== type &&
!((this.Effect === Asc.c_oAscSlideTransitionTypes.Wipe || this.Effect === Asc.c_oAscSlideTransitionTypes.UnCover || this.Effect === Asc.c_oAscSlideTransitionTypes.Cover)&& !((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))) { (type === Asc.c_oAscSlideTransitionTypes.Wipe || type === Asc.c_oAscSlideTransitionTypes.UnCover || type === Asc.c_oAscSlideTransitionTypes.Cover))) {
var parametr = this.view.setMenuParametrs(type); var parameter = this.view.setMenuParameters(type);
if (parametr) if (parameter)
this.onParametrClick(parametr); this.onParameterClick(parameter);
} }
this.Effect = type; this.Effect = type;
@ -279,8 +279,8 @@ define([
me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]); me.listEffects.menuPicker.selectRecord(item ? item : me.listEffects.menuPicker.items[0]);
} }
if (me.btnParametrs.menu.items.length > 0 && this._state.EffectType !== undefined) if (me.btnParameters.menu.items.length > 0 && this._state.EffectType !== undefined)
me.setMenuParametrs(this._state.Effect, this._state.EffectType); me.setMenuParameters(this._state.Effect, this._state.EffectType);
me.numDuration.setValue((this._state.Duration !== null && this._state.Duration !== undefined) ? this._state.Duration / 1000. : '', true); 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.numDelay.setValue((this._state.Delay !== null && this._state.Delay !== undefined) ? this._state.Delay / 1000. : '', true);

View file

@ -117,57 +117,6 @@
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr>
<td>
<label class="header"><%= scope.strEffect %></label>
</td>
</tr>
<tr>
<td class="padding-small">
<div id="slide-combo-effect-name" style="width: 100%;"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<div id="slide-combo-effect-type" style="width: 100%;"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<div>
<label class="input-label" style="margin-top:4px;"><%= scope.strDuration %></label>
<div id="slide-spin-duration" style="display: inline-block; float:right;"></div>
</div>
</td>
</tr>
<tr>
<td class="padding-large">
<button type="button" class="btn btn-text-default" id="slide-button-preview" style="width:100%;"><%= scope.textPreview %></button>
</td>
</tr>
<tr>
<td class="padding-small">
<div id="slide-checkbox-start-click"></div>
</td>
</tr>
<tr>
<td class="padding-large">
<div>
<div id="slide-checkbox-delay" style="display: inline-block; width: 100px; margin-top:4px;"></div>
<div id="slide-spin-delay" style="display: inline-block; float:right;"></div>
</div>
</td>
</tr>
<tr>
<td class="padding-small">
<button type="button" class="btn btn-text-default" id="slide-button-apply-all" style="width:100%;"><%= scope.textApplyAll %></button>
</td>
</tr>
<tr>
<td class="padding-small">
<div class="separator horizontal"></div>
</td>
</tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<div id="slide-checkbox-slidenum"></div> <div id="slide-checkbox-slidenum"></div>

View file

@ -146,7 +146,7 @@
<div class="group flex small" id="transit-field-effects" style=" width: 700px; min-width: 300px;"></div> <div class="group flex small" id="transit-field-effects" style=" width: 700px; min-width: 300px;"></div>
<div class="group small"> <div class="group small">
<span class="btn-slot text x-huge" id="transit-button-parametrs"></span> <span class="btn-slot text x-huge" id="transit-button-parameters"></span>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group small"> <div class="group small">

View file

@ -79,8 +79,6 @@ define([
this._locked = { this._locked = {
background: false, background: false,
effects: false,
transition: false,
header: false header: false
}; };
this._stateDisabled = {}; this._stateDisabled = {};
@ -179,124 +177,7 @@ define([
this.FillGradientContainer = $('#slide-panel-gradient-fill'); this.FillGradientContainer = $('#slide-panel-gradient-fill');
this.TransparencyContainer = $('#slide-panel-transparent-fill'); this.TransparencyContainer = $('#slide-panel-transparent-fill');
this._arrEffectName = [ this.chSlideNum = new Common.UI.CheckBox({
{displayValue: this.textNone, value: Asc.c_oAscSlideTransitionTypes.None},
{displayValue: this.textFade, value: Asc.c_oAscSlideTransitionTypes.Fade},
{displayValue: this.textPush, value: Asc.c_oAscSlideTransitionTypes.Push},
{displayValue: this.textWipe, value: Asc.c_oAscSlideTransitionTypes.Wipe},
{displayValue: this.textSplit, value: Asc.c_oAscSlideTransitionTypes.Split},
{displayValue: this.textUnCover, value: Asc.c_oAscSlideTransitionTypes.UnCover},
{displayValue: this.textCover, value: Asc.c_oAscSlideTransitionTypes.Cover},
{displayValue: this.textClock, value: Asc.c_oAscSlideTransitionTypes.Clock},
{displayValue: this.textZoom, value: Asc.c_oAscSlideTransitionTypes.Zoom}
];
this.cmbEffectName = new Common.UI.ComboBox({
el: $('#slide-combo-effect-name'),
cls: 'input-group-nr',
style: 'width: 100%;',
menuStyle: 'min-width: 100%;',
editable: false,
data: this._arrEffectName,
disabled: true
});
this.cmbEffectName.setValue('');
this.cmbEffectName.on('selected', _.bind(this.onEffectNameSelect, this));
this._arrEffectType = [
{displayValue: this.textSmoothly, value: Asc.c_oAscSlideTransitionParams.Fade_Smoothly},
{displayValue: this.textBlack, value: Asc.c_oAscSlideTransitionParams.Fade_Through_Black},
{displayValue: this.textLeft, value: Asc.c_oAscSlideTransitionParams.Param_Left},
{displayValue: this.textTop, value: Asc.c_oAscSlideTransitionParams.Param_Top},
{displayValue: this.textRight, value: Asc.c_oAscSlideTransitionParams.Param_Right},
{displayValue: this.textBottom, value: Asc.c_oAscSlideTransitionParams.Param_Bottom},
{displayValue: this.textTopLeft, value: Asc.c_oAscSlideTransitionParams.Param_TopLeft},
{displayValue: this.textTopRight, value: Asc.c_oAscSlideTransitionParams.Param_TopRight},
{displayValue: this.textBottomLeft, value: Asc.c_oAscSlideTransitionParams.Param_BottomLeft},
{displayValue: this.textBottomRight, value: Asc.c_oAscSlideTransitionParams.Param_BottomRight},
{displayValue: this.textVerticalIn, value: Asc.c_oAscSlideTransitionParams.Split_VerticalIn},
{displayValue: this.textVerticalOut, value: Asc.c_oAscSlideTransitionParams.Split_VerticalOut},
{displayValue: this.textHorizontalIn, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalIn},
{displayValue: this.textHorizontalOut, value: Asc.c_oAscSlideTransitionParams.Split_HorizontalOut},
{displayValue: this.textClockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Clockwise},
{displayValue: this.textCounterclockwise, value: Asc.c_oAscSlideTransitionParams.Clock_Counterclockwise},
{displayValue: this.textWedge, value: Asc.c_oAscSlideTransitionParams.Clock_Wedge},
{displayValue: this.textZoomIn, value: Asc.c_oAscSlideTransitionParams.Zoom_In},
{displayValue: this.textZoomOut, value: Asc.c_oAscSlideTransitionParams.Zoom_Out},
{displayValue: this.textZoomRotate, value: Asc.c_oAscSlideTransitionParams.Zoom_AndRotate}
];
this.cmbEffectType = new Common.UI.ComboBox({
el: $('#slide-combo-effect-type'),
cls: 'input-group-nr',
style: 'width: 100%;',
menuStyle: 'min-width: 100%;',
editable: false,
data: this._arrEffectType,
disabled: true
});
this.cmbEffectType.setValue('');
this.cmbEffectType.on('selected', _.bind(this.onEffectTypeSelect, this));
this.numDuration = new Common.UI.MetricSpinner({
el: $('#slide-spin-duration'),
step: 1,
width: 70,
value: '',
defaultUnit : this.textSec,
maxValue: 300,
minValue: 0,
disabled: true
});
this.numDuration.on('change', _.bind(this.onDurationChange, this));
this.numDuration.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.numDelay = new Common.UI.MetricSpinner({
el: $('#slide-spin-delay'),
step: 1,
width: 70,
value: '',
defaultUnit : this.textSec,
maxValue: 300,
minValue: 0,
disabled: true
});
this.numDelay.on('change', _.bind(this.onDelayChange, this));
this.numDelay.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.chStartOnClick = new Common.UI.CheckBox({
el: $('#slide-checkbox-start-click'),
labelText: this.strStartOnClick,
disabled: true
});
this.chStartOnClick.on('change', _.bind(this.onStartOnClickChange, this));
this.chDelay = new Common.UI.CheckBox({
el: $('#slide-checkbox-delay'),
labelText: this.strDelay,
disabled: true
});
this.chDelay.on('change', _.bind(this.onCheckDelayChange, this));
this.btnPreview = new Common.UI.Button({
el: $('#slide-button-preview'),
disabled: true
});
this.btnPreview.on('click', _.bind(function(btn){
if (this.api) this.api.SlideTransitionPlay();
this.fireEvent('editcomplete', this);
}, this));
this.btnApplyToAll = new Common.UI.Button({
el: $('#slide-button-apply-all'),
disabled: true
});
this.btnApplyToAll.on('click', _.bind(function(btn){
if (this.api) this.api.SlideTransitionApplyToAll();
this.fireEvent('editcomplete', this);
}, this));
this.chSlideNum = new Common.UI.CheckBox({
el: $('#slide-checkbox-slidenum'), el: $('#slide-checkbox-slidenum'),
labelText: this.strSlideNum, labelText: this.strSlideNum,
disabled: true disabled: true
@ -1100,122 +981,6 @@ define([
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
fillEffectTypeCombo: function (type) {
var arr = [];
switch (type) {
case Asc.c_oAscSlideTransitionTypes.Fade:
arr.push(this._arrEffectType[0], this._arrEffectType[1]);
break;
case Asc.c_oAscSlideTransitionTypes.Push:
arr = this._arrEffectType.slice(2, 6);
break;
case Asc.c_oAscSlideTransitionTypes.Wipe:
arr = this._arrEffectType.slice(2, 10);
break;
case Asc.c_oAscSlideTransitionTypes.Split:
arr = this._arrEffectType.slice(10, 14);
break;
case Asc.c_oAscSlideTransitionTypes.UnCover:
arr = this._arrEffectType.slice(2, 10);
break;
case Asc.c_oAscSlideTransitionTypes.Cover:
arr = this._arrEffectType.slice(2, 10);
break;
case Asc.c_oAscSlideTransitionTypes.Clock:
arr = this._arrEffectType.slice(14, 17);
break;
case Asc.c_oAscSlideTransitionTypes.Zoom:
arr = this._arrEffectType.slice(17);
break;
}
if (arr.length>0) {
this.cmbEffectType.store.reset(arr);
this.cmbEffectType.setValue(arr[0].value);
this.EffectType = arr[0].value;
} else {
this.cmbEffectType.store.reset();
this.EffectType = undefined;
}
this.cmbEffectType.setDisabled(arr.length<1 || this._locked.effects);
this.numDuration.setDisabled(arr.length<1 || this._locked.effects);
this.btnPreview.setDisabled(arr.length<1 || this._locked.effects);
},
onEffectNameSelect: function(combo, record) {
var type = record.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)) )
this.fillEffectTypeCombo(type);
this.Effect = type;
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(type);
transition.put_TransitionOption(this.EffectType);
props.put_transition(transition);
this.api.SetSlideProps(props);
}
this.fireEvent('editcomplete', this);
},
onEffectTypeSelect: function(combo, record) {
this.EffectType = record.value;
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
var transition = new Asc.CAscSlideTransition();
transition.put_TransitionType(this.Effect);
transition.put_TransitionOption(this.EffectType);
props.put_transition(transition);
this.api.SetSlideProps(props);
}
this.fireEvent('editcomplete', this);
},
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);
props.put_transition(transition);
this.api.SetSlideProps(props);
}
},
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);
props.put_transition(transition);
this.api.SetSlideProps(props);
}
},
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');
props.put_transition(transition);
this.api.SetSlideProps(props);
}
this.fireEvent('editcomplete', this);
},
onCheckDelayChange: function(field, newValue, oldValue, eOpts){
this.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');
props.put_transition(transition);
this.api.SetSlideProps(props);
}
this.fireEvent('editcomplete', this);
},
onHeaderChange: function(type, field, newValue, oldValue, eOpts){ onHeaderChange: function(type, field, newValue, oldValue, eOpts){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = this.api.asc_getHeaderFooterProperties(); var props = this.api.asc_getHeaderFooterProperties();
@ -1274,7 +1039,7 @@ define([
ChangeSettings: function(props) { ChangeSettings: function(props) {
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
this.SetSlideDisabled(this._locked.background, this._locked.effects, this._locked.transition, this._locked.header); this.SetSlideDisabled(this._locked.background, this._locked.header);
if (props) if (props)
{ {
@ -1471,65 +1236,6 @@ define([
this._state.SlideColor = this.SlideColor.Color; this._state.SlideColor = this.SlideColor.Color;
} }
var transition = props.get_transition();
if (transition) {
var value = transition.get_TransitionType();
var found = false;
if (this._state.Effect !== value) {
var item = this.cmbEffectName.store.findWhere({value: value});
if (item) {
found = true;
this.cmbEffectName.setValue(item.get('value'));
} else
this.cmbEffectName.setValue('');
this.fillEffectTypeCombo((found) ? value : undefined);
this.Effect = value;
this._state.Effect = value;
}
value = transition.get_TransitionOption();
if (this._state.EffectType !== value || found) {
found = false;
item = this.cmbEffectType.store.findWhere({value: value});
if (item) {
found = true;
this.cmbEffectType.setValue(item.get('value'));
} else
this.cmbEffectType.setValue('');
this._state.EffectType = value;
}
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) ) {
this.numDuration.setValue((value !== null && value !== undefined) ? value/1000. : '', true);
this._state.Duration=value;
}
value = transition.get_SlideAdvanceDuration();
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) ) {
this.numDelay.setValue((value !== null && value !== undefined) ? value/1000. : '', true);
this._state.Delay=value;
}
value = transition.get_SlideAdvanceOnMouseClick();
if ( this._state.OnMouseClick!==value ) {
this.chStartOnClick.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true);
this._state.OnMouseClick=value;
}
value = transition.get_SlideAdvanceAfter();
if ( this._state.AdvanceAfter!==value ) {
this.chDelay.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true);
this.numDelay.setDisabled(this.chDelay.getValue()!=='checked');
this._state.AdvanceAfter=value;
}
}
// pattern colors // pattern colors
type1 = typeof(this.FGColor.Color); type1 = typeof(this.FGColor.Color);
type2 = typeof(this._state.FGColor); type2 = typeof(this._state.FGColor);
@ -1616,15 +1322,15 @@ define([
} }
}, },
setLocked: function (background, effects, transition, header) { setLocked: function (background, header) {
this._locked = { this._locked = {
background: background, effects: effects, transition: transition, header: header background: background, header: header
}; };
}, },
SetSlideDisabled: function(background, effects, transition, header) { SetSlideDisabled: function(background, header) {
this._locked = { this._locked = {
background: background, effects: effects, transition: transition, header: header background: background, header: header
}; };
if (this._initSettings) return; if (this._initSettings) return;
@ -1638,21 +1344,6 @@ define([
this.numGradientAngle.setDisabled(background || this.GradFillType !== Asc.c_oAscFillGradType.GRAD_LINEAR); this.numGradientAngle.setDisabled(background || this.GradFillType !== Asc.c_oAscFillGradType.GRAD_LINEAR);
this._stateDisabled.background = background; this._stateDisabled.background = background;
} }
if (effects !== this._stateDisabled.effects) {
var length = this.cmbEffectType.store.length;
this.cmbEffectName.setDisabled(effects);
this.cmbEffectType.setDisabled(length<1 || effects);
this.numDuration.setDisabled(length<1 || effects);
this.btnPreview.setDisabled(length<1 || effects);
this._stateDisabled.effects = effects;
}
if (transition !== this._stateDisabled.transition) {
this.chStartOnClick.setDisabled(transition);
this.chDelay.setDisabled(transition);
this.numDelay.setDisabled(transition || this.chDelay.getValue()!=='checked');
this.btnApplyToAll.setDisabled(transition);
this._stateDisabled.transition = transition;
}
if (header !== this._stateDisabled.header) { if (header !== this._stateDisabled.header) {
this.chSlideNum.setDisabled(header); this.chSlideNum.setDisabled(header);
this.chDateTime.setDisabled(header); this.chDateTime.setDisabled(header);
@ -1754,41 +1445,6 @@ define([
textAdvanced : 'Show advanced settings', textAdvanced : 'Show advanced settings',
textNoFill : 'No Fill', textNoFill : 'No Fill',
textSelectTexture : 'Select', textSelectTexture : 'Select',
textNone: 'None',
textFade: 'Fade',
textPush: 'Push',
textWipe: 'Wipe',
textSplit: 'Split',
textUnCover: 'UnCover',
textCover: 'Cover',
textClock: 'Clock',
textZoom: 'Zoom',
textSmoothly: 'Smoothly',
textBlack: 'Through Black',
textLeft: 'Left',
textTop: 'Top',
textRight: 'Right',
textBottom: 'Bottom',
textTopLeft: 'Top-Left',
textTopRight: 'Top-Right',
textBottomLeft: 'Bottom-Left',
textBottomRight: 'Bottom-Right',
textVerticalIn: 'Vertical In',
textVerticalOut: 'Vertical Out',
textHorizontalIn: 'Horizontal In',
textHorizontalOut: 'Horizontal Out',
textClockwise: 'Clockwise',
textCounterclockwise: 'Counterclockwise',
textWedge: 'Wedge',
textZoomIn: 'Zoom In',
textZoomOut: 'Zoom Out',
textZoomRotate: 'Zoom and Rotate',
strStartOnClick: 'Start On Click',
strDelay: 'Delay',
textApplyAll: 'Apply to All Slides',
textPreview: 'Preview',
strEffect: 'Effect',
strDuration: 'Duration',
textGradientFill: 'Gradient Fill', textGradientFill: 'Gradient Fill',
textPatternFill: 'Pattern', textPatternFill: 'Pattern',
strBackground: 'Background color', strBackground: 'Background color',
@ -1800,7 +1456,6 @@ define([
textDirection: 'Direction', textDirection: 'Direction',
textStyle: 'Style', textStyle: 'Style',
textGradient: 'Gradient Points', textGradient: 'Gradient Points',
textSec: 's',
strSlideNum: 'Show Slide Number', strSlideNum: 'Show Slide Number',
strDateTime: 'Show Date and Time', strDateTime: 'Show Date and Time',
textFromStorage: 'From Storage', textFromStorage: 'From Storage',

View file

@ -71,11 +71,11 @@ define([
if (me.btnParameters) { if (me.btnParameters) {
me.btnParameters.on('click', function (e) { me.btnParameters.on('click', function (e) {
me.fireEvent('transit:Parameters', ['current']); me.fireEvent('transit:parameters', ['current']);
}); });
me.btnParameters.menu.on('item:click', function (menu, item, e) { me.btnParameters.menu.on('item:click', function (menu, item, e) {
me.fireEvent('transit:Parameters', [item]); me.fireEvent('transit:parameters', [item]);
}); });
} }
@ -308,7 +308,7 @@ define([
getPanel: function () { 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.btnPreview && this.btnPreview.render(this.$el.find('#transit-button-preview'));
this.btnParameters && this.btnParameters.render(this.$el.find('#transit-button-Parameters')); this.btnParameters && this.btnParameters.render(this.$el.find('#transit-button-parameters'));
this.btnApplyToAll && this.btnApplyToAll.render(this.$el.find('#transit-button-apply')); this.btnApplyToAll && this.btnApplyToAll.render(this.$el.find('#transit-button-apply'));
this.renderComponent('#transit-spin-duration', this.numDuration); this.renderComponent('#transit-spin-duration', this.numDuration);
this.renderComponent('#transit-spin-delay', this.numDelay); this.renderComponent('#transit-spin-delay', this.numDelay);

View file

@ -1638,9 +1638,9 @@
"PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strBackground": "Background color",
"PE.Views.SlideSettings.strColor": "Color", "PE.Views.SlideSettings.strColor": "Color",
"PE.Views.SlideSettings.strDateTime": "Show Date and Time", "PE.Views.SlideSettings.strDateTime": "Show Date and Time",
"PE.Views.SlideSettings.strDelay": "Delay", "del_PE.Views.SlideSettings.strDelay": "Delay",
"PE.Views.SlideSettings.strDuration": "Duration", "del_PE.Views.SlideSettings.strDuration": "Duration",
"PE.Views.SlideSettings.strEffect": "Effect", "del_PE.Views.SlideSettings.strEffect": "Effect",
"PE.Views.SlideSettings.strFill": "Background", "PE.Views.SlideSettings.strFill": "Background",
"PE.Views.SlideSettings.strForeground": "Foreground color", "PE.Views.SlideSettings.strForeground": "Foreground color",
"PE.Views.SlideSettings.strPattern": "Pattern", "PE.Views.SlideSettings.strPattern": "Pattern",
@ -1649,59 +1649,59 @@
"PE.Views.SlideSettings.strTransparency": "Opacity", "PE.Views.SlideSettings.strTransparency": "Opacity",
"PE.Views.SlideSettings.textAdvanced": "Show advanced settings", "PE.Views.SlideSettings.textAdvanced": "Show advanced settings",
"PE.Views.SlideSettings.textAngle": "Angle", "PE.Views.SlideSettings.textAngle": "Angle",
"PE.Views.SlideSettings.textApplyAll": "Apply to All Slides", "del_PE.Views.SlideSettings.textApplyAll": "Apply to All Slides",
"PE.Views.SlideSettings.textBlack": "Through Black", "PE.Views.SlideSettings.textBlack": "Through Black",
"PE.Views.SlideSettings.textBottom": "Bottom", "del_PE.Views.SlideSettings.textBottom": "Bottom",
"PE.Views.SlideSettings.textBottomLeft": "Bottom Left", "del_PE.Views.SlideSettings.textBottomLeft": "Bottom Left",
"PE.Views.SlideSettings.textBottomRight": "Bottom Right", "del_PE.Views.SlideSettings.textBottomRight": "Bottom Right",
"PE.Views.SlideSettings.textClock": "Clock", "del_PE.Views.SlideSettings.textClock": "Clock",
"PE.Views.SlideSettings.textClockwise": "Clockwise", "del_PE.Views.SlideSettings.textClockwise": "Clockwise",
"PE.Views.SlideSettings.textColor": "Color Fill", "PE.Views.SlideSettings.textColor": "Color Fill",
"PE.Views.SlideSettings.textCounterclockwise": "Counterclockwise", "del_PE.Views.SlideSettings.textCounterclockwise": "Counterclockwise",
"PE.Views.SlideSettings.textCover": "Cover", "del_PE.Views.SlideSettings.textCover": "Cover",
"PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textDirection": "Direction",
"PE.Views.SlideSettings.textEmptyPattern": "No Pattern", "PE.Views.SlideSettings.textEmptyPattern": "No Pattern",
"PE.Views.SlideSettings.textFade": "Fade", "del_PE.Views.SlideSettings.textFade": "Fade",
"PE.Views.SlideSettings.textFromFile": "From File", "PE.Views.SlideSettings.textFromFile": "From File",
"PE.Views.SlideSettings.textFromStorage": "From Storage", "PE.Views.SlideSettings.textFromStorage": "From Storage",
"PE.Views.SlideSettings.textFromUrl": "From URL", "PE.Views.SlideSettings.textFromUrl": "From URL",
"PE.Views.SlideSettings.textGradient": "Gradient points", "PE.Views.SlideSettings.textGradient": "Gradient points",
"PE.Views.SlideSettings.textGradientFill": "Gradient Fill", "PE.Views.SlideSettings.textGradientFill": "Gradient Fill",
"PE.Views.SlideSettings.textHorizontalIn": "Horizontal In", "del_PE.Views.SlideSettings.textHorizontalIn": "Horizontal In",
"PE.Views.SlideSettings.textHorizontalOut": "Horizontal Out", "del_PE.Views.SlideSettings.textHorizontalOut": "Horizontal Out",
"PE.Views.SlideSettings.textImageTexture": "Picture or Texture", "PE.Views.SlideSettings.textImageTexture": "Picture or Texture",
"PE.Views.SlideSettings.textLeft": "Left", "del_PE.Views.SlideSettings.textLeft": "Left",
"PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textLinear": "Linear",
"PE.Views.SlideSettings.textNoFill": "No Fill", "PE.Views.SlideSettings.textNoFill": "No Fill",
"PE.Views.SlideSettings.textNone": "None", "del_PE.Views.SlideSettings.textNone": "None",
"PE.Views.SlideSettings.textPatternFill": "Pattern", "PE.Views.SlideSettings.textPatternFill": "Pattern",
"PE.Views.SlideSettings.textPosition": "Position", "PE.Views.SlideSettings.textPosition": "Position",
"PE.Views.SlideSettings.textPreview": "Preview", "del_PE.Views.SlideSettings.textPreview": "Preview",
"PE.Views.SlideSettings.textPush": "Push", "del_PE.Views.SlideSettings.textPush": "Push",
"PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textRadial": "Radial",
"PE.Views.SlideSettings.textReset": "Reset Changes", "PE.Views.SlideSettings.textReset": "Reset Changes",
"PE.Views.SlideSettings.textRight": "Right", "del_PE.Views.SlideSettings.textRight": "Right",
"PE.Views.SlideSettings.textSec": "s", "del_PE.Views.SlideSettings.textSec": "s",
"PE.Views.SlideSettings.textSelectImage": "Select Picture", "PE.Views.SlideSettings.textSelectImage": "Select Picture",
"PE.Views.SlideSettings.textSelectTexture": "Select", "PE.Views.SlideSettings.textSelectTexture": "Select",
"PE.Views.SlideSettings.textSmoothly": "Smoothly", "del_PE.Views.SlideSettings.textSmoothly": "Smoothly",
"PE.Views.SlideSettings.textSplit": "Split", "del_PE.Views.SlideSettings.textSplit": "Split",
"PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStretch": "Stretch",
"PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textStyle": "Style",
"PE.Views.SlideSettings.textTexture": "From Texture", "PE.Views.SlideSettings.textTexture": "From Texture",
"PE.Views.SlideSettings.textTile": "Tile", "PE.Views.SlideSettings.textTile": "Tile",
"PE.Views.SlideSettings.textTop": "Top", "del_PE.Views.SlideSettings.textTop": "Top",
"PE.Views.SlideSettings.textTopLeft": "Top Left", "del_PE.Views.SlideSettings.textTopLeft": "Top Left",
"PE.Views.SlideSettings.textTopRight": "Top Right", "del_PE.Views.SlideSettings.textTopRight": "Top Right",
"PE.Views.SlideSettings.textUnCover": "Uncover", "del_PE.Views.SlideSettings.textUnCover": "Uncover",
"PE.Views.SlideSettings.textVerticalIn": "Vertical In", "del_PE.Views.SlideSettings.textVerticalIn": "Vertical In",
"PE.Views.SlideSettings.textVerticalOut": "Vertical Out", "del_PE.Views.SlideSettings.textVerticalOut": "Vertical Out",
"PE.Views.SlideSettings.textWedge": "Wedge", "del_PE.Views.SlideSettings.textWedge": "Wedge",
"PE.Views.SlideSettings.textWipe": "Wipe", "del_PE.Views.SlideSettings.textWipe": "Wipe",
"PE.Views.SlideSettings.textZoom": "Zoom", "del_PE.Views.SlideSettings.textZoom": "Zoom",
"PE.Views.SlideSettings.textZoomIn": "Zoom In", "del_PE.Views.SlideSettings.textZoomIn": "Zoom In",
"PE.Views.SlideSettings.textZoomOut": "Zoom Out", "del_PE.Views.SlideSettings.textZoomOut": "Zoom Out",
"PE.Views.SlideSettings.textZoomRotate": "Zoom and Rotate", "del_PE.Views.SlideSettings.textZoomRotate": "Zoom and Rotate",
"PE.Views.SlideSettings.tipAddGradientPoint": "Add gradient point", "PE.Views.SlideSettings.tipAddGradientPoint": "Add gradient point",
"PE.Views.SlideSettings.tipRemoveGradientPoint": "Remove gradient point", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Remove gradient point",
"PE.Views.SlideSettings.txtBrownPaper": "Brown Paper", "PE.Views.SlideSettings.txtBrownPaper": "Brown Paper",