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
b9d5642a
Commit
b9d5642a
authored
Oct 21, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Move DE.define to Common
parent
6bb74709
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
428 deletions
+16
-428
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+16
-16
apps/documenteditor/main/app/util/define.js
apps/documenteditor/main/app/util/define.js
+0
-412
No files found.
apps/documenteditor/main/app/controller/Toolbar.js
View file @
b9d5642a
...
@@ -46,8 +46,8 @@ define([
...
@@ -46,8 +46,8 @@ define([
'
common/main/lib/view/CopyWarningDialog
'
,
'
common/main/lib/view/CopyWarningDialog
'
,
'
common/main/lib/view/ImageFromUrlDialog
'
,
'
common/main/lib/view/ImageFromUrlDialog
'
,
'
common/main/lib/view/InsertTableDialog
'
,
'
common/main/lib/view/InsertTableDialog
'
,
'
common/main/lib/util/define
'
,
'
documenteditor/main/app/view/Toolbar
'
,
'
documenteditor/main/app/view/Toolbar
'
,
'
documenteditor/main/app/util/define
'
,
'
documenteditor/main/app/view/HyperlinkSettingsDialog
'
,
'
documenteditor/main/app/view/HyperlinkSettingsDialog
'
,
'
documenteditor/main/app/view/DropcapSettingsAdvanced
'
,
'
documenteditor/main/app/view/DropcapSettingsAdvanced
'
,
'
documenteditor/main/app/view/MailMergeRecepients
'
,
'
documenteditor/main/app/view/MailMergeRecepients
'
,
...
@@ -2291,32 +2291,32 @@ define([
...
@@ -2291,32 +2291,32 @@ define([
// [translate, count cells, scroll]
// [translate, count cells, scroll]
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Symbol
]
=
[
this
.
textSymbols
,
11
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Symbol
]
=
[
this
.
textSymbols
,
11
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Fraction
]
=
[
this
.
textFraction
,
4
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Fraction
]
=
[
this
.
textFraction
,
4
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Script
]
=
[
this
.
textScript
,
4
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Script
]
=
[
this
.
textScript
,
4
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Radical
]
=
[
this
.
textRadical
,
4
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Radical
]
=
[
this
.
textRadical
,
4
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Integral
]
=
[
this
.
textIntegral
,
3
,
true
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Integral
]
=
[
this
.
textIntegral
,
3
,
true
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
LargeOperator
]
=
[
this
.
textLargeOperator
,
5
,
true
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
LargeOperator
]
=
[
this
.
textLargeOperator
,
5
,
true
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Bracket
]
=
[
this
.
textBracket
,
4
,
true
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Bracket
]
=
[
this
.
textBracket
,
4
,
true
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Function
]
=
[
this
.
textFunction
,
3
,
true
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Function
]
=
[
this
.
textFunction
,
3
,
true
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Accent
]
=
[
this
.
textAccent
,
4
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Accent
]
=
[
this
.
textAccent
,
4
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
LimitLog
]
=
[
this
.
textLimitAndLog
,
3
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
LimitLog
]
=
[
this
.
textLimitAndLog
,
3
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Operator
]
=
[
this
.
textOperator
,
4
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Operator
]
=
[
this
.
textOperator
,
4
];
c_oAscMathMainTypeStrings
[
DE
.
define
.
c_oAscMathMainType
.
Matrix
]
=
[
this
.
textMatrix
,
4
,
true
];
c_oAscMathMainTypeStrings
[
Common
.
define
.
c_oAscMathMainType
.
Matrix
]
=
[
this
.
textMatrix
,
4
,
true
];
// equations sub groups
// equations sub groups
// equations types
// equations types
var
translationTable
=
{},
name
=
''
,
translate
=
''
;
var
translationTable
=
{},
name
=
''
,
translate
=
''
;
for
(
name
in
DE
.
define
.
c_oAscMathType
)
{
for
(
name
in
Common
.
define
.
c_oAscMathType
)
{
if
(
DE
.
define
.
c_oAscMathType
.
hasOwnProperty
(
name
))
{
if
(
Common
.
define
.
c_oAscMathType
.
hasOwnProperty
(
name
))
{
var
arr
=
name
.
split
(
'
_
'
);
var
arr
=
name
.
split
(
'
_
'
);
if
(
arr
.
length
==
2
&&
arr
[
0
]
==
'
Symbol
'
)
{
if
(
arr
.
length
==
2
&&
arr
[
0
]
==
'
Symbol
'
)
{
translate
=
'
txt
'
+
arr
[
0
]
+
'
_
'
+
arr
[
1
].
toLocaleLowerCase
();
translate
=
'
txt
'
+
arr
[
0
]
+
'
_
'
+
arr
[
1
].
toLocaleLowerCase
();
}
else
}
else
translate
=
'
txt
'
+
name
;
translate
=
'
txt
'
+
name
;
translationTable
[
DE
.
define
.
c_oAscMathType
[
name
]]
=
this
[
translate
];
translationTable
[
Common
.
define
.
c_oAscMathType
[
name
]]
=
this
[
translate
];
}
}
}
}
...
...
apps/documenteditor/main/app/util/define.js
deleted
100644 → 0
View file @
6bb74709
This diff is collapsed.
Click to expand it.
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