From bacf676913c5f1691e4355266c7b9a1b32f4effd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 24 May 2016 14:59:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20-=20=D0=BD=D0=B5=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=B8=D0=BB=D1=81=D1=8F=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/documenteditor/mobile/app/controller/Main.js | 1 + apps/presentationeditor/mobile/app/controller/Main.js | 1 + apps/spreadsheeteditor/mobile/app/controller/Main.js | 1 + 3 files changed, 3 insertions(+) diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index f72367936..ab2a3d5f5 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -99,6 +99,7 @@ Ext.define('DE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user); }, diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 24945d7ce..228d389f2 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -100,6 +100,7 @@ Ext.define('PE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(data.config.user, this.editorConfig.lang, this.textAnonymous); }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index fdf9cbbf7..82293b9d9 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -102,6 +102,7 @@ Ext.define('SSE.controller.Main', { }, loadConfig: function(data) { + this.editorConfig = Ext.merge(this.editorConfig, data.config); this.editorConfig.user = this._fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous); },