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

[all] fix toolbar's rendering dependensies

Browse source
This commit is contained in:
Maxim Kadushkin 2019-09-25 12:50:58 +03:00
parent 0e5aed194b
commit 2c4a281998
3 changed files with 102 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2827,10 +2827,9 @@ define([
setTimeout(function () { setTimeout(function () {
me.toolbar.render(_.extend({isCompactView: compactview}, config)); me.toolbar.render(_.extend({isCompactView: compactview}, config));
}, 0);
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = this.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel ) if ( $panel )
me.toolbar.addTab(tab, $panel, 4); me.toolbar.addTab(tab, $panel, 4);
@ -2864,6 +2863,7 @@ define([
links.setApi(me.api).setConfig({toolbar: me}); links.setApi(me.api).setConfig({toolbar: me});
Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons()); Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
} }
}, 0);
}, },
onAppReady: function (config) { onAppReady: function (config) {

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2082,7 +2082,6 @@ define([
* */ * */
setTimeout(function () { setTimeout(function () {
me.toolbar.render(_.extend({compactview: compactview}, config)); me.toolbar.render(_.extend({compactview: compactview}, config));
}, 0);
if ( config.isEdit ) { if ( config.isEdit ) {
me.toolbar.setMode(config); me.toolbar.setMode(config);
@ -2115,6 +2114,7 @@ define([
} }
} }
} }
}, 0);
}, },
onAppReady: function (config) { onAppReady: function (config) {

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

@ -3128,7 +3128,6 @@ define([
} }
setTimeout(function () { setTimeout(function () {
Common.Utils.asyncCall(function () {
me.toolbar.render(_.extend({isCompactView: compactview}, config)); me.toolbar.render(_.extend({isCompactView: compactview}, config));
if ( config.isEdit ) { if ( config.isEdit ) {
me.toolbar.setMode(config); me.toolbar.setMode(config);
@ -3192,7 +3191,6 @@ define([
} }
} }
} }
});
}, 0); }, 0);
}, },