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
7d6675b5
Commit
7d6675b5
authored
Apr 05, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
global clases -> Asc namespace
parent
eec1f684
Changes
27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
125 additions
and
125 deletions
+125
-125
apps/api/documents/cache-scripts.html
apps/api/documents/cache-scripts.html
+1
-1
apps/common/main/lib/controller/Comments.js
apps/common/main/lib/controller/Comments.js
+2
-2
apps/documenteditor/embed/js/ApplicationController.js
apps/documenteditor/embed/js/ApplicationController.js
+1
-1
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-1
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+2
-2
apps/documenteditor/main/app/view/ChartSettings.js
apps/documenteditor/main/app/view/ChartSettings.js
+2
-2
apps/documenteditor/main/app/view/DocumentHolder.js
apps/documenteditor/main/app/view/DocumentHolder.js
+10
-10
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
+1
-1
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
+1
-1
apps/documenteditor/main/app/view/ImageSettings.js
apps/documenteditor/main/app/view/ImageSettings.js
+2
-2
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
+20
-20
apps/documenteditor/main/app/view/MailMergeSettings.js
apps/documenteditor/main/app/view/MailMergeSettings.js
+1
-1
apps/documenteditor/main/app/view/ShapeSettings.js
apps/documenteditor/main/app/view/ShapeSettings.js
+2
-2
apps/documenteditor/main/app/view/TableSettings.js
apps/documenteditor/main/app/view/TableSettings.js
+11
-11
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
+30
-30
apps/documenteditor/mobile/app/controller/Main.js
apps/documenteditor/mobile/app/controller/Main.js
+1
-1
apps/presentationeditor/embed/js/ApplicationController.js
apps/presentationeditor/embed/js/ApplicationController.js
+1
-1
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-1
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+1
-1
apps/presentationeditor/main/app/view/ChartSettings.js
apps/presentationeditor/main/app/view/ChartSettings.js
+5
-5
apps/presentationeditor/main/app/view/DocumentHolder.js
apps/presentationeditor/main/app/view/DocumentHolder.js
+4
-4
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
...esentationeditor/main/app/view/HyperlinkSettingsDialog.js
+1
-1
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
...presentationeditor/main/app/view/ImageSettingsAdvanced.js
+1
-1
apps/presentationeditor/main/app/view/SlideSettings.js
apps/presentationeditor/main/app/view/SlideSettings.js
+6
-6
apps/presentationeditor/main/app/view/TableSettings.js
apps/presentationeditor/main/app/view/TableSettings.js
+9
-9
apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
...presentationeditor/main/app/view/TableSettingsAdvanced.js
+7
-7
apps/presentationeditor/mobile/app/controller/Main.js
apps/presentationeditor/mobile/app/controller/Main.js
+1
-1
No files found.
apps/api/documents/cache-scripts.html
View file @
7d6675b5
...
...
@@ -16,7 +16,7 @@
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/sdk-all.js"
></script>
<div
id=
"editor_sdk"
>
<script
type=
"text/javascript"
>
var
editor
=
new
asc_docs_api
(
"
editor_sdk
"
);
var
editor
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
editor
.
asc_SetFontsPath
(
"
../../../../sdkjs/fonts/
"
);
editor
.
LoadFontsFromServer
();
</script>
...
...
apps/common/main/lib/controller/Comments.js
View file @
7d6675b5
...
...
@@ -53,8 +53,8 @@ define([
// NOTE: временное решение
function
buildCommentData
()
{
if
(
typeof
asc_CCommentDataWord
!==
'
undefined
'
)
{
return
new
asc_CCommentDataWord
(
null
);
if
(
typeof
Asc
.
asc_CCommentDataWord
!==
'
undefined
'
)
{
return
new
Asc
.
asc_CCommentDataWord
(
null
);
}
return
new
asc_CCommentData
(
null
);
...
...
apps/documenteditor/embed/js/ApplicationController.js
View file @
7d6675b5
...
...
@@ -704,7 +704,7 @@ var ApplicationController = new(function(){
});
window
[
"
flat_desine
"
]
=
true
;
api
=
new
asc_docs_api
(
"
editor_sdk
"
);
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
if
(
api
){
api
.
CreateComponents
();
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
7d6675b5
...
...
@@ -111,7 +111,7 @@ define([
// Initialize api
this
.
api
=
new
asc_docs_api
(
"
editor_sdk
"
);
this
.
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
if
(
this
.
api
){
switch
(
value
)
{
...
...
apps/documenteditor/main/app/controller/Toolbar.js
View file @
7d6675b5
...
...
@@ -1260,7 +1260,7 @@ define([
handler
:
handlerDlg
});
props
=
new
CHyperlinkProperty
();
props
=
new
Asc
.
CHyperlinkProperty
();
props
.
put_Text
(
text
);
win
.
show
();
...
...
@@ -1625,7 +1625,7 @@ define([
this
.
_state
.
columns
=
undefined
;
if
(
this
.
api
&&
item
.
checked
)
{
var
props
=
new
CDocumentColumnsProps
(),
var
props
=
new
Asc
.
CDocumentColumnsProps
(),
cols
=
item
.
value
,
def_space
=
12.5
;
props
.
put_EqualWidth
(
cols
<
3
);
...
...
apps/documenteditor/main/app/view/ChartSettings.js
View file @
7d6675b5
...
...
@@ -371,13 +371,13 @@ define([
props
.
put_WrappingStyle
((
rawData
.
data
));
if
(
this
.
_state
.
WrappingStyle
===
Asc
.
c_oAscWrapStyle2
.
Inline
&&
rawData
.
data
!==
Asc
.
c_oAscWrapStyle2
.
Inline
)
{
props
.
put_PositionH
(
new
CImagePositionH
());
props
.
put_PositionH
(
new
Asc
.
CImagePositionH
());
props
.
get_PositionH
().
put_UseAlign
(
false
);
props
.
get_PositionH
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromH
.
Column
);
var
val
=
this
.
_originalProps
.
get_Value_X
(
Asc
.
c_oAscRelativeFromH
.
Column
);
props
.
get_PositionH
().
put_Value
(
val
);
props
.
put_PositionV
(
new
CImagePositionV
());
props
.
put_PositionV
(
new
Asc
.
CImagePositionV
());
props
.
get_PositionV
().
put_UseAlign
(
false
);
props
.
get_PositionV
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
val
=
this
.
_originalProps
.
get_Value_Y
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
...
...
apps/documenteditor/main/app/view/DocumentHolder.js
View file @
7d6675b5
...
...
@@ -571,7 +571,7 @@ define([
handler
:
handlerDlg
});
props
=
new
CHyperlinkProperty
();
props
=
new
Asc
.
CHyperlinkProperty
();
props
.
put_Text
(
text
);
win
.
show
();
...
...
@@ -1490,7 +1490,7 @@ define([
elType
=
selectedElements
[
i
].
get_ObjectType
();
elValue
=
selectedElements
[
i
].
get_ObjectValue
();
if
(
Asc
.
c_oAscTypeSelectElement
.
Table
==
elType
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_TableWrap
(
wrap
);
if
(
wrap
==
c_tableWrap
.
TABLE_WRAP_NONE
)
{
properties
.
put_TableAlignment
(
align
);
...
...
@@ -1699,12 +1699,12 @@ define([
if
(
me
.
api
)
{
var
properties
=
new
CImgProperty
();
if
(
!
_
.
isUndefined
(
item
.
options
.
halign
))
{
properties
.
put_PositionH
(
new
CImagePositionH
());
properties
.
put_PositionH
(
new
Asc
.
CImagePositionH
());
properties
.
get_PositionH
().
put_UseAlign
(
true
);
properties
.
get_PositionH
().
put_Align
(
item
.
options
.
halign
);
properties
.
get_PositionH
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromH
.
Margin
);
}
else
{
properties
.
put_PositionV
(
new
CImagePositionV
());
properties
.
put_PositionV
(
new
Asc
.
CImagePositionV
());
properties
.
get_PositionV
().
put_UseAlign
(
true
);
properties
.
get_PositionV
().
put_Align
(
item
.
options
.
valign
);
properties
.
get_PositionV
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromV
.
Margin
);
...
...
@@ -1839,13 +1839,13 @@ define([
properties
.
put_WrappingStyle
(
item
.
options
.
wrapType
);
if
(
me
.
menuImageWrap
.
_originalProps
.
get_WrappingStyle
()
===
Asc
.
c_oAscWrapStyle2
.
Inline
&&
item
.
wrapType
!==
Asc
.
c_oAscWrapStyle2
.
Inline
)
{
properties
.
put_PositionH
(
new
CImagePositionH
());
properties
.
put_PositionH
(
new
Asc
.
CImagePositionH
());
properties
.
get_PositionH
().
put_UseAlign
(
false
);
properties
.
get_PositionH
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromH
.
Column
);
var
val
=
me
.
menuImageWrap
.
_originalProps
.
get_Value_X
(
Asc
.
c_oAscRelativeFromH
.
Column
);
properties
.
get_PositionH
().
put_Value
(
val
);
properties
.
put_PositionV
(
new
CImagePositionV
());
properties
.
put_PositionV
(
new
Asc
.
CImagePositionV
());
properties
.
get_PositionV
().
put_UseAlign
(
false
);
properties
.
get_PositionV
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
val
=
me
.
menuImageWrap
.
_originalProps
.
get_Value_Y
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
...
...
@@ -2179,7 +2179,7 @@ define([
var
tableCellsVAlign
=
function
(
item
,
e
)
{
if
(
me
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellsVAlign
(
item
.
options
.
valign
);
me
.
api
.
tblApply
(
properties
);
}
...
...
@@ -2401,7 +2401,7 @@ define([
var
tableDirection
=
function
(
item
,
e
)
{
if
(
me
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellsTextDirection
(
item
.
options
.
direction
);
me
.
api
.
tblApply
(
properties
);
}
...
...
@@ -2505,7 +2505,7 @@ define([
if
(
text
!==
false
)
{
menuAddHyperlinkTable
.
hyperProps
=
{};
menuAddHyperlinkTable
.
hyperProps
.
value
=
new
CHyperlinkProperty
();
menuAddHyperlinkTable
.
hyperProps
.
value
=
new
Asc
.
CHyperlinkProperty
();
menuAddHyperlinkTable
.
hyperProps
.
value
.
put_Text
(
text
);
}
/** coauthoring begin **/
...
...
@@ -2958,7 +2958,7 @@ define([
menuEditHyperlinkPara
.
hyperProps
=
value
.
hyperProps
;
if
(
text
!==
false
)
{
menuAddHyperlinkPara
.
hyperProps
=
{};
menuAddHyperlinkPara
.
hyperProps
.
value
=
new
CHyperlinkProperty
();
menuAddHyperlinkPara
.
hyperProps
.
value
=
new
Asc
.
CHyperlinkProperty
();
menuAddHyperlinkPara
.
hyperProps
.
value
.
put_Text
(
text
);
}
var
disabled
=
value
.
paraProps
.
locked
||
(
value
.
headerProps
!==
undefined
&&
value
.
headerProps
.
locked
);
...
...
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file @
7d6675b5
...
...
@@ -824,7 +824,7 @@ define([
onBtnBordersClick
:
function
(
btn
,
eOpts
){
this
.
updateBordersStyle
(
btn
.
options
.
strId
,
true
);
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellBorders
(
this
.
CellBorders
);
properties
.
put_CellSelect
(
true
);
this
.
api
.
tblApply
(
properties
);
...
...
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file @
7d6675b5
...
...
@@ -160,7 +160,7 @@ define([
getSettings
:
function
()
{
var
me
=
this
,
props
=
new
CHyperlinkProperty
(),
props
=
new
Asc
.
CHyperlinkProperty
(),
url
=
$
.
trim
(
me
.
inputUrl
.
getValue
());
if
(
!
/
(((
^https
?)
|
(
^ftp
))
:
\/\/)
|
(
^mailto:
)
/i
.
test
(
url
)
)
...
...
apps/documenteditor/main/app/view/ImageSettings.js
View file @
7d6675b5
...
...
@@ -253,13 +253,13 @@ define([
var
props
=
new
CImgProperty
();
props
.
put_WrappingStyle
((
rawData
.
data
));
if
(
this
.
_state
.
WrappingStyle
===
Asc
.
c_oAscWrapStyle2
.
Inline
&&
rawData
.
data
!==
Asc
.
c_oAscWrapStyle2
.
Inline
)
{
props
.
put_PositionH
(
new
CImagePositionH
());
props
.
put_PositionH
(
new
Asc
.
CImagePositionH
());
props
.
get_PositionH
().
put_UseAlign
(
false
);
props
.
get_PositionH
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromH
.
Column
);
var
val
=
this
.
_originalProps
.
get_Value_X
(
Asc
.
c_oAscRelativeFromH
.
Column
);
props
.
get_PositionH
().
put_Value
(
val
);
props
.
put_PositionV
(
new
CImagePositionV
());
props
.
put_PositionV
(
new
Asc
.
CImagePositionV
());
props
.
get_PositionV
().
put_UseAlign
(
false
);
props
.
get_PositionV
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
val
=
this
.
_originalProps
.
get_Value_Y
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
...
...
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file @
7d6675b5
This diff is collapsed.
Click to expand it.
apps/documenteditor/main/app/view/MailMergeSettings.js
View file @
7d6675b5
...
...
@@ -659,7 +659,7 @@ define([
from
=
parseInt
(
this
.
txtFieldFrom
.
getValue
())
-
1
;
to
=
parseInt
(
this
.
txtFieldTo
.
getValue
())
-
1
;
}
var
mmdata
=
new
CMailMergeSendData
();
var
mmdata
=
new
Asc
.
CMailMergeSendData
();
mmdata
.
put_RecordFrom
(
from
);
mmdata
.
put_RecordTo
(
to
);
mmdata
.
put_From
(
this
.
mergeMailData
.
from
);
...
...
apps/documenteditor/main/app/view/ShapeSettings.js
View file @
7d6675b5
...
...
@@ -1112,13 +1112,13 @@ define([
props
.
put_WrappingStyle
((
rawData
.
data
));
if
(
this
.
_state
.
WrappingStyle
===
Asc
.
c_oAscWrapStyle2
.
Inline
&&
rawData
.
data
!==
Asc
.
c_oAscWrapStyle2
.
Inline
)
{
props
.
put_PositionH
(
new
CImagePositionH
());
props
.
put_PositionH
(
new
Asc
.
CImagePositionH
());
props
.
get_PositionH
().
put_UseAlign
(
false
);
props
.
get_PositionH
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromH
.
Column
);
var
val
=
this
.
_originalProps
.
get_Value_X
(
Asc
.
c_oAscRelativeFromH
.
Column
);
props
.
get_PositionH
().
put_Value
(
val
);
props
.
put_PositionV
(
new
CImagePositionV
());
props
.
put_PositionV
(
new
Asc
.
CImagePositionV
());
props
.
get_PositionV
().
put_UseAlign
(
false
);
props
.
get_PositionV
().
put_RelativeFrom
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
val
=
this
.
_originalProps
.
get_Value_Y
(
Asc
.
c_oAscRelativeFromV
.
Paragraph
);
...
...
apps/documenteditor/main/app/view/TableSettings.js
View file @
7d6675b5
...
...
@@ -89,7 +89,7 @@ define([
};
this
.
lockedControls
=
[];
this
.
_locked
=
false
;
this
.
_originalLook
=
new
CTablePropLook
();
this
.
_originalLook
=
new
Asc
.
CTablePropLook
();
var
fullwidth
=
218
;
this
.
_originalProps
=
null
;
...
...
@@ -353,8 +353,8 @@ define([
onCheckTemplateChange
:
function
(
type
,
field
,
newValue
,
oldValue
,
eOpts
)
{
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
look
=
(
this
.
_originalLook
)
?
this
.
_originalLook
:
new
CTablePropLook
();
var
properties
=
new
Asc
.
CTableProp
();
var
look
=
(
this
.
_originalLook
)
?
this
.
_originalLook
:
new
Asc
.
CTablePropLook
();
switch
(
type
)
{
case
0
:
look
.
put_FirstRow
(
field
.
getValue
()
==
'
checked
'
);
...
...
@@ -383,7 +383,7 @@ define([
onTableTemplateSelect
:
function
(
combo
,
record
){
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_TableStyle
(
record
.
get
(
'
templateId
'
));
this
.
api
.
tblApply
(
properties
);
}
...
...
@@ -392,7 +392,7 @@ define([
onBtnWrapClick
:
function
(
btn
,
e
)
{
if
(
this
.
api
&&
btn
.
pressed
&&
!
this
.
_noApply
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_TableWrap
(
btn
.
options
.
posId
);
if
(
btn
.
options
.
posId
==
c_tableWrap
.
TABLE_WRAP_NONE
)
{
if
(
this
.
_state
.
TableAlignment
<
0
)
...
...
@@ -410,7 +410,7 @@ define([
onCheckRepeatRowChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
)
{
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_RowsInHeader
((
field
.
getValue
()
==
'
checked
'
)
?
1
:
0
);
this
.
api
.
tblApply
(
properties
);
}
...
...
@@ -422,8 +422,8 @@ define([
this
.
CellColor
=
{
Value
:
1
,
Color
:
color
};
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
background
=
new
CBackground
();
var
properties
=
new
Asc
.
CTableProp
();
var
background
=
new
Asc
.
CBackground
();
properties
.
put_CellsBackground
(
background
);
if
(
this
.
CellColor
.
Color
==
'
transparent
'
)
{
...
...
@@ -451,7 +451,7 @@ define([
onBtnBordersClick
:
function
(
btn
,
eOpts
){
this
.
_UpdateBordersStyle
(
btn
.
options
.
strId
,
true
);
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellBorders
(
this
.
CellBorders
);
properties
.
put_CellSelect
(
true
);
this
.
api
.
tblApply
(
properties
);
...
...
@@ -522,7 +522,7 @@ define([
if
(
props
)
{
this
.
_originalProps
=
new
CTableProp
(
props
);
this
.
_originalProps
=
new
Asc
.
CTableProp
(
props
);
this
.
_originalProps
.
put_CellSelect
(
true
);
this
.
_TblWrapStyleChanged
(
props
.
get_TableWrap
());
...
...
@@ -655,7 +655,7 @@ define([
},
_UpdateBordersStyle
:
function
(
border
)
{
this
.
CellBorders
=
new
CBorders
();
this
.
CellBorders
=
new
Asc
.
CBorders
();
var
updateBorders
=
this
.
CellBorders
;
var
visible
=
(
border
!=
''
);
...
...
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file @
7d6675b5
This diff is collapsed.
Click to expand it.
apps/documenteditor/mobile/app/controller/Main.js
View file @
7d6675b5
...
...
@@ -58,7 +58,7 @@ Ext.define('DE.controller.Main', {
var
api
=
this
.
api
,
app
=
this
.
getApplication
();
api
=
new
asc_docs_api
(
"
id-sdkeditor
"
);
api
=
new
Asc
.
asc_docs_api
(
"
id-sdkeditor
"
);
api
.
SetMobileVersion
(
true
);
api
.
CreateComponents
();
api
.
asc_SetFontsPath
(
"
../../../../sdkjs/fonts/
"
);
...
...
apps/presentationeditor/embed/js/ApplicationController.js
View file @
7d6675b5
...
...
@@ -712,7 +712,7 @@ var ApplicationController = new(function(){
},
2000
);
});
api
=
new
asc_docs_api
(
"
editor_sdk
"
);
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
if
(
api
){
api
.
CreateComponents
();
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
7d6675b5
...
...
@@ -105,7 +105,7 @@ define([
// Initialize api
this
.
api
=
new
asc_docs_api
(
"
editor_sdk
"
);
this
.
api
=
new
Asc
.
asc_docs_api
(
"
editor_sdk
"
);
if
(
this
.
api
){
window
[
"
flat_desine
"
]
=
true
;
...
...
apps/presentationeditor/main/app/controller/Toolbar.js
View file @
7d6675b5
...
...
@@ -1187,7 +1187,7 @@ define([
slides
:
_arr
});
props
=
new
CHyperlinkProperty
();
props
=
new
Asc
.
CHyperlinkProperty
();
props
.
put_Text
(
text
);
win
.
show
();
...
...
apps/presentationeditor/main/app/view/ChartSettings.js
View file @
7d6675b5
...
...
@@ -249,7 +249,7 @@ define([
this
.
disableControls
(
this
.
_locked
);
if
(
props
){
this
.
_originalProps
=
new
CAscChartProp
(
props
);
this
.
_originalProps
=
new
Asc
.
CAscChartProp
(
props
);
this
.
_noApply
=
true
;
var
value
=
props
.
get_SeveralCharts
()
||
this
.
_locked
;
...
...
@@ -363,7 +363,7 @@ define([
this
.
_state
.
ChartType
=
-
1
;
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscChartProp
();
var
props
=
new
Asc
.
CAscChartProp
();
props
.
changeType
(
rawData
.
type
);
this
.
api
.
ChartApply
(
props
);
}
...
...
@@ -392,7 +392,7 @@ define([
btnIconEl
.
css
(
'
background-image
'
,
style
);
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscChartProp
();
var
props
=
new
Asc
.
CAscChartProp
();
props
.
putStyle
(
rawData
.
data
);
this
.
api
.
ChartApply
(
props
);
}
...
...
@@ -450,7 +450,7 @@ define([
this
.
spnHeight
.
setValue
(
h
,
true
);
}
if
(
this
.
api
)
{
var
props
=
new
CAscChartProp
();
var
props
=
new
Asc
.
CAscChartProp
();
props
.
put_Width
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
w
));
props
.
put_Height
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
h
));
this
.
api
.
ChartApply
(
props
);
...
...
@@ -471,7 +471,7 @@ define([
this
.
spnWidth
.
setValue
(
w
,
true
);
}
if
(
this
.
api
)
{
var
props
=
new
CAscChartProp
();
var
props
=
new
Asc
.
CAscChartProp
();
props
.
put_Width
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
w
));
props
.
put_Height
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
h
));
this
.
api
.
ChartApply
(
props
);
...
...
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @
7d6675b5
...
...
@@ -552,7 +552,7 @@ define([
slides
:
_arr
});
props
=
new
CHyperlinkProperty
();
props
=
new
Asc
.
CHyperlinkProperty
();
props
.
put_Text
(
text
);
win
.
show
();
...
...
@@ -1105,7 +1105,7 @@ define([
menu
:
(
function
(){
function
onItemClick
(
item
,
e
)
{
if
(
me
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellsVAlign
(
item
.
value
);
me
.
api
.
tblApply
(
properties
);
}
...
...
@@ -1718,7 +1718,7 @@ define([
if
(
text
!==
false
)
{
menuAddHyperlinkPara
.
hyperProps
=
{};
menuAddHyperlinkPara
.
hyperProps
.
value
=
new
CHyperlinkProperty
();
menuAddHyperlinkPara
.
hyperProps
.
value
=
new
Asc
.
CHyperlinkProperty
();
menuAddHyperlinkPara
.
hyperProps
.
value
.
put_Text
(
text
);
}
...
...
@@ -1802,7 +1802,7 @@ define([
if
(
text
!==
false
)
{
menuAddHyperlinkTable
.
hyperProps
=
{};
menuAddHyperlinkTable
.
hyperProps
.
value
=
new
CHyperlinkProperty
();
menuAddHyperlinkTable
.
hyperProps
.
value
=
new
Asc
.
CHyperlinkProperty
();
menuAddHyperlinkTable
.
hyperProps
.
value
.
put_Text
(
text
);
}
if
(
!
_
.
isUndefined
(
value
.
paraProps
))
{
...
...
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
View file @
7d6675b5
...
...
@@ -237,7 +237,7 @@ define([
getSettings
:
function
()
{
var
me
=
this
,
props
=
new
CHyperlinkProperty
();
props
=
new
Asc
.
CHyperlinkProperty
();
var
def_display
=
''
;
if
(
me
.
cmbLinkType
.
getValue
()
==
c_oHyperlinkType
.
InternalLink
)
{
var
url
=
"
ppaction://hlink
"
;
...
...
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file @
7d6675b5
...
...
@@ -219,7 +219,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
if
(
this
.
spnWidth
.
getValue
()
!==
''
)
properties
.
put_Width
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
spnWidth
.
getNumberValue
()));
var
Position
=
new
CPosition
();
var
Position
=
new
Asc
.
CPosition
();
if
(
this
.
spnX
.
getValue
()
!==
''
)
Position
.
put_X
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
spnX
.
getNumberValue
()));
if
(
this
.
spnY
.
getValue
()
!==
''
)
...
...
apps/presentationeditor/main/app/view/SlideSettings.js
View file @
7d6675b5
...
...
@@ -1058,7 +1058,7 @@ define([
this
.
Effect
=
type
;
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_TransitionType
(
type
);
timing
.
put_TransitionOption
(
this
.
EffectType
);
props
.
put_timing
(
timing
);
...
...
@@ -1071,7 +1071,7 @@ define([
this
.
EffectType
=
record
.
value
;
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_TransitionType
(
this
.
Effect
);
timing
.
put_TransitionOption
(
this
.
EffectType
);
props
.
put_timing
(
timing
);
...
...
@@ -1083,7 +1083,7 @@ define([
onDurationChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_TransitionDuration
(
field
.
getNumberValue
()
*
1000
);
props
.
put_timing
(
timing
);
this
.
api
.
SetSlideProps
(
props
);
...
...
@@ -1094,7 +1094,7 @@ define([
onDelayChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_SlideAdvanceDuration
(
field
.
getNumberValue
()
*
1000
);
props
.
put_timing
(
timing
);
this
.
api
.
SetSlideProps
(
props
);
...
...
@@ -1105,7 +1105,7 @@ define([
onStartOnClickChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_SlideAdvanceOnMouseClick
(
field
.
getValue
()
==
'
checked
'
);
props
.
put_timing
(
timing
);
this
.
api
.
SetSlideProps
(
props
);
...
...
@@ -1117,7 +1117,7 @@ define([
this
.
numDelay
.
setDisabled
(
field
.
getValue
()
!==
'
checked
'
);
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
props
=
new
CAscSlideProps
();
var
timing
=
new
CAscSlideTiming
();
var
timing
=
new
Asc
.
Asc
.
CAscSlideProps
();
timing
.
put_SlideAdvanceAfter
(
field
.
getValue
()
==
'
checked
'
);
props
.
put_timing
(
timing
);
this
.
api
.
SetSlideProps
(
props
);
...
...
apps/presentationeditor/main/app/view/TableSettings.js
View file @
7d6675b5
...
...
@@ -84,7 +84,7 @@ define([
};
this
.
lockedControls
=
[];
this
.
_locked
=
false
;
this
.
_originalLook
=
new
CTablePropLook
();
this
.
_originalLook
=
new
Asc
.
CTablePropLook
();
this
.
_originalProps
=
null
;
this
.
CellBorders
=
{};
...
...
@@ -313,8 +313,8 @@ define([
onCheckTemplateChange
:
function
(
type
,
field
,
newValue
,
oldValue
,
eOpts
)
{
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
look
=
(
this
.
_originalLook
)
?
this
.
_originalLook
:
new
CTablePropLook
();
var
properties
=
new
Asc
.
CTableProp
();
var
look
=
(
this
.
_originalLook
)
?
this
.
_originalLook
:
new
Asc
.
CTablePropLook
();
switch
(
type
)
{
case
0
:
look
.
put_FirstRow
(
field
.
getValue
()
==
'
checked
'
);
...
...
@@ -343,7 +343,7 @@ define([
onTableTemplateSelect
:
function
(
combo
,
record
){
if
(
this
.
api
&&
!
this
.
_noApply
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_TableStyle
(
record
.
get
(
'
templateId
'
));
this
.
api
.
tblApply
(
properties
);
}
...
...
@@ -355,8 +355,8 @@ define([
this
.
CellColor
=
{
Value
:
1
,
Color
:
color
};
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
background
=
new
CBackground
();
var
properties
=
new
Asc
.
CTableProp
();
var
background
=
new
Asc
.
CBackground
();
properties
.
put_CellsBackground
(
background
);
if
(
this
.
CellColor
.
Color
==
'
transparent
'
)
{
...
...
@@ -383,7 +383,7 @@ define([
onBtnBordersClick
:
function
(
btn
,
eOpts
){
this
.
_UpdateBordersStyle
(
btn
.
options
.
strId
,
true
);
if
(
this
.
api
)
{
var
properties
=
new
CTableProp
();
var
properties
=
new
Asc
.
CTableProp
();
properties
.
put_CellBorders
(
this
.
CellBorders
);
properties
.
put_CellSelect
(
true
);
this
.
api
.
tblApply
(
properties
);
...
...
@@ -452,7 +452,7 @@ define([
if
(
props
)
{
this
.
_originalProps
=
new
CTableProp
(
props
);
this
.
_originalProps
=
new
Asc
.
CTableProp
(
props
);
this
.
_originalProps
.
put_CellSelect
(
true
);
//for table-template
...
...
@@ -564,7 +564,7 @@ define([
},
_UpdateBordersStyle
:
function
(
border
)
{
this
.
CellBorders
=
new
CBorders
();
this
.
CellBorders
=
new
Asc
.
CBorders
();
var
updateBorders
=
this
.
CellBorders
;
var
visible
=
(
border
!=
''
);
...
...
apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
View file @
7d6675b5
...
...
@@ -89,7 +89,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
};
this
.
_initialMarginsDefault
=
false
;
// если для всех выделенных ячеек пришло одинаковое значение Flag=0 (Use Default Margins)
this
.
_originalProps
=
new
CTableProp
(
this
.
options
.
tableProps
);
this
.
_originalProps
=
new
Asc
.
CTableProp
(
this
.
options
.
tableProps
);
},
render
:
function
()
{
...
...
@@ -208,7 +208,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this
.
CellMargins
.
Flag
=
field
.
getValue
();
if
(
this
.
_changedProps
)
{
if
(
this
.
_changedProps
.
get_CellMargins
()
===
undefined
)
this
.
_changedProps
.
put_CellMargins
(
new
CMargins
());
this
.
_changedProps
.
put_CellMargins
(
new
Asc
.
CMargins
());
this
.
_changedProps
.
get_CellMargins
().
put_Left
(
(
this
.
CellMargins
.
Left
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Left
)
:
null
);
this
.
_changedProps
.
get_CellMargins
().
put_Top
((
this
.
CellMargins
.
Top
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Top
)
:
null
);
this
.
_changedProps
.
get_CellMargins
().
put_Bottom
((
this
.
CellMargins
.
Bottom
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Bottom
)
:
null
);
...
...
@@ -230,7 +230,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this
.
_marginsChange
(
field
,
newValue
,
oldValue
,
eOpts
,
'
cell
'
,
'
Top
'
);
if
(
this
.
_changedProps
)
{
if
(
this
.
_changedProps
.
get_CellMargins
()
===
undefined
)
this
.
_changedProps
.
put_CellMargins
(
new
CMargins
());
this
.
_changedProps
.
put_CellMargins
(
new
Asc
.
CMargins
());
this
.
_changedProps
.
get_CellMargins
().
put_Top
((
this
.
CellMargins
.
Top
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Top
)
:
null
);
setCellFlag
();
}
...
...
@@ -250,7 +250,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this
.
_marginsChange
(
field
,
newValue
,
oldValue
,
eOpts
,
'
cell
'
,
'
Bottom
'
);
if
(
this
.
_changedProps
)
{
if
(
this
.
_changedProps
.
get_CellMargins
()
===
undefined
)
this
.
_changedProps
.
put_CellMargins
(
new
CMargins
());
this
.
_changedProps
.
put_CellMargins
(
new
Asc
.
CMargins
());
this
.
_changedProps
.
get_CellMargins
().
put_Bottom
((
this
.
CellMargins
.
Bottom
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Bottom
)
:
null
);
setCellFlag
();
}
...
...
@@ -270,7 +270,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this
.
_marginsChange
(
field
,
newValue
,
oldValue
,
eOpts
,
'
cell
'
,
'
Left
'
);
if
(
this
.
_changedProps
)
{
if
(
this
.
_changedProps
.
get_CellMargins
()
===
undefined
)
this
.
_changedProps
.
put_CellMargins
(
new
CMargins
());
this
.
_changedProps
.
put_CellMargins
(
new
Asc
.
CMargins
());
this
.
_changedProps
.
get_CellMargins
().
put_Left
((
this
.
CellMargins
.
Left
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Left
)
:
null
);
setCellFlag
();
}
...
...
@@ -290,7 +290,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this
.
_marginsChange
(
field
,
newValue
,
oldValue
,
eOpts
,
'
cell
'
,
'
Right
'
);
if
(
this
.
_changedProps
)
{
if
(
this
.
_changedProps
.
get_CellMargins
()
===
undefined
)
this
.
_changedProps
.
put_CellMargins
(
new
CMargins
());
this
.
_changedProps
.
put_CellMargins
(
new
Asc
.
CMargins
());
this
.
_changedProps
.
get_CellMargins
().
put_Right
((
this
.
CellMargins
.
Right
!==
null
)
?
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
CellMargins
.
Right
)
:
null
);
setCellFlag
();
}
...
...
@@ -348,7 +348,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
}
this
.
fillMargins
(
this
.
CellMargins
.
Flag
);
this
.
_changedProps
=
new
CTableProp
();
this
.
_changedProps
=
new
Asc
.
CTableProp
();
}
},
...
...
apps/presentationeditor/mobile/app/controller/Main.js
View file @
7d6675b5
...
...
@@ -60,7 +60,7 @@ Ext.define('PE.controller.Main', {
app
=
this
.
getApplication
(),
profile
=
app
.
getCurrentProfile
();
api
=
new
asc_docs_api
(
"
id-sdkeditor
"
);
api
=
new
Asc
.
asc_docs_api
(
"
id-sdkeditor
"
);
api
.
SetMobileVersion
(
true
);
api
.
CreateComponents
();
api
.
asc_SetFontsPath
(
"
../../../../sdkjs/fonts/
"
);
...
...
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