[SSE] fix bug 42885

This commit is contained in:
Maxim Kadushkin 2019-09-23 18:39:59 +03:00
parent 6345ebca47
commit 0e5aed194b

View file

@ -3128,73 +3128,72 @@ define([
} }
setTimeout(function () { setTimeout(function () {
me.toolbar.render(_.extend({isCompactView: compactview}, config)); Common.Utils.asyncCall(function () {
}, 0); me.toolbar.render(_.extend({isCompactView: compactview}, config));
if ( config.isEdit ) {
me.toolbar.setMode(config);
Common.Utils.asyncCall(function () { me.toolbar.btnSave && me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
if ( config.isEdit ) { me.toolbar.btnUndo && me.toolbar.btnUndo.on('disabled', _.bind(me.onBtnChangeState, me, 'undo:disabled'));
me.toolbar.setMode(config); me.toolbar.btnRedo && me.toolbar.btnRedo.on('disabled', _.bind(me.onBtnChangeState, me, 'redo:disabled'));
me.toolbar.btnPrint && me.toolbar.btnPrint.on('disabled', _.bind(me.onBtnChangeState, me, 'print:disabled'));
me.toolbar.setApi(me.api);
me.toolbar.btnSave && me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); if ( !config.isEditDiagram && !config.isEditMailMerge ) {
me.toolbar.btnUndo && me.toolbar.btnUndo.on('disabled', _.bind(me.onBtnChangeState, me, 'undo:disabled')); var datatab = me.getApplication().getController('DataTab');
me.toolbar.btnRedo && me.toolbar.btnRedo.on('disabled', _.bind(me.onBtnChangeState, me, 'redo:disabled')); datatab.setApi(me.api).setConfig({toolbar: me});
me.toolbar.btnPrint && me.toolbar.btnPrint.on('disabled', _.bind(me.onBtnChangeState, me, 'print:disabled'));
me.toolbar.setApi(me.api);
if ( !config.isEditDiagram && !config.isEditMailMerge ) { datatab = datatab.getView('DataTab');
var datatab = me.getApplication().getController('DataTab'); Array.prototype.push.apply(me.toolbar.lockControls, datatab.getButtons());
datatab.setApi(me.api).setConfig({toolbar: me}); me.toolbar.btnsSortDown = datatab.getButtons('sort-down');
me.toolbar.btnsSortUp = datatab.getButtons('sort-up');
me.toolbar.btnsSetAutofilter = datatab.getButtons('set-filter');
me.toolbar.btnsClearAutofilter = datatab.getButtons('clear-filter');
datatab = datatab.getView('DataTab'); var formulatab = me.getApplication().getController('FormulaDialog');
Array.prototype.push.apply(me.toolbar.lockControls, datatab.getButtons()); formulatab.setConfig({toolbar: me});
me.toolbar.btnsSortDown = datatab.getButtons('sort-down'); formulatab = formulatab.getView('FormulaTab');
me.toolbar.btnsSortUp = datatab.getButtons('sort-up'); me.toolbar.btnsFormula = formulatab.getButtons('formula');
me.toolbar.btnsSetAutofilter = datatab.getButtons('set-filter'); Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons());
me.toolbar.btnsClearAutofilter = datatab.getButtons('clear-filter');
var formulatab = me.getApplication().getController('FormulaDialog'); if ( !config.isOffline ) {
formulatab.setConfig({toolbar: me}); tab = {action: 'pivot', caption: me.textPivot};
formulatab = formulatab.getView('FormulaTab'); $panel = me.getApplication().getController('PivotTable').createToolbarPanel();
me.toolbar.btnsFormula = formulatab.getButtons('formula'); if ($panel) {
Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons()); me.toolbar.addTab(tab, $panel, 5);
me.toolbar.setVisible('pivot', true);
if ( !config.isOffline ) { }
tab = {action: 'pivot', caption: me.textPivot};
$panel = me.getApplication().getController('PivotTable').createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 5);
me.toolbar.setVisible('pivot', true);
} }
}
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel ) if ( $panel )
me.toolbar.addTab(tab, $panel, 6); me.toolbar.addTab(tab, $panel, 6);
if (!(config.customization && config.customization.compactHeader)) { if (!(config.customization && config.customization.compactHeader)) {
// hide 'print' and 'save' buttons group and next separator // hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
// hide 'undo' and 'redo' buttons and get container // hide 'undo' and 'redo' buttons and get container
var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
// move 'paste' button to the container instead of 'undo' and 'redo' // move 'paste' button to the container instead of 'undo' and 'redo'
me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split'); me.toolbar.btnCopy.$el.removeClass('split');
} }
if ( config.isDesktopApp ) { if ( config.isDesktopApp ) {
if ( config.canProtect ) { if ( config.canProtect ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect}; tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel) if ($panel)
me.toolbar.addTab(tab, $panel, 7); me.toolbar.addTab(tab, $panel, 7);
}
} }
} }
} }
} });
}); }, 0);
}, },
onAppReady: function (config) { onAppReady: function (config) {