[all] fix toolbar's rendering dependensies
This commit is contained in:
parent
0e5aed194b
commit
2c4a281998
|
@ -2827,10 +2827,9 @@ define([
|
|||
|
||||
setTimeout(function () {
|
||||
me.toolbar.render(_.extend({isCompactView: compactview}, config));
|
||||
}, 0);
|
||||
|
||||
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 )
|
||||
me.toolbar.addTab(tab, $panel, 4);
|
||||
|
||||
|
@ -2864,6 +2863,7 @@ define([
|
|||
links.setApi(me.api).setConfig({toolbar: me});
|
||||
Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
|
||||
}
|
||||
}, 0);
|
||||
},
|
||||
|
||||
onAppReady: function (config) {
|
||||
|
|
|
@ -2082,7 +2082,6 @@ define([
|
|||
* */
|
||||
setTimeout(function () {
|
||||
me.toolbar.render(_.extend({compactview: compactview}, config));
|
||||
}, 0);
|
||||
|
||||
if ( config.isEdit ) {
|
||||
me.toolbar.setMode(config);
|
||||
|
@ -2115,6 +2114,7 @@ define([
|
|||
}
|
||||
}
|
||||
}
|
||||
}, 0);
|
||||
},
|
||||
|
||||
onAppReady: function (config) {
|
||||
|
|
|
@ -3128,7 +3128,6 @@ define([
|
|||
}
|
||||
|
||||
setTimeout(function () {
|
||||
Common.Utils.asyncCall(function () {
|
||||
me.toolbar.render(_.extend({isCompactView: compactview}, config));
|
||||
if ( config.isEdit ) {
|
||||
me.toolbar.setMode(config);
|
||||
|
@ -3192,7 +3191,6 @@ define([
|
|||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}, 0);
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue