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

[PE] Fix slide lock

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-10 20:24:13 +03:00
parent 07925a0450
commit 726f750c44
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/presentationeditor/main/app/controller/RightMenu.js
View file

@ -177,7 +177,7 @@ define([
if (i == Common.Utils.documentSettingsType.Slide) { if (i == Common.Utils.documentSettingsType.Slide) {
if (pnl.locked!==undefined) if (pnl.locked!==undefined)
this.rightmenu.slideSettings.SetSlideDisabled(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.lockedEffects || pnl.locked,
this._state.no_slides || pnl.lockedTiming || pnl.locked, this._state.no_slides || pnl.lockedTiming || pnl.locked,
this._state.no_slides || pnl.lockedHeader || pnl.locked); this._state.no_slides || pnl.lockedHeader || pnl.locked);

37
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -77,12 +77,13 @@ define([
this.FillItems = []; this.FillItems = [];
this._stateDisabled = { this._locked = {
background: true, background: false,
effects: true, effects: false,
timing: true, timing: false,
header: true header: false
}; };
this._stateDisabled = {};
this._state = { this._state = {
FillType:undefined, FillType:undefined,
@ -496,7 +497,7 @@ define([
else else
this.btnDirection.setIconCls(''); this.btnDirection.setIconCls('');
this.numGradientAngle.setValue(this.GradLinearDirectionType); this.numGradientAngle.setValue(this.GradLinearDirectionType);
this.numGradientAngle.setDisabled(this._stateDisabled.background); this.numGradientAngle.setDisabled(this._locked.background);
} else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
this.mnuDirectionPicker.store.reset(this._viewDataRadial); this.mnuDirectionPicker.store.reset(this._viewDataRadial);
this.mnuDirectionPicker.cmpEl.width(60); this.mnuDirectionPicker.cmpEl.width(60);
@ -871,7 +872,7 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 100, maxValue: 100,
minValue: 0, minValue: 0,
disabled: this._stateDisabled.background disabled: this._locked.background
}); });
this.FillItems.push(this.spnGradPosition); this.FillItems.push(this.spnGradPosition);
this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this));
@ -881,7 +882,7 @@ define([
parentEl: $('#slide-gradient-add-step'), parentEl: $('#slide-gradient-add-step'),
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-add-breakpoint', iconCls: 'toolbar__icon btn-add-breakpoint',
disabled: this._stateDisabled.background, disabled: this._locked.background,
hint: this.tipAddGradientPoint hint: this.tipAddGradientPoint
}); });
this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this)); this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this));
@ -891,7 +892,7 @@ define([
parentEl: $('#slide-gradient-remove-step'), parentEl: $('#slide-gradient-remove-step'),
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-remove-breakpoint', iconCls: 'toolbar__icon btn-remove-breakpoint',
disabled: this._stateDisabled.background, disabled: this._locked.background,
hint: this.tipRemoveGradientPoint hint: this.tipRemoveGradientPoint
}); });
this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this)); this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this));
@ -906,7 +907,7 @@ define([
allowDecimal: true, allowDecimal: true,
maxValue: 359.9, maxValue: 359.9,
minValue: 0, minValue: 0,
disabled: this._stateDisabled.background disabled: this._locked.background
}); });
this.FillItems.push(this.numGradientAngle); this.FillItems.push(this.numGradientAngle);
this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
@ -1059,9 +1060,9 @@ define([
this.EffectType = undefined; this.EffectType = undefined;
} }
this.cmbEffectType.setDisabled(arr.length<1 || this._stateDisabled.effects); this.cmbEffectType.setDisabled(arr.length<1 || this._locked.effects);
this.numDuration.setDisabled(arr.length<1 || this._stateDisabled.effects); this.numDuration.setDisabled(arr.length<1 || this._locked.effects);
this.btnPreview.setDisabled(arr.length<1 || this._stateDisabled.effects); this.btnPreview.setDisabled(arr.length<1 || this._locked.effects);
}, },
onEffectNameSelect: function(combo, record) { onEffectNameSelect: function(combo, record) {
@ -1195,6 +1196,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.timing, this._locked.header);
if (props) if (props)
{ {
@ -1525,7 +1527,16 @@ define([
} }
}, },
setLocked: function (background, effects, timing, header) {
this._locked = {
background: background, effects: effects, timing: timing, header: header
};
},
SetSlideDisabled: function(background, effects, timing, header) { SetSlideDisabled: function(background, effects, timing, header) {
this._locked = {
background: background, effects: effects, timing: timing, header: header
};
if (this._initSettings) return; if (this._initSettings) return;
if (background !== this._stateDisabled.background) { if (background !== this._stateDisabled.background) {