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

[all] roolback bugfix 42885 for smooth skeleton

Browse source
This commit is contained in:
Maxim Kadushkin 2019-10-29 11:30:08 +03:00
parent db27a53b1f
commit 2f2bcb516d
3 changed files with 104 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2827,7 +2827,6 @@ define([
compactview = true; compactview = true;
} }
setTimeout(function () {
me.toolbar.render(_.extend({isCompactView: compactview}, config)); me.toolbar.render(_.extend({isCompactView: compactview}, config));
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
@ -2865,7 +2864,6 @@ 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) {

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

@ -2077,16 +2077,10 @@ define([
compactview = true; compactview = true;
} }
/**
* Rendering of toolbar makes rendering of header very slow
* Temporary wrapped up in setTimeout to process events
* */
setTimeout(function () {
me.toolbar.render(_.extend({compactview: compactview}, config)); me.toolbar.render(_.extend({compactview: compactview}, config));
if ( config.isEdit ) { if ( config.isEdit ) {
me.toolbar.setMode(config); me.toolbar.setMode(config);
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 )
@ -2115,7 +2109,6 @@ define([
} }
} }
} }
}, 0);
}, },
onAppReady: function (config) { onAppReady: function (config) {

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

@ -3150,8 +3150,8 @@ define([
compactview = true; compactview = true;
} }
setTimeout(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);
@ -3214,7 +3214,6 @@ define([
} }
} }
} }
}, 0);
}, },
onAppReady: function (config) { onAppReady: function (config) {