pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 08:39:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

commented header settings

Browse Source
This commit is contained in:
nikita_bartoshuk
2025-11-27 00:42:56 +03:00
parent 4c3d4e4ecb
commit 843260200f
3 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/documenteditor/main/app/controller/RightMenu.js
View File

@ -93,7 +93,7 @@ define([
this._settings[Common.Utils.documentSettingsType.Paragraph] = {panelId: "id-paragraph-settings", panel: rightMenu.paragraphSettings,btn: rightMenu.btnText, hidden: 1, locked: false};
this._settings[Common.Utils.documentSettingsType.Table] = {panelId: "id-table-settings", panel: rightMenu.tableSettings, btn: rightMenu.btnTable, hidden: 1, locked: false};
this._settings[Common.Utils.documentSettingsType.Image] = {panelId: "id-image-settings", panel: rightMenu.imageSettings, btn: rightMenu.btnImage, hidden: 1, locked: false};
this._settings[Common.Utils.documentSettingsType.Header] = {panelId: "id-header-settings", panel: rightMenu.headerSettings, btn: rightMenu.btnHeaderFooter,hidden: 1, locked: false, needShow: true};
// this._settings[Common.Utils.documentSettingsType.Header] = {panelId: "id-header-settings", panel: rightMenu.headerSettings, btn: rightMenu.btnHeaderFooter,hidden: 1, locked: false, needShow: true};
this._settings[Common.Utils.documentSettingsType.Shape] = {panelId: "id-shape-settings", panel: rightMenu.shapeSettings, btn: rightMenu.btnShape, hidden: 1, locked: false};
this._settings[Common.Utils.documentSettingsType.TextArt] = {panelId: "id-textart-settings", panel: rightMenu.textartSettings, btn: rightMenu.btnTextArt, hidden: 1, locked: false};
this._settings[Common.Utils.documentSettingsType.Chart] = {panelId: "id-chart-settings", panel: rightMenu.chartSettings, btn: rightMenu.btnChart, hidden: 1, locked: false};
@ -260,12 +260,12 @@ define([
}
}
if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // all elements are locked if header/footer is locked
for (i=0; i<this._settings.length; i++) {
if (this._settings[i])
this._settings[i].locked = true;
}
}
// if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // all elements are locked if header/footer is locked
// for (i=0; i<this._settings.length; i++) {
// if (this._settings[i])
// this._settings[i].locked = true;
// }
// }
if (!this._settings[Common.Utils.documentSettingsType.MailMerge].locked) { // disable MailMerge-InsertField when disable btnInsertTable
this._settings[Common.Utils.documentSettingsType.MailMerge].locked = !can_add_table || in_equation;
@ -399,7 +399,7 @@ define([
},
updateMetricUnit: function() {
this.rightmenu.headerSettings.updateMetricUnit();
// this.rightmenu.headerSettings.updateMetricUnit();
this.rightmenu.paragraphSettings.updateMetricUnit();
this.rightmenu.chartSettings.updateMetricUnit();
this.rightmenu.imageSettings.updateMetricUnit();
@ -495,7 +495,7 @@ define([
this.rightmenu.paragraphSettings.disableControls(disabled);
this.rightmenu.shapeSettings.disableControls(disabled);
this.rightmenu.textartSettings.disableControls(disabled);
this.rightmenu.headerSettings.disableControls(disabled);
// this.rightmenu.headerSettings.disableControls(disabled);
this.rightmenu.tableSettings.disableControls(disabled);
this.rightmenu.imageSettings.disableControls(disabled);
this.rightmenu.formSettings && this.rightmenu.formSettings.disableControls(disabled);
@ -514,7 +514,7 @@ define([
this.rightmenu.btnText.setDisabled(disabled);
this.rightmenu.btnTable.setDisabled(disabled);
this.rightmenu.btnImage.setDisabled(disabled);
this.rightmenu.btnHeaderFooter.setDisabled(disabled);
// this.rightmenu.btnHeaderFooter.setDisabled(disabled);
this.rightmenu.btnShape.setDisabled(disabled);
this.rightmenu.btnTextArt.setDisabled(disabled);
this.rightmenu.btnChart.setDisabled(disabled);
@ -537,8 +537,8 @@ define([
return Common.Utils.documentSettingsType.Table;
case Asc.c_oAscTypeSelectElement.Image:
return Common.Utils.documentSettingsType.Image;
case Asc.c_oAscTypeSelectElement.Header:
return Common.Utils.documentSettingsType.Header;
// case Asc.c_oAscTypeSelectElement.Header:
// return Common.Utils.documentSettingsType.Header;
}
},

2
apps/documenteditor/main/app/template/RightMenu.template
View File

@ -4,7 +4,6 @@
<div id="id-paragraph-settings" class="settings-panel"></div>
<div id="id-table-settings" class="settings-panel"></div>
<div id="id-image-settings" class="settings-panel"></div>
<div id="id-header-settings" class="settings-panel"></div>
<div id="id-shape-settings" class="settings-panel"></div>
<div id="id-chart-settings" class="settings-panel"></div>
<div id="id-mail-merge-settings" class="settings-panel"></div>
@ -18,7 +17,6 @@
<button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-header" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-header-settings"><i class="icon toolbar__icon btn-menu-header">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>

34
apps/documenteditor/main/app/view/RightMenu.js
View File

@ -50,7 +50,7 @@ define([
'common/main/lib/component/MetricSpinner',
'common/main/lib/component/CheckBox',
'documenteditor/main/app/view/ParagraphSettings',
'documenteditor/main/app/view/HeaderFooterSettings',
// 'documenteditor/main/app/view/HeaderFooterSettings',
'documenteditor/main/app/view/ImageSettings',
'documenteditor/main/app/view/ChartSettings',
'documenteditor/main/app/view/TableSettings',
@ -105,15 +105,15 @@ define([
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
this.btnHeaderFooter = new Common.UI.Button({
hint: this.txtHeaderFooterSettings,
asctype: Common.Utils.documentSettingsType.Header,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-header',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
// this.btnHeaderFooter = new Common.UI.Button({
// hint: this.txtHeaderFooterSettings,
// asctype: Common.Utils.documentSettingsType.Header,
// enableToggle: true,
// disabled: true,
// iconCls: 'btn-menu-header',
// toggleGroup: 'tabpanelbtnsGroup',
// allowMouseEventsOnDisabled: true
// });
this.btnChart = new Common.UI.Button({
hint: this.txtChartSettings,
asctype: Common.Utils.documentSettingsType.Chart,
@ -147,7 +147,7 @@ define([
this._settings[Common.Utils.documentSettingsType.Paragraph] = {panel: "id-paragraph-settings", btn: this.btnText};
this._settings[Common.Utils.documentSettingsType.Table] = {panel: "id-table-settings", btn: this.btnTable};
this._settings[Common.Utils.documentSettingsType.Image] = {panel: "id-image-settings", btn: this.btnImage};
this._settings[Common.Utils.documentSettingsType.Header] = {panel: "id-header-settings", btn: this.btnHeaderFooter};
// this._settings[Common.Utils.documentSettingsType.Header] = {panel: "id-header-settings", btn: this.btnHeaderFooter};
this._settings[Common.Utils.documentSettingsType.Shape] = {panel: "id-shape-settings", btn: this.btnShape};
this._settings[Common.Utils.documentSettingsType.Chart] = {panel: "id-chart-settings", btn: this.btnChart};
this._settings[Common.Utils.documentSettingsType.TextArt] = {panel: "id-textart-settings", btn: this.btnTextArt};
@ -184,7 +184,7 @@ define([
this.btnText.setElement($markup.findById('#id-right-menu-text'), false); this.btnText.render();
this.btnTable.setElement($markup.findById('#id-right-menu-table'), false); this.btnTable.render();
this.btnImage.setElement($markup.findById('#id-right-menu-image'), false); this.btnImage.render();
this.btnHeaderFooter.setElement($markup.findById('#id-right-menu-header'), false); this.btnHeaderFooter.render();
// this.btnHeaderFooter.setElement($markup.findById('#id-right-menu-header'), false); this.btnHeaderFooter.render();
this.btnChart.setElement($markup.findById('#id-right-menu-chart'), false); this.btnChart.render();
this.btnShape.setElement($markup.findById('#id-right-menu-shape'), false); this.btnShape.render();
this.btnTextArt.setElement($markup.findById('#id-right-menu-textart'), false); this.btnTextArt.render();
@ -192,13 +192,13 @@ define([
this.btnText.on('click', this.onBtnMenuClick.bind(this));
this.btnTable.on('click', this.onBtnMenuClick.bind(this));
this.btnImage.on('click', this.onBtnMenuClick.bind(this));
this.btnHeaderFooter.on('click', this.onBtnMenuClick.bind(this));
// this.btnHeaderFooter.on('click', this.onBtnMenuClick.bind(this));
this.btnChart.on('click', this.onBtnMenuClick.bind(this));
this.btnShape.on('click', this.onBtnMenuClick.bind(this));
this.btnTextArt.on('click', this.onBtnMenuClick.bind(this));
this.paragraphSettings = new DE.Views.ParagraphSettings();
this.headerSettings = new DE.Views.HeaderFooterSettings();
// this.headerSettings = new DE.Views.HeaderFooterSettings();
this.imageSettings = new DE.Views.ImageSettings();
this.chartSettings = new DE.Views.ChartSettings();
this.tableSettings = new DE.Views.TableSettings();
@ -280,7 +280,7 @@ define([
var _isEyedropperStart = function (isStart) {this._isEyedropperStart = isStart;};
var _updateScroller = function () {me.updateScroller();};
this.paragraphSettings.setApi(api).on('editcomplete', _fire_editcomplete).on('eyedropper', _.bind(_isEyedropperStart, this));
this.headerSettings.setApi(api).on('editcomplete', _fire_editcomplete);
// this.headerSettings.setApi(api).on('editcomplete', _fire_editcomplete);
this.imageSettings.setApi(api).on('editcomplete', _fire_editcomplete);
this.chartSettings.setApi(api).on('editcomplete', _fire_editcomplete).on('updatescroller', _updateScroller);
this.tableSettings.setApi(api).on('editcomplete', _fire_editcomplete).on('eyedropper', _.bind(_isEyedropperStart, this));
@ -298,7 +298,7 @@ define([
this.shapeSettings && this.shapeSettings.setMode(mode);
this.formSettings && this.formSettings.setMode(mode);
this.chartSettings && this.chartSettings.setMode(mode);
this.headerSettings && this.headerSettings.setMode(mode);
// this.headerSettings && this.headerSettings.setMode(mode);
this.signatureSettings && this.signatureSettings.setMode(mode);
},
@ -390,7 +390,7 @@ define([
},
setButtons: function () {
var allButtons = [this.btnText, this.btnTable, this.btnImage, this.btnHeaderFooter, this.btnShape, this.btnChart, this.btnTextArt,
var allButtons = [this.btnText, this.btnTable, this.btnImage, this.btnShape, this.btnChart, this.btnTextArt,
this.btnMailMerge, this.btnSignature, this.btnForm];
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},