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

Merge pull request #509 from ONLYOFFICE/fix/bug-37059

Browse source 
[SSE] Fix Bug 37059
This commit is contained in:
Julia Radzhabova 2020-09-17 13:10:37 +03:00 committed by GitHub
parent 0950cf977a 624c4ef8a6
commit b03be27821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,8 @@ define([
'add:chart' : this.onSelectChart, 'add:chart' : this.onSelectChart,
'insert:textart': this.onInsertTextart, 'insert:textart': this.onInsertTextart,
'change:scalespn': this.onClickChangeScaleInMenu.bind(me), 'change:scalespn': this.onClickChangeScaleInMenu.bind(me),
'click:customscale': this.onScaleClick.bind(me) 'click:customscale': this.onScaleClick.bind(me),
'home:open' : this.onHomeOpen
}, },
'FileMenu': { 'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'), 'menu:hide': me.onFileMenu.bind(me, 'hide'),
@ -1761,6 +1762,15 @@ define([
window.styles_loaded = true; window.styles_loaded = true;
}, },
onHomeOpen: function() {
var listStyles = this.toolbar.listStyles;
if (listStyles && listStyles.needFillComboView && listStyles.menuPicker.store.length > 0 && listStyles.rendered){
var styleRec;
if (this._state.prstyle) styleRec = listStyles.menuPicker.store.findWhere({name: this._state.prstyle});
listStyles.fillComboView((styleRec) ? styleRec : listStyles.menuPicker.store.at(0), true);
}
},
onApiCoAuthoringDisconnect: function(enableDownload) { onApiCoAuthoringDisconnect: function(enableDownload) {
this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload}); this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
this.editMode = false; this.editMode = false;

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1553,6 +1553,8 @@ define([
me.fireEvent('file:open'); me.fireEvent('file:open');
me.setTab(tab); me.setTab(tab);
} }
if ( me.isTabActive('home'))
me.fireEvent('home:open');
}, },
rendererComponents: function(html) { rendererComponents: function(html) {