Commit 9741c7eb authored by Alexander.Trofimov's avatar Alexander.Trofimov

global clases -> Asc namespace

parent be526792
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
<div id="editor_sdk"> <div id="editor_sdk">
<script type="text/javascript"> <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.asc_SetFontsPath("../../../../sdkjs/fonts/");
editor.LoadFontsFromServer(); editor.LoadFontsFromServer();
</script> </script>
......
...@@ -45,8 +45,8 @@ define([ ...@@ -45,8 +45,8 @@ define([
// NOTE: временное решение // NOTE: временное решение
function buildCommentData () { function buildCommentData () {
if (typeof asc_CCommentDataWord !== 'undefined') { if (typeof Asc.asc_CCommentDataWord !== 'undefined') {
return new asc_CCommentDataWord(null); return new Asc.asc_CCommentDataWord(null);
} }
return new asc_CCommentData(null); return new asc_CCommentData(null);
......
...@@ -696,7 +696,7 @@ var ApplicationController = new(function(){ ...@@ -696,7 +696,7 @@ var ApplicationController = new(function(){
}); });
window["flat_desine"] = true; window["flat_desine"] = true;
api = new asc_docs_api("editor_sdk"); api = new Asc.asc_docs_api("editor_sdk");
if (api){ if (api){
api.CreateComponents(); api.CreateComponents();
......
...@@ -103,7 +103,7 @@ define([ ...@@ -103,7 +103,7 @@ define([
// Initialize api // Initialize api
this.api = new asc_docs_api("editor_sdk"); this.api = new Asc.asc_docs_api("editor_sdk");
if (this.api){ if (this.api){
switch (value) { switch (value) {
......
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2016 * (c) Copyright Ascensio System Limited 2010-2016
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights. * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
* *
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
* *
* You can contact Ascensio System SIA by email at sales@onlyoffice.com * You can contact Ascensio System SIA by email at sales@onlyoffice.com
* *
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3. * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
* *
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic * relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute. * in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks. * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
* *
*/ */
/** /**
* Toolbar.js * Toolbar.js
* *
...@@ -1252,7 +1252,7 @@ define([ ...@@ -1252,7 +1252,7 @@ define([
handler: handlerDlg handler: handlerDlg
}); });
props = new CHyperlinkProperty(); props = new Asc.CHyperlinkProperty();
props.put_Text(text); props.put_Text(text);
win.show(); win.show();
...@@ -1617,7 +1617,7 @@ define([ ...@@ -1617,7 +1617,7 @@ define([
this._state.columns = undefined; this._state.columns = undefined;
if (this.api && item.checked) { if (this.api && item.checked) {
var props = new CDocumentColumnsProps(), var props = new Asc.CDocumentColumnsProps(),
cols = item.value, cols = item.value,
def_space = 12.5; def_space = 12.5;
props.put_EqualWidth(cols<3); props.put_EqualWidth(cols<3);
......
...@@ -363,13 +363,13 @@ define([ ...@@ -363,13 +363,13 @@ define([
props.put_WrappingStyle((rawData.data)); props.put_WrappingStyle((rawData.data));
if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { 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_UseAlign(false);
props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column);
var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column);
props.get_PositionH().put_Value(val); 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_UseAlign(false);
props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph);
val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph);
......
...@@ -563,7 +563,7 @@ define([ ...@@ -563,7 +563,7 @@ define([
handler: handlerDlg handler: handlerDlg
}); });
props = new CHyperlinkProperty(); props = new Asc.CHyperlinkProperty();
props.put_Text(text); props.put_Text(text);
win.show(); win.show();
...@@ -1482,7 +1482,7 @@ define([ ...@@ -1482,7 +1482,7 @@ define([
elType = selectedElements[i].get_ObjectType(); elType = selectedElements[i].get_ObjectType();
elValue = selectedElements[i].get_ObjectValue(); elValue = selectedElements[i].get_ObjectValue();
if (Asc.c_oAscTypeSelectElement.Table == elType) { if (Asc.c_oAscTypeSelectElement.Table == elType) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableWrap(wrap); properties.put_TableWrap(wrap);
if (wrap == c_tableWrap.TABLE_WRAP_NONE) { if (wrap == c_tableWrap.TABLE_WRAP_NONE) {
properties.put_TableAlignment(align); properties.put_TableAlignment(align);
...@@ -1691,12 +1691,12 @@ define([ ...@@ -1691,12 +1691,12 @@ define([
if (me.api) { if (me.api) {
var properties = new CImgProperty(); var properties = new CImgProperty();
if (!_.isUndefined(item.options.halign)) { 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_UseAlign(true);
properties.get_PositionH().put_Align(item.options.halign); properties.get_PositionH().put_Align(item.options.halign);
properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Margin); properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Margin);
} else { } else {
properties.put_PositionV(new CImagePositionV()); properties.put_PositionV(new Asc.CImagePositionV());
properties.get_PositionV().put_UseAlign(true); properties.get_PositionV().put_UseAlign(true);
properties.get_PositionV().put_Align(item.options.valign); properties.get_PositionV().put_Align(item.options.valign);
properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Margin); properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Margin);
...@@ -1831,13 +1831,13 @@ define([ ...@@ -1831,13 +1831,13 @@ define([
properties.put_WrappingStyle(item.options.wrapType); properties.put_WrappingStyle(item.options.wrapType);
if (me.menuImageWrap._originalProps.get_WrappingStyle() === Asc.c_oAscWrapStyle2.Inline && item.wrapType !== Asc.c_oAscWrapStyle2.Inline ) { 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_UseAlign(false);
properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column);
var val = me.menuImageWrap._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); var val = me.menuImageWrap._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column);
properties.get_PositionH().put_Value(val); 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_UseAlign(false);
properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph);
val = me.menuImageWrap._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); val = me.menuImageWrap._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph);
...@@ -2171,7 +2171,7 @@ define([ ...@@ -2171,7 +2171,7 @@ define([
var tableCellsVAlign = function(item, e) { var tableCellsVAlign = function(item, e) {
if (me.api) { if (me.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellsVAlign(item.options.valign); properties.put_CellsVAlign(item.options.valign);
me.api.tblApply(properties); me.api.tblApply(properties);
} }
...@@ -2393,7 +2393,7 @@ define([ ...@@ -2393,7 +2393,7 @@ define([
var tableDirection = function(item, e) { var tableDirection = function(item, e) {
if (me.api) { if (me.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellsTextDirection(item.options.direction); properties.put_CellsTextDirection(item.options.direction);
me.api.tblApply(properties); me.api.tblApply(properties);
} }
...@@ -2497,7 +2497,7 @@ define([ ...@@ -2497,7 +2497,7 @@ define([
if (text!==false) { if (text!==false) {
menuAddHyperlinkTable.hyperProps = {}; menuAddHyperlinkTable.hyperProps = {};
menuAddHyperlinkTable.hyperProps.value = new CHyperlinkProperty(); menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty();
menuAddHyperlinkTable.hyperProps.value.put_Text(text); menuAddHyperlinkTable.hyperProps.value.put_Text(text);
} }
/** coauthoring begin **/ /** coauthoring begin **/
...@@ -2950,7 +2950,7 @@ define([ ...@@ -2950,7 +2950,7 @@ define([
menuEditHyperlinkPara.hyperProps = value.hyperProps; menuEditHyperlinkPara.hyperProps = value.hyperProps;
if (text!==false) { if (text!==false) {
menuAddHyperlinkPara.hyperProps = {}; menuAddHyperlinkPara.hyperProps = {};
menuAddHyperlinkPara.hyperProps.value = new CHyperlinkProperty(); menuAddHyperlinkPara.hyperProps.value = new Asc.CHyperlinkProperty();
menuAddHyperlinkPara.hyperProps.value.put_Text(text); menuAddHyperlinkPara.hyperProps.value.put_Text(text);
} }
var disabled = value.paraProps.locked || (value.headerProps!==undefined && value.headerProps.locked); var disabled = value.paraProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
......
...@@ -816,7 +816,7 @@ define([ ...@@ -816,7 +816,7 @@ define([
onBtnBordersClick: function(btn, eOpts){ onBtnBordersClick: function(btn, eOpts){
this.updateBordersStyle(btn.options.strId, true); this.updateBordersStyle(btn.options.strId, true);
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellBorders(this.CellBorders); properties.put_CellBorders(this.CellBorders);
properties.put_CellSelect(true); properties.put_CellSelect(true);
this.api.tblApply(properties); this.api.tblApply(properties);
......
...@@ -152,7 +152,7 @@ define([ ...@@ -152,7 +152,7 @@ define([
getSettings: function () { getSettings: function () {
var me = this, var me = this,
props = new CHyperlinkProperty(), props = new Asc.CHyperlinkProperty(),
url = $.trim(me.inputUrl.getValue()); url = $.trim(me.inputUrl.getValue());
if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
......
...@@ -245,13 +245,13 @@ define([ ...@@ -245,13 +245,13 @@ define([
var props = new CImgProperty(); var props = new CImgProperty();
props.put_WrappingStyle((rawData.data)); props.put_WrappingStyle((rawData.data));
if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { 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_UseAlign(false);
props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column);
var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column);
props.get_PositionH().put_Value(val); 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_UseAlign(false);
props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph);
val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph);
......
...@@ -651,7 +651,7 @@ define([ ...@@ -651,7 +651,7 @@ define([
from = parseInt(this.txtFieldFrom.getValue())-1; from = parseInt(this.txtFieldFrom.getValue())-1;
to = parseInt(this.txtFieldTo.getValue())-1; to = parseInt(this.txtFieldTo.getValue())-1;
} }
var mmdata = new CMailMergeSendData(); var mmdata = new Asc.CMailMergeSendData();
mmdata.put_RecordFrom(from); mmdata.put_RecordFrom(from);
mmdata.put_RecordTo(to); mmdata.put_RecordTo(to);
mmdata.put_From(this.mergeMailData.from); mmdata.put_From(this.mergeMailData.from);
......
...@@ -1104,13 +1104,13 @@ define([ ...@@ -1104,13 +1104,13 @@ define([
props.put_WrappingStyle((rawData.data)); props.put_WrappingStyle((rawData.data));
if (this._state.WrappingStyle===Asc.c_oAscWrapStyle2.Inline && rawData.data!==Asc.c_oAscWrapStyle2.Inline ) { 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_UseAlign(false);
props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); props.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column);
var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column); var val = this._originalProps.get_Value_X(Asc.c_oAscRelativeFromH.Column);
props.get_PositionH().put_Value(val); 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_UseAlign(false);
props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); props.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph);
val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph); val = this._originalProps.get_Value_Y(Asc.c_oAscRelativeFromV.Paragraph);
......
...@@ -81,7 +81,7 @@ define([ ...@@ -81,7 +81,7 @@ define([
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
this._originalLook = new CTablePropLook(); this._originalLook = new Asc.CTablePropLook();
var fullwidth = 218; var fullwidth = 218;
this._originalProps = null; this._originalProps = null;
...@@ -345,8 +345,8 @@ define([ ...@@ -345,8 +345,8 @@ define([
onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) {
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
var look = (this._originalLook) ? this._originalLook : new CTablePropLook(); var look = (this._originalLook) ? this._originalLook : new Asc.CTablePropLook();
switch (type) { switch (type) {
case 0: case 0:
look.put_FirstRow(field.getValue()=='checked'); look.put_FirstRow(field.getValue()=='checked');
...@@ -375,7 +375,7 @@ define([ ...@@ -375,7 +375,7 @@ define([
onTableTemplateSelect: function(combo, record){ onTableTemplateSelect: function(combo, record){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableStyle(record.get('templateId')); properties.put_TableStyle(record.get('templateId'));
this.api.tblApply(properties); this.api.tblApply(properties);
} }
...@@ -384,7 +384,7 @@ define([ ...@@ -384,7 +384,7 @@ define([
onBtnWrapClick: function(btn, e) { onBtnWrapClick: function(btn, e) {
if (this.api && btn.pressed && !this._noApply) { if (this.api && btn.pressed && !this._noApply) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableWrap(btn.options.posId); properties.put_TableWrap(btn.options.posId);
if (btn.options.posId == c_tableWrap.TABLE_WRAP_NONE) { if (btn.options.posId == c_tableWrap.TABLE_WRAP_NONE) {
if (this._state.TableAlignment<0) if (this._state.TableAlignment<0)
...@@ -402,7 +402,7 @@ define([ ...@@ -402,7 +402,7 @@ define([
onCheckRepeatRowChange: function(field, newValue, oldValue, eOpts) { onCheckRepeatRowChange: function(field, newValue, oldValue, eOpts) {
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_RowsInHeader((field.getValue()=='checked') ? 1 : 0 ); properties.put_RowsInHeader((field.getValue()=='checked') ? 1 : 0 );
this.api.tblApply(properties); this.api.tblApply(properties);
} }
...@@ -414,8 +414,8 @@ define([ ...@@ -414,8 +414,8 @@ define([
this.CellColor = {Value: 1, Color: color}; this.CellColor = {Value: 1, Color: color};
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
var background = new CBackground(); var background = new Asc.CBackground();
properties.put_CellsBackground(background); properties.put_CellsBackground(background);
if (this.CellColor.Color=='transparent') { if (this.CellColor.Color=='transparent') {
...@@ -443,7 +443,7 @@ define([ ...@@ -443,7 +443,7 @@ define([
onBtnBordersClick: function(btn, eOpts){ onBtnBordersClick: function(btn, eOpts){
this._UpdateBordersStyle(btn.options.strId, true); this._UpdateBordersStyle(btn.options.strId, true);
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellBorders(this.CellBorders); properties.put_CellBorders(this.CellBorders);
properties.put_CellSelect(true); properties.put_CellSelect(true);
this.api.tblApply(properties); this.api.tblApply(properties);
...@@ -514,7 +514,7 @@ define([ ...@@ -514,7 +514,7 @@ define([
if (props ) if (props )
{ {
this._originalProps = new CTableProp(props); this._originalProps = new Asc.CTableProp(props);
this._originalProps.put_CellSelect(true); this._originalProps.put_CellSelect(true);
this._TblWrapStyleChanged(props.get_TableWrap()); this._TblWrapStyleChanged(props.get_TableWrap());
...@@ -647,7 +647,7 @@ define([ ...@@ -647,7 +647,7 @@ define([
}, },
_UpdateBordersStyle: function(border) { _UpdateBordersStyle: function(border) {
this.CellBorders = new CBorders(); this.CellBorders = new Asc.CBorders();
var updateBorders = this.CellBorders; var updateBorders = this.CellBorders;
var visible = (border != ''); var visible = (border != '');
......
...@@ -50,7 +50,7 @@ Ext.define('DE.controller.Main', { ...@@ -50,7 +50,7 @@ Ext.define('DE.controller.Main', {
var api = this.api, var api = this.api,
app = this.getApplication(); app = this.getApplication();
api = new asc_docs_api("id-sdkeditor"); api = new Asc.asc_docs_api("id-sdkeditor");
api.SetMobileVersion(true); api.SetMobileVersion(true);
api.CreateComponents(); api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/"); api.asc_SetFontsPath("../../../../sdkjs/fonts/");
......
...@@ -704,7 +704,7 @@ var ApplicationController = new(function(){ ...@@ -704,7 +704,7 @@ var ApplicationController = new(function(){
}, 2000); }, 2000);
}); });
api = new asc_docs_api("editor_sdk"); api = new Asc.asc_docs_api("editor_sdk");
if (api){ if (api){
api.CreateComponents(); api.CreateComponents();
......
...@@ -97,7 +97,7 @@ define([ ...@@ -97,7 +97,7 @@ define([
// Initialize api // Initialize api
this.api = new asc_docs_api("editor_sdk"); this.api = new Asc.asc_docs_api("editor_sdk");
if (this.api){ if (this.api){
window["flat_desine"] = true; window["flat_desine"] = true;
......
...@@ -1179,7 +1179,7 @@ define([ ...@@ -1179,7 +1179,7 @@ define([
slides: _arr slides: _arr
}); });
props = new CHyperlinkProperty(); props = new Asc.CHyperlinkProperty();
props.put_Text(text); props.put_Text(text);
win.show(); win.show();
......
...@@ -241,7 +241,7 @@ define([ ...@@ -241,7 +241,7 @@ define([
this.disableControls(this._locked); this.disableControls(this._locked);
if (props){ if (props){
this._originalProps = new CAscChartProp(props); this._originalProps = new Asc.CAscChartProp(props);
this._noApply = true; this._noApply = true;
var value = props.get_SeveralCharts() || this._locked; var value = props.get_SeveralCharts() || this._locked;
...@@ -355,7 +355,7 @@ define([ ...@@ -355,7 +355,7 @@ define([
this._state.ChartType = -1; this._state.ChartType = -1;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscChartProp(); var props = new Asc.CAscChartProp();
props.changeType(rawData.type); props.changeType(rawData.type);
this.api.ChartApply(props); this.api.ChartApply(props);
} }
...@@ -384,7 +384,7 @@ define([ ...@@ -384,7 +384,7 @@ define([
btnIconEl.css('background-image', style); btnIconEl.css('background-image', style);
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscChartProp(); var props = new Asc.CAscChartProp();
props.putStyle(rawData.data); props.putStyle(rawData.data);
this.api.ChartApply(props); this.api.ChartApply(props);
} }
...@@ -442,7 +442,7 @@ define([ ...@@ -442,7 +442,7 @@ define([
this.spnHeight.setValue(h, true); this.spnHeight.setValue(h, true);
} }
if (this.api) { if (this.api) {
var props = new CAscChartProp(); var props = new Asc.CAscChartProp();
props.put_Width(Common.Utils.Metric.fnRecalcToMM(w)); props.put_Width(Common.Utils.Metric.fnRecalcToMM(w));
props.put_Height(Common.Utils.Metric.fnRecalcToMM(h)); props.put_Height(Common.Utils.Metric.fnRecalcToMM(h));
this.api.ChartApply(props); this.api.ChartApply(props);
...@@ -463,7 +463,7 @@ define([ ...@@ -463,7 +463,7 @@ define([
this.spnWidth.setValue(w, true); this.spnWidth.setValue(w, true);
} }
if (this.api) { if (this.api) {
var props = new CAscChartProp(); var props = new Asc.CAscChartProp();
props.put_Width(Common.Utils.Metric.fnRecalcToMM(w)); props.put_Width(Common.Utils.Metric.fnRecalcToMM(w));
props.put_Height(Common.Utils.Metric.fnRecalcToMM(h)); props.put_Height(Common.Utils.Metric.fnRecalcToMM(h));
this.api.ChartApply(props); this.api.ChartApply(props);
......
...@@ -544,7 +544,7 @@ define([ ...@@ -544,7 +544,7 @@ define([
slides: _arr slides: _arr
}); });
props = new CHyperlinkProperty(); props = new Asc.CHyperlinkProperty();
props.put_Text(text); props.put_Text(text);
win.show(); win.show();
...@@ -1097,7 +1097,7 @@ define([ ...@@ -1097,7 +1097,7 @@ define([
menu : (function(){ menu : (function(){
function onItemClick(item, e) { function onItemClick(item, e) {
if (me.api) { if (me.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellsVAlign(item.value); properties.put_CellsVAlign(item.value);
me.api.tblApply(properties); me.api.tblApply(properties);
} }
...@@ -1710,7 +1710,7 @@ define([ ...@@ -1710,7 +1710,7 @@ define([
if (text!==false) { if (text!==false) {
menuAddHyperlinkPara.hyperProps = {}; menuAddHyperlinkPara.hyperProps = {};
menuAddHyperlinkPara.hyperProps.value = new CHyperlinkProperty(); menuAddHyperlinkPara.hyperProps.value = new Asc.CHyperlinkProperty();
menuAddHyperlinkPara.hyperProps.value.put_Text(text); menuAddHyperlinkPara.hyperProps.value.put_Text(text);
} }
...@@ -1794,7 +1794,7 @@ define([ ...@@ -1794,7 +1794,7 @@ define([
if (text!==false) { if (text!==false) {
menuAddHyperlinkTable.hyperProps = {}; menuAddHyperlinkTable.hyperProps = {};
menuAddHyperlinkTable.hyperProps.value = new CHyperlinkProperty(); menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty();
menuAddHyperlinkTable.hyperProps.value.put_Text(text); menuAddHyperlinkTable.hyperProps.value.put_Text(text);
} }
if (!_.isUndefined(value.paraProps)) { if (!_.isUndefined(value.paraProps)) {
......
...@@ -229,7 +229,7 @@ define([ ...@@ -229,7 +229,7 @@ define([
getSettings: function () { getSettings: function () {
var me = this, var me = this,
props = new CHyperlinkProperty(); props = new Asc.CHyperlinkProperty();
var def_display = ''; var def_display = '';
if (me.cmbLinkType.getValue() == c_oHyperlinkType.InternalLink) { if (me.cmbLinkType.getValue() == c_oHyperlinkType.InternalLink) {
var url = "ppaction://hlink"; var url = "ppaction://hlink";
......
...@@ -211,7 +211,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem ...@@ -211,7 +211,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
if (this.spnWidth.getValue()!=='') if (this.spnWidth.getValue()!=='')
properties.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); properties.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
var Position = new CPosition(); var Position = new Asc.CPosition();
if (this.spnX.getValue() !== '') if (this.spnX.getValue() !== '')
Position.put_X(Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue())); Position.put_X(Common.Utils.Metric.fnRecalcToMM(this.spnX.getNumberValue()));
if (this.spnY.getValue() !== '') if (this.spnY.getValue() !== '')
......
...@@ -1050,7 +1050,7 @@ define([ ...@@ -1050,7 +1050,7 @@ define([
this.Effect = type; this.Effect = type;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_TransitionType(type); timing.put_TransitionType(type);
timing.put_TransitionOption(this.EffectType); timing.put_TransitionOption(this.EffectType);
props.put_timing(timing); props.put_timing(timing);
...@@ -1063,7 +1063,7 @@ define([ ...@@ -1063,7 +1063,7 @@ define([
this.EffectType = record.value; this.EffectType = record.value;
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_TransitionType(this.Effect); timing.put_TransitionType(this.Effect);
timing.put_TransitionOption(this.EffectType); timing.put_TransitionOption(this.EffectType);
props.put_timing(timing); props.put_timing(timing);
...@@ -1075,7 +1075,7 @@ define([ ...@@ -1075,7 +1075,7 @@ define([
onDurationChange: function(field, newValue, oldValue, eOpts){ onDurationChange: function(field, newValue, oldValue, eOpts){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_TransitionDuration(field.getNumberValue()*1000); timing.put_TransitionDuration(field.getNumberValue()*1000);
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
...@@ -1086,7 +1086,7 @@ define([ ...@@ -1086,7 +1086,7 @@ define([
onDelayChange: function(field, newValue, oldValue, eOpts){ onDelayChange: function(field, newValue, oldValue, eOpts){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_SlideAdvanceDuration(field.getNumberValue()*1000); timing.put_SlideAdvanceDuration(field.getNumberValue()*1000);
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
...@@ -1097,7 +1097,7 @@ define([ ...@@ -1097,7 +1097,7 @@ define([
onStartOnClickChange: function(field, newValue, oldValue, eOpts){ onStartOnClickChange: function(field, newValue, oldValue, eOpts){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_SlideAdvanceOnMouseClick(field.getValue()=='checked'); timing.put_SlideAdvanceOnMouseClick(field.getValue()=='checked');
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
...@@ -1109,7 +1109,7 @@ define([ ...@@ -1109,7 +1109,7 @@ define([
this.numDelay.setDisabled(field.getValue()!=='checked'); this.numDelay.setDisabled(field.getValue()!=='checked');
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new CAscSlideProps(); var props = new CAscSlideProps();
var timing = new CAscSlideTiming(); var timing = new Asc.Asc.CAscSlideProps();
timing.put_SlideAdvanceAfter(field.getValue()=='checked'); timing.put_SlideAdvanceAfter(field.getValue()=='checked');
props.put_timing(timing); props.put_timing(timing);
this.api.SetSlideProps(props); this.api.SetSlideProps(props);
......
...@@ -76,7 +76,7 @@ define([ ...@@ -76,7 +76,7 @@ define([
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
this._originalLook = new CTablePropLook(); this._originalLook = new Asc.CTablePropLook();
this._originalProps = null; this._originalProps = null;
this.CellBorders = {}; this.CellBorders = {};
...@@ -305,8 +305,8 @@ define([ ...@@ -305,8 +305,8 @@ define([
onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) {
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
var look = (this._originalLook) ? this._originalLook : new CTablePropLook(); var look = (this._originalLook) ? this._originalLook : new Asc.CTablePropLook();
switch (type) { switch (type) {
case 0: case 0:
look.put_FirstRow(field.getValue()=='checked'); look.put_FirstRow(field.getValue()=='checked');
...@@ -335,7 +335,7 @@ define([ ...@@ -335,7 +335,7 @@ define([
onTableTemplateSelect: function(combo, record){ onTableTemplateSelect: function(combo, record){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableStyle(record.get('templateId')); properties.put_TableStyle(record.get('templateId'));
this.api.tblApply(properties); this.api.tblApply(properties);
} }
...@@ -347,8 +347,8 @@ define([ ...@@ -347,8 +347,8 @@ define([
this.CellColor = {Value: 1, Color: color}; this.CellColor = {Value: 1, Color: color};
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
var background = new CBackground(); var background = new Asc.CBackground();
properties.put_CellsBackground(background); properties.put_CellsBackground(background);
if (this.CellColor.Color=='transparent') { if (this.CellColor.Color=='transparent') {
...@@ -375,7 +375,7 @@ define([ ...@@ -375,7 +375,7 @@ define([
onBtnBordersClick: function(btn, eOpts){ onBtnBordersClick: function(btn, eOpts){
this._UpdateBordersStyle(btn.options.strId, true); this._UpdateBordersStyle(btn.options.strId, true);
if (this.api) { if (this.api) {
var properties = new CTableProp(); var properties = new Asc.CTableProp();
properties.put_CellBorders(this.CellBorders); properties.put_CellBorders(this.CellBorders);
properties.put_CellSelect(true); properties.put_CellSelect(true);
this.api.tblApply(properties); this.api.tblApply(properties);
...@@ -444,7 +444,7 @@ define([ ...@@ -444,7 +444,7 @@ define([
if (props ) if (props )
{ {
this._originalProps = new CTableProp(props); this._originalProps = new Asc.CTableProp(props);
this._originalProps.put_CellSelect(true); this._originalProps.put_CellSelect(true);
//for table-template //for table-template
...@@ -556,7 +556,7 @@ define([ ...@@ -556,7 +556,7 @@ define([
}, },
_UpdateBordersStyle: function(border) { _UpdateBordersStyle: function(border) {
this.CellBorders = new CBorders(); this.CellBorders = new Asc.CBorders();
var updateBorders = this.CellBorders; var updateBorders = this.CellBorders;
var visible = (border != ''); var visible = (border != '');
......
...@@ -81,7 +81,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -81,7 +81,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
}; };
this._initialMarginsDefault = false; // если для всех выделенных ячеек пришло одинаковое значение Flag=0 (Use Default Margins) 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() { render: function() {
...@@ -200,7 +200,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -200,7 +200,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this.CellMargins.Flag = field.getValue(); this.CellMargins.Flag = field.getValue();
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_CellMargins()===undefined) 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_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_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); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null);
...@@ -222,7 +222,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -222,7 +222,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Top'); this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Top');
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_CellMargins()===undefined) 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); this._changedProps.get_CellMargins().put_Top((this.CellMargins.Top!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Top) : null);
setCellFlag(); setCellFlag();
} }
...@@ -242,7 +242,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -242,7 +242,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Bottom'); this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Bottom');
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_CellMargins()===undefined) 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); this._changedProps.get_CellMargins().put_Bottom((this.CellMargins.Bottom!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Bottom) : null);
setCellFlag(); setCellFlag();
} }
...@@ -262,7 +262,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -262,7 +262,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Left'); this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Left');
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_CellMargins()===undefined) 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_Left((this.CellMargins.Left!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Left) : null);
setCellFlag(); setCellFlag();
} }
...@@ -282,7 +282,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -282,7 +282,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Right'); this._marginsChange( field, newValue, oldValue, eOpts, 'cell', 'Right');
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_CellMargins()===undefined) 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); this._changedProps.get_CellMargins().put_Right((this.CellMargins.Right!==null) ? Common.Utils.Metric.fnRecalcToMM(this.CellMargins.Right) : null);
setCellFlag(); setCellFlag();
} }
...@@ -340,7 +340,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem ...@@ -340,7 +340,7 @@ define([ 'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
} }
this.fillMargins(this.CellMargins.Flag); this.fillMargins(this.CellMargins.Flag);
this._changedProps = new CTableProp(); this._changedProps = new Asc.CTableProp();
} }
}, },
......
...@@ -52,7 +52,7 @@ Ext.define('PE.controller.Main', { ...@@ -52,7 +52,7 @@ Ext.define('PE.controller.Main', {
app = this.getApplication(), app = this.getApplication(),
profile = app.getCurrentProfile(); profile = app.getCurrentProfile();
api = new asc_docs_api("id-sdkeditor"); api = new Asc.asc_docs_api("id-sdkeditor");
api.SetMobileVersion(true); api.SetMobileVersion(true);
api.CreateComponents(); api.CreateComponents();
api.asc_SetFontsPath("../../../../sdkjs/fonts/"); api.asc_SetFontsPath("../../../../sdkjs/fonts/");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment