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

[PE] Change default state for slide settings(show color fill mode)

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-19 17:34:52 +03:00
parent 90d65ddff5
commit b56f407328
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/presentationeditor/main/app/template/SlideSettings.template
View file

@ -11,7 +11,7 @@
</tr> </tr>
<tr class="padding-small"> <tr class="padding-small">
<td> <td>
<div id="slide-panel-color-fill" class="settings-hidden padding-small" style="width: 100%;"> <div id="slide-panel-color-fill" class="padding-small" style="width: 100%;">
<div id="slide-back-color-btn" style=""></div> <div id="slide-back-color-btn" style=""></div>
</div> </div>
<div id="slide-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;"> <div id="slide-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">

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

@ -129,9 +129,23 @@ define([
data: this._arrFillSrc, data: this._arrFillSrc,
disabled: true disabled: true
}); });
this.cmbFillSrc.setValue(''); this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID);
this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
disabled: true,
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
});
this.btnBackColor.render( $('#slide-back-color-btn'));
this.btnBackColor.setColor('ffffff');
this.FillItems.push(this.btnBackColor);
this.FillColorContainer = $('#slide-panel-color-fill'); this.FillColorContainer = $('#slide-panel-color-fill');
this.FillImageContainer = $('#slide-panel-image-fill'); this.FillImageContainer = $('#slide-panel-image-fill');
this.FillPatternContainer = $('#slide-panel-pattern-fill'); this.FillPatternContainer = $('#slide-panel-pattern-fill');
@ -1056,20 +1070,7 @@ define([
UpdateThemeColors: function() { UpdateThemeColors: function() {
if (this._initSettings) return; if (this._initSettings) return;
if (!this.btnBackColor) { if (!this.colorsBack) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
disabled: true,
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="slide-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="slide-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
]
})
});
this.btnBackColor.render( $('#slide-back-color-btn'));
this.btnBackColor.setColor('ffffff');
this.FillItems.push(this.btnBackColor);
this.colorsBack = new Common.UI.ThemeColorPalette({ this.colorsBack = new Common.UI.ThemeColorPalette({
el: $('#slide-back-color-menu'), el: $('#slide-back-color-menu'),
value: 'ffffff', value: 'ffffff',