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

[SSE] Fix Bug 36920.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-13 17:51:36 +03:00
parent aabbc9c8fd
commit df0184dc05
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -196,12 +196,12 @@ define([
this._settings[settingsType].btn.updateHint(this.rightmenu.txtSparklineSettings);
}
if (pivotInfo) {
settingsType = Common.Utils.documentSettingsType.Pivot;
this._settings[settingsType].props = pivotInfo;
this._settings[settingsType].locked = isCellLocked || true; // disable pivot settings
this._settings[settingsType].hidden = 0;
}
// if (pivotInfo) {
// settingsType = Common.Utils.documentSettingsType.Pivot;
// this._settings[settingsType].props = pivotInfo;
// this._settings[settingsType].locked = isCellLocked || true; // disable pivot settings
// this._settings[settingsType].hidden = 0;
// }
var lastactive = -1, currentactive, priorityactive = -1,
activePane = this.rightmenu.GetActivePane();

2
apps/spreadsheeteditor/main/app/template/RightMenu.template
View file

@ -25,7 +25,7 @@
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon img-toolbarmenu btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings"><i class="icon img-toolbarmenu btn-menu-text">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon img-toolbarmenu btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left" content-target="id-pivot-settings"><i class="icon img-toolbarmenu btn-menu-pivot">&nbsp;</i></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left hidden" content-target="id-pivot-settings"><i class="icon img-toolbarmenu btn-menu-pivot">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon img-toolbarmenu btn-menu-signature">&nbsp;</i></button>
</div>
</div>

30
apps/spreadsheeteditor/main/app/view/PivotTable.js
View file

@ -52,21 +52,21 @@ define([
SSE.Views.PivotTable = Common.UI.BaseView.extend(_.extend((function(){
var template =
'<section id="pivot-table-panel" class="panel" data-tab="pivot">' +
'<div class="group">' +
'<span id="slot-btn-add-pivot" class="btn-slot text x-huge"></span>' +
'</div>' +
'<div class="separator long"/>' +
'<div class="group">' +
'<span id="slot-btn-pivot-report-layout" class="btn-slot text x-huge"></span>' +
'<span id="slot-btn-pivot-blank-rows" class="btn-slot text x-huge"></span>' +
'<span id="slot-btn-pivot-subtotals" class="btn-slot text x-huge"></span>' +
'<span id="slot-btn-pivot-grand-totals" class="btn-slot text x-huge"></span>' +
'</div>' +
'<div class="separator long"/>' +
'<div class="group">' +
'<span id="slot-btn-refresh-pivot" class="btn-slot text x-huge"></span>' +
'</div>' +
'<div class="separator long"/>' +
// '<div class="group">' +
// '<span id="slot-btn-add-pivot" class="btn-slot text x-huge"></span>' +
// '</div>' +
// '<div class="separator long"/>' +
// '<div class="group">' +
// '<span id="slot-btn-pivot-report-layout" class="btn-slot text x-huge"></span>' +
// '<span id="slot-btn-pivot-blank-rows" class="btn-slot text x-huge"></span>' +
// '<span id="slot-btn-pivot-subtotals" class="btn-slot text x-huge"></span>' +
// '<span id="slot-btn-pivot-grand-totals" class="btn-slot text x-huge"></span>' +
// '</div>' +
// '<div class="separator long"/>' +
// '<div class="group">' +
// '<span id="slot-btn-refresh-pivot" class="btn-slot text x-huge"></span>' +
// '</div>' +
// '<div class="separator long"/>' +
'<div class="group">' +
'<span id="slot-btn-select-pivot" class="btn-slot text x-huge"></span>' +
'</div>' +