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

[DE] Load theme colors after opening the right panel

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-22 11:57:33 +03:00
parent e9bf021e17
commit 9933dd3a0c
7 changed files with 8 additions and 16 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

@ -1857,7 +1857,6 @@ define([
setTimeout(function(){
me.getApplication().getController('RightMenu').fillTextArt();
}, 50);
},
updateThemeColors: function() {
@ -1865,10 +1864,6 @@ define([
setTimeout(function(){
me.getApplication().getController('RightMenu').UpdateThemeColors();
}, 50);
setTimeout(function(){
me.getApplication().getController('DocumentHolder').getView().updateThemeColors();
}, 50);
setTimeout(function(){
me.getApplication().getController('Toolbar').updateThemeColors();
}, 50);

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

@ -276,7 +276,7 @@ define([
}
if (this.editMode && this.api) {
this.rightmenu.shapeSettings.createDelayedElements();
// this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));

5
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -1838,11 +1838,6 @@ define([
}
},
updateThemeColors: function() {
this.effectcolors = Common.Utils.ThemeColor.getEffectColors();
this.standartcolors = Common.Utils.ThemeColor.getStandartColors();
},
onCutCopyPaste: function(item, e) {
var me = this;
if (me.api) {

2
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -393,9 +393,9 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.UpdateThemeColors();
this.updateMetricUnit();
this._initSettings = false;
},
openAdvancedSettings: function(e) {

6
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1482,6 +1482,7 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
var global_hatch_menu_map = [
@ -1517,7 +1518,6 @@ define([
this.onApiAutoShapes();
this.UpdateThemeColors();
this._initSettings = false;
},
onInitStandartTextures: function(texture) {
@ -1670,6 +1670,8 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
// create color buttons
this.btnBackColor = new Common.UI.ColorButton({
@ -1691,7 +1693,6 @@ define([
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
@ -1768,7 +1769,6 @@ define([
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

3
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -431,10 +431,10 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.updateMetricUnit();
this._initSettings = false;
},
ChangeSettings: function(props) {
@ -641,6 +641,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
// create color buttons
this.btnBorderColor = new Common.UI.ColorButton({

1
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -1075,6 +1075,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",