Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
70571286
Commit
70571286
authored
Apr 11, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 32155.
parent
ef5e53b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
apps/common/main/lib/controller/ExternalDiagramEditor.js
apps/common/main/lib/controller/ExternalDiagramEditor.js
+3
-0
apps/common/main/lib/controller/ExternalMergeEditor.js
apps/common/main/lib/controller/ExternalMergeEditor.js
+3
-0
No files found.
apps/common/main/lib/controller/ExternalDiagramEditor.js
View file @
70571286
...
@@ -50,6 +50,7 @@ define([
...
@@ -50,6 +50,7 @@ define([
Common
.
Controllers
.
ExternalDiagramEditor
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
Common
.
Controllers
.
ExternalDiagramEditor
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
var
appLang
=
'
en
'
,
var
appLang
=
'
en
'
,
customization
=
undefined
,
customization
=
undefined
,
targetApp
=
''
,
externalEditor
=
null
;
externalEditor
=
null
;
...
@@ -67,6 +68,7 @@ define([
...
@@ -67,6 +68,7 @@ define([
},
},
editorConfig
:
{
editorConfig
:
{
mode
:
'
editdiagram
'
,
mode
:
'
editdiagram
'
,
targetApp
:
targetApp
,
lang
:
appLang
,
lang
:
appLang
,
canCoAuthoring
:
false
,
canCoAuthoring
:
false
,
canBackToFolder
:
false
,
canBackToFolder
:
false
,
...
@@ -148,6 +150,7 @@ define([
...
@@ -148,6 +150,7 @@ define([
if
(
data
&&
data
.
config
)
{
if
(
data
&&
data
.
config
)
{
if
(
data
.
config
.
lang
)
appLang
=
data
.
config
.
lang
;
if
(
data
.
config
.
lang
)
appLang
=
data
.
config
.
lang
;
if
(
data
.
config
.
customization
)
customization
=
data
.
config
.
customization
;
if
(
data
.
config
.
customization
)
customization
=
data
.
config
.
customization
;
if
(
data
.
config
.
targetApp
)
targetApp
=
data
.
config
.
targetApp
;
}
}
},
},
...
...
apps/common/main/lib/controller/ExternalMergeEditor.js
View file @
70571286
...
@@ -50,6 +50,7 @@ define([
...
@@ -50,6 +50,7 @@ define([
Common
.
Controllers
.
ExternalMergeEditor
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
Common
.
Controllers
.
ExternalMergeEditor
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
var
appLang
=
'
en
'
,
var
appLang
=
'
en
'
,
customization
=
undefined
,
customization
=
undefined
,
targetApp
=
''
,
externalEditor
=
null
;
externalEditor
=
null
;
...
@@ -67,6 +68,7 @@ define([
...
@@ -67,6 +68,7 @@ define([
},
},
editorConfig
:
{
editorConfig
:
{
mode
:
'
editmerge
'
,
mode
:
'
editmerge
'
,
targetApp
:
targetApp
,
lang
:
appLang
,
lang
:
appLang
,
canCoAuthoring
:
false
,
canCoAuthoring
:
false
,
canBackToFolder
:
false
,
canBackToFolder
:
false
,
...
@@ -149,6 +151,7 @@ define([
...
@@ -149,6 +151,7 @@ define([
if
(
data
&&
data
.
config
)
{
if
(
data
&&
data
.
config
)
{
if
(
data
.
config
.
lang
)
appLang
=
data
.
config
.
lang
;
if
(
data
.
config
.
lang
)
appLang
=
data
.
config
.
lang
;
if
(
data
.
config
.
customization
)
customization
=
data
.
config
.
customization
;
if
(
data
.
config
.
customization
)
customization
=
data
.
config
.
customization
;
if
(
data
.
config
.
targetApp
)
targetApp
=
data
.
config
.
targetApp
;
}
}
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment