Commit bacf6769 authored by Julia Radzhabova's avatar Julia Radzhabova

Отладка мобильных версий - не грузился конфиг.

parent 76a3ee98
...@@ -99,6 +99,7 @@ Ext.define('DE.controller.Main', { ...@@ -99,6 +99,7 @@ Ext.define('DE.controller.Main', {
}, },
loadConfig: function(data) { loadConfig: function(data) {
this.editorConfig = Ext.merge(this.editorConfig, data.config);
this.editorConfig.user = this._fillUserInfo(this.editorConfig.user); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user);
}, },
......
...@@ -100,6 +100,7 @@ Ext.define('PE.controller.Main', { ...@@ -100,6 +100,7 @@ Ext.define('PE.controller.Main', {
}, },
loadConfig: function(data) { loadConfig: function(data) {
this.editorConfig = Ext.merge(this.editorConfig, data.config);
this.editorConfig.user = this._fillUserInfo(data.config.user, this.editorConfig.lang, this.textAnonymous); this.editorConfig.user = this._fillUserInfo(data.config.user, this.editorConfig.lang, this.textAnonymous);
}, },
......
...@@ -102,6 +102,7 @@ Ext.define('SSE.controller.Main', { ...@@ -102,6 +102,7 @@ Ext.define('SSE.controller.Main', {
}, },
loadConfig: function(data) { loadConfig: function(data) {
this.editorConfig = Ext.merge(this.editorConfig, data.config);
this.editorConfig.user = this._fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous);
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment