Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
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
sdkjs
Commits
d2b5f8d9
Commit
d2b5f8d9
authored
Jun 21, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete textArtTranslate -> translateManager
parent
9a6cc488
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
20 deletions
+9
-20
cell/model/DrawingObjects/Format/ShapePrototype.js
cell/model/DrawingObjects/Format/ShapePrototype.js
+0
-5
common/Drawings/CommonController.js
common/Drawings/CommonController.js
+8
-4
common/apiBase.js
common/apiBase.js
+0
-2
slide/Editor/Format/ShapePrototype.js
slide/Editor/Format/ShapePrototype.js
+0
-4
word/Editor/GraphicObjects/Format/ShapePrototype.js
word/Editor/GraphicObjects/Format/ShapePrototype.js
+0
-4
word/api.js
word/api.js
+1
-1
No files found.
cell/model/DrawingObjects/Format/ShapePrototype.js
View file @
d2b5f8d9
...
@@ -67,11 +67,6 @@ CShape.prototype.Get_Numbering = function()
...
@@ -67,11 +67,6 @@ CShape.prototype.Get_Numbering = function()
return
new
CNumbering
();
return
new
CNumbering
();
};
};
CShape
.
prototype
.
getTextArtTranslate
=
function
()
{
return
Asc
[
"
editor
"
].
textArtTranslate
;
};
CShape
.
prototype
.
Is_UseInDocument
=
function
(){
CShape
.
prototype
.
Is_UseInDocument
=
function
(){
if
(
this
.
group
)
if
(
this
.
group
)
{
{
...
...
common/Drawings/CommonController.js
View file @
d2b5f8d9
...
@@ -722,6 +722,10 @@ function CanStartEditText(oController)
...
@@ -722,6 +722,10 @@ function CanStartEditText(oController)
DrawingObjectsController
.
prototype
=
DrawingObjectsController
.
prototype
=
{
{
getDefaultText
:
function
(){
return
AscCommon
.
translateManager
.
getValue
(
'
Your text here
'
);
},
getAllConnectors
:
function
(
aDrawings
,
allDrawings
){
getAllConnectors
:
function
(
aDrawings
,
allDrawings
){
var
_ret
=
allDrawings
;
var
_ret
=
allDrawings
;
if
(
!
_ret
){
if
(
!
_ret
){
...
@@ -7966,7 +7970,7 @@ DrawingObjectsController.prototype =
...
@@ -7966,7 +7970,7 @@ DrawingObjectsController.prototype =
}
}
else
else
{
{
sText
=
oShape
.
getTextArtTranslate
().
DefaultText
;
sText
=
this
.
getDefaultText
()
;
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
oShape
.
bSelectedText
=
false
;
oShape
.
bSelectedText
=
false
;
}
}
...
@@ -7993,7 +7997,7 @@ DrawingObjectsController.prototype =
...
@@ -7993,7 +7997,7 @@ DrawingObjectsController.prototype =
}
}
else
else
{
{
sText
=
oShape
.
getTextArtTranslate
().
DefaultText
;
sText
=
this
.
getDefaultText
()
;
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
oShape
.
bSelectedText
=
false
;
oShape
.
bSelectedText
=
false
;
}
}
...
@@ -8001,13 +8005,13 @@ DrawingObjectsController.prototype =
...
@@ -8001,13 +8005,13 @@ DrawingObjectsController.prototype =
else
else
{
{
oShape
.
bSelectedText
=
false
;
oShape
.
bSelectedText
=
false
;
sText
=
(
typeof
sStartString
===
"
string
"
)
?
sStartString
:
oShape
.
getTextArtTranslate
().
DefaultText
;
sText
=
(
typeof
sStartString
===
"
string
"
)
?
sStartString
:
this
.
getDefaultText
()
;
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
}
}
}
}
else
else
{
{
sText
=
(
typeof
sStartString
===
"
string
"
)
?
sStartString
:
oShape
.
getTextArtTranslate
().
DefaultText
;
sText
=
(
typeof
sStartString
===
"
string
"
)
?
sStartString
:
this
.
getDefaultText
()
;
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
AscFormat
.
AddToContentFromString
(
oContent
,
sText
);
}
}
var
oTextPr
;
var
oTextPr
;
...
...
common/apiBase.js
View file @
d2b5f8d9
...
@@ -111,7 +111,6 @@
...
@@ -111,7 +111,6 @@
this
.
translateManager
=
AscCommon
.
translateManager
.
init
(
config
[
'
translate
'
]);
this
.
translateManager
=
AscCommon
.
translateManager
.
init
(
config
[
'
translate
'
]);
// Chart
// Chart
this
.
textArtTranslate
=
null
;
this
.
chartPreviewManager
=
null
;
this
.
chartPreviewManager
=
null
;
this
.
textArtPreviewManager
=
null
;
this
.
textArtPreviewManager
=
null
;
this
.
shapeElementId
=
null
;
this
.
shapeElementId
=
null
;
...
@@ -1061,7 +1060,6 @@
...
@@ -1061,7 +1060,6 @@
this
.
ImageLoader
.
put_Api
(
this
);
this
.
ImageLoader
.
put_Api
(
this
);
this
.
FontLoader
.
SetStandartFonts
();
this
.
FontLoader
.
SetStandartFonts
();
this
.
textArtTranslate
=
this
.
textArtTranslate
?
this
.
textArtTranslate
:
new
Asc
.
asc_TextArtTranslate
();
this
.
chartPreviewManager
=
new
AscCommon
.
ChartPreviewManager
();
this
.
chartPreviewManager
=
new
AscCommon
.
ChartPreviewManager
();
this
.
textArtPreviewManager
=
new
AscCommon
.
TextArtPreviewManager
();
this
.
textArtPreviewManager
=
new
AscCommon
.
TextArtPreviewManager
();
...
...
slide/Editor/Format/ShapePrototype.js
View file @
d2b5f8d9
...
@@ -227,10 +227,6 @@ CShape.prototype.getDrawingDocument = function()
...
@@ -227,10 +227,6 @@ CShape.prototype.getDrawingDocument = function()
return
editor
.
WordControl
.
m_oLogicDocument
.
DrawingDocument
;
return
editor
.
WordControl
.
m_oLogicDocument
.
DrawingDocument
;
};
};
CShape
.
prototype
.
getTextArtTranslate
=
function
()
{
return
editor
.
textArtTranslate
;
};
CShape
.
prototype
.
getTextArtPreviewManager
=
function
()
CShape
.
prototype
.
getTextArtPreviewManager
=
function
()
{
{
return
editor
.
textArtPreviewManager
;
return
editor
.
textArtPreviewManager
;
...
...
word/Editor/GraphicObjects/Format/ShapePrototype.js
View file @
d2b5f8d9
...
@@ -98,10 +98,6 @@ CShape.prototype.getDrawingDocument = function()
...
@@ -98,10 +98,6 @@ CShape.prototype.getDrawingDocument = function()
return
editor
.
WordControl
.
m_oLogicDocument
.
DrawingDocument
;
return
editor
.
WordControl
.
m_oLogicDocument
.
DrawingDocument
;
};
};
CShape
.
prototype
.
getTextArtTranslate
=
function
()
{
return
editor
.
textArtTranslate
;
};
CShape
.
prototype
.
getTextArtPreviewManager
=
function
()
CShape
.
prototype
.
getTextArtPreviewManager
=
function
()
{
{
return
editor
.
textArtPreviewManager
;
return
editor
.
textArtPreviewManager
;
...
...
word/api.js
View file @
d2b5f8d9
...
@@ -7204,7 +7204,7 @@ background-repeat: no-repeat;\
...
@@ -7204,7 +7204,7 @@ background-repeat: no-repeat;\
if
(
!
oLogicDocument
)
if
(
!
oLogicDocument
)
return
;
return
;
var
sDefaultText
=
this
.
textArtTranslate
?
this
.
textArtTranslate
.
DefaultText
:
"
Your text here
"
;
var
sDefaultText
=
AscCommon
.
translateManager
.
getValue
(
'
Your text here
'
)
;
if
(
AscCommonWord
.
sdttype_BlockLevel
===
nType
)
if
(
AscCommonWord
.
sdttype_BlockLevel
===
nType
)
{
{
if
(
false
===
oLogicDocument
.
Document_Is_SelectionLocked
(
AscCommon
.
changestype_Document_Content
))
if
(
false
===
oLogicDocument
.
Document_Is_SelectionLocked
(
AscCommon
.
changestype_Document_Content
))
...
...
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