[DE] [SSE] Init shape settings in the right panel before first opening.

apps/documenteditor/main/app/controller/Main.js

@@ -872,12 +872,12 @@ define([
                             documentHolderController.getView('DocumentHolder').createDelayedElements();
                             me.loadLanguages();
 
-                            rightmenuController.createDelayedElements();
-
                             var shapes = me.api.asc_getPropertyEditorShapes();
                             if (shapes)
                                 me.fillAutoShapes(shapes[0], shapes[1]);
 
+                            rightmenuController.createDelayedElements();
+
                             me.updateThemeColors();
                             toolbarController.activateControls();
                             if (me.needToUpdateVersion)

apps/documenteditor/main/app/controller/RightMenu.js

@@ -269,6 +269,7 @@ define([
             }
 
             if (this.editMode && this.api) {
+                this.rightmenu.shapeSettings.createDelayedElements();
                 var selectedElements = this.api.getSelectedElements();
                 if (selectedElements.length>0) {
                     var open = Common.localStorage.getItem("de-hide-right-settings");

apps/documenteditor/main/app/view/ChartSettings.js

@@ -105,10 +105,8 @@ define([
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 
@@ -307,6 +305,7 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         _ChartWrapStyleChanged: function(style) {

apps/documenteditor/main/app/view/HeaderFooterSettings.js

@@ -94,10 +94,8 @@ define([
         },
 
         ChangeSettings: function(prop) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 
@@ -244,6 +242,7 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         setLocked: function (locked) {

apps/documenteditor/main/app/view/ImageSettings.js

@@ -182,13 +182,12 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 

apps/documenteditor/main/app/view/MailMergeSettings.js

@@ -380,13 +380,13 @@ define([
                     this.cmbMergeTo.setValue(this._arrMergeSrc[0].value);
                 }
             }
+
+            this._initSettings = false;
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedControls();
-                this._initSettings = false;
-            }
 
             this.disableInsertControls(this._locked);
 

apps/documenteditor/main/app/view/ParagraphSettings.js

@@ -276,10 +276,8 @@ define([
         },
 
         ChangeSettings: function(prop) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
             this.hideTextOnlySettings(this.isChart);
@@ -397,6 +395,7 @@ define([
         createDelayedElements: function() {
             this.UpdateThemeColors();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         openAdvancedSettings: function(e) {

apps/documenteditor/main/app/view/ShapeSettings.js

@@ -764,7 +764,6 @@ define([
 
             if (this._initSettings)
                 this.createDelayedElements();
-            this._initSettings = false;
 
             if (props && props.get_ShapeProperties())
             {
@@ -1450,6 +1449,7 @@ define([
 
             this.fillAutoShapes();
             this.UpdateThemeColors();
+            this._initSettings = false;
         },
 
         onInitStandartTextures: function(texture) {

apps/documenteditor/main/app/view/TableSettings.js

@@ -423,12 +423,12 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.UpdateThemeColors();
+            this._initSettings = false;
         },
 
         ChangeSettings: function(props) {
             if (this._initSettings)
                 this.createDelayedElements();
-            this._initSettings = false;
 
             this.disableControls(this._locked);
 

apps/documenteditor/main/app/view/TextArtSettings.js

@@ -515,7 +515,6 @@ define([
 
             if (this._initSettings)
                 this.createDelayedElements();
-            this._initSettings = false;
 
             if (props && props.get_ShapeProperties() && props.get_ShapeProperties().get_TextArtProperties())
             {
@@ -965,6 +964,7 @@ define([
             this.createDelayedControls();
             this.UpdateThemeColors();
             this.fillTransform(this.api.asc_getPropertyEditorTextArts());
+            this._initSettings = false;
         },
 
         fillTextArt: function() {

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -646,7 +646,6 @@ define([
 
                             documentHolderView.createDelayedElements();
                             toolbarController.createDelayedElements();
-                            rightmenuController.createDelayedElements();
 
                             if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
                                 var shapes = me.api.asc_getPropertyEditorShapes();
@@ -657,6 +656,8 @@ define([
                                 me.updateThemeColors();
                             }
 
+                            rightmenuController.createDelayedElements();
+
                             me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me));
                             me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                             me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));

apps/spreadsheeteditor/main/app/controller/RightMenu.js

@@ -266,6 +266,7 @@ define([
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
                 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.onSelectionChanged(this.api.asc_getCellInfo());
             }
         },

apps/spreadsheeteditor/main/app/view/ChartSettings.js

@@ -102,10 +102,8 @@ define([
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 
@@ -316,6 +314,7 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         onWidthChange: function(field, newValue, oldValue, eOpts){

apps/spreadsheeteditor/main/app/view/ImageSettings.js

@@ -193,13 +193,12 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 

apps/spreadsheeteditor/main/app/view/ParagraphSettings.js

@@ -177,10 +177,8 @@ define([
         },
 
         ChangeSettings: function(prop) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedElements();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 
@@ -328,6 +326,7 @@ define([
         createDelayedElements: function() {
             this.createDelayedControls();
             this.updateMetricUnit();
+            this._initSettings = false;
         },
 
         openAdvancedSettings: function(e) {

apps/spreadsheeteditor/main/app/view/ShapeSettings.js

@@ -698,7 +698,6 @@ define([
         ChangeSettings: function(props) {
             if (this._initSettings)
                 this.createDelayedElements();
-            this._initSettings = false;
 
             if (this.imgprops==null)
                 this.imgprops = new Asc.asc_CImgProperty();
@@ -1336,6 +1335,7 @@ define([
 
             this.fillAutoShapes();
             this.UpdateThemeColors();
+            this._initSettings = false;
         },
 
         onInitStandartTextures: function(texture) {

apps/spreadsheeteditor/main/app/view/TableSettings.js

@@ -249,13 +249,13 @@ define([
             }, this));
             this.btnEdit.menu.on('item:click', _.bind(this.onEditClick, this));
             this.lockedControls.push(this.btnEdit);
+
+            this._initSettings = false;
         },
 
         ChangeSettings: function(props) {
-            if (this._initSettings) {
+            if (this._initSettings)
                 this.createDelayedControls();
-                this._initSettings = false;
-            }
 
             this.disableControls(this._locked);
 

apps/spreadsheeteditor/main/app/view/TextArtSettings.js

@@ -664,7 +664,6 @@ define([
 
             if (this._initSettings)
                 this.createDelayedElements();
-            this._initSettings = false;
 
             if (props && props.asc_getShapeProperties() && props.asc_getShapeProperties().get_TextArtProperties())
             {
@@ -1310,6 +1309,7 @@ define([
 
             this.UpdateThemeColors();
             this.fillTransform(this.api.asc_getPropertyEditorTextArts());
+            this._initSettings = false;
         },
 
         onInitStandartTextures: function(texture) {