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

Merge branch 'develop' into feature/optimization

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-21 15:41:21 +03:00
parent 71d1f2a262 8e48413937
commit 8332c3b133
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/Main.js
View file

@ -1878,7 +1878,10 @@ define([
Common.Utils.ThemeColor.setColors(colors, standart_colors); Common.Utils.ThemeColor.setColors(colors, standart_colors);
if (window.styles_loaded) { if (window.styles_loaded) {
this.updateThemeColors(); this.updateThemeColors();
this.fillTextArt(this.api.asc_getTextArtPreviews()); var me = this;
setTimeout(function(){
me.fillTextArt(me.api.asc_getTextArtPreviews());
}, 1);
} }
}, },

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1556,7 +1556,10 @@ define([
Common.Utils.ThemeColor.setColors(colors, standart_colors); Common.Utils.ThemeColor.setColors(colors, standart_colors);
if (window.styles_loaded) { if (window.styles_loaded) {
this.updateThemeColors(); this.updateThemeColors();
this.fillTextArt(this.api.asc_getTextArtPreviews()); var me = this;
setTimeout(function(){
me.fillTextArt(me.api.asc_getTextArtPreviews());
}, 1);
} }
}, },

5
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1844,7 +1844,10 @@ define([
Common.Utils.ThemeColor.setColors(colors, standart_colors); Common.Utils.ThemeColor.setColors(colors, standart_colors);
if (window.styles_loaded && !this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) { if (window.styles_loaded && !this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) {
this.updateThemeColors(); this.updateThemeColors();
this.fillTextArt(this.api.asc_getTextArtPreviews()); var me = this;
setTimeout(function(){
me.fillTextArt(me.api.asc_getTextArtPreviews());
}, 1);
} }
}, },