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

[PE][SSE] Load theme colors after opening the right panel

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-22 13:38:13 +03:00
parent 9933dd3a0c
commit e0f3a707de
9 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,7 +286,7 @@ define([
if (this.editMode && this.api) {
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
this.rightmenu.shapeSettings.createDelayedElements();
// this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu));

3
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -1357,6 +1357,7 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
var global_hatch_menu_map = [
@ -1392,7 +1393,6 @@ define([
this.onApiAutoShapes();
this.UpdateThemeColors();
this._initSettings = false;
},
onInitStandartTextures: function(texture) {
@ -1525,6 +1525,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",

3
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -808,6 +808,7 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
var global_hatch_menu_map = [
@ -842,7 +843,6 @@ define([
}
this.UpdateThemeColors();
this._initSettings = false;
},
onInitStandartTextures: function(texture) {
@ -1036,6 +1036,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",

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

@ -604,13 +604,14 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.updateMetricUnit();
this._initSettings = false;
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",

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

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

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

@ -310,7 +310,7 @@ define([
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this));
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));
this.rightmenu.shapeSettings.createDelayedElements();
// this.rightmenu.shapeSettings.createDelayedElements();
this.onSelectionChanged(this.api.asc_getCellInfo());
}
},

3
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -518,6 +518,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
var defValue;
if (!this.btnSparkColor) {
defValue = this.defColor;
@ -863,10 +864,10 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
this.updateMetricUnit();
this.UpdateThemeColors();
this._initSettings = false;
},
ShowHideElem: function(isChart) {

3
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1381,6 +1381,7 @@ define([
},
createDelayedElements: function() {
this._initSettings = false;
this.createDelayedControls();
var global_hatch_menu_map = [
@ -1416,7 +1417,6 @@ define([
this.onApiAutoShapes();
this.UpdateThemeColors();
this._initSettings = false;
},
onInitStandartTextures: function(texture) {
@ -1570,6 +1570,7 @@ define([
},
UpdateThemeColors: function() {
if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",

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

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