From 705712863699a43302aa466a9b4f584af33fc140 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 11 Apr 2016 15:58:51 +0300 Subject: [PATCH] Bug 32155. --- apps/common/main/lib/controller/ExternalDiagramEditor.js | 3 +++ apps/common/main/lib/controller/ExternalMergeEditor.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index f6cd2d288..876c5f6a5 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -50,6 +50,7 @@ define([ Common.Controllers.ExternalDiagramEditor = Backbone.Controller.extend(_.extend((function() { var appLang = 'en', customization = undefined, + targetApp = '', externalEditor = null; @@ -67,6 +68,7 @@ define([ }, editorConfig: { mode : 'editdiagram', + targetApp : targetApp, lang : appLang, canCoAuthoring : false, canBackToFolder : false, @@ -148,6 +150,7 @@ define([ if (data && data.config) { if (data.config.lang) appLang = data.config.lang; if (data.config.customization) customization = data.config.customization; + if (data.config.targetApp) targetApp = data.config.targetApp; } }, diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js index d65792628..e45e1518d 100644 --- a/apps/common/main/lib/controller/ExternalMergeEditor.js +++ b/apps/common/main/lib/controller/ExternalMergeEditor.js @@ -50,6 +50,7 @@ define([ Common.Controllers.ExternalMergeEditor = Backbone.Controller.extend(_.extend((function() { var appLang = 'en', customization = undefined, + targetApp = '', externalEditor = null; @@ -67,6 +68,7 @@ define([ }, editorConfig: { mode : 'editmerge', + targetApp : targetApp, lang : appLang, canCoAuthoring : false, canBackToFolder : false, @@ -149,6 +151,7 @@ define([ if (data && data.config) { if (data.config.lang) appLang = data.config.lang; if (data.config.customization) customization = data.config.customization; + if (data.config.targetApp) targetApp = data.config.targetApp; } },