diff --git a/apps/api/documents/cache-scripts.html b/apps/api/documents/cache-scripts.html index 4aca07b9a..23f210c3e 100644 --- a/apps/api/documents/cache-scripts.html +++ b/apps/api/documents/cache-scripts.html @@ -16,7 +16,7 @@
diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 938c22e54..2be360885 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -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); diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 567722174..21378a978 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -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(); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d552dbcc6..879d8ff5f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -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) { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index cd205ce41..16c04eb69 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -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); diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 537619a44..dec34f3e2 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -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); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index e1547da3f..ae4723908 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -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); diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index d328fbc93..7424cc679 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -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); diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js index d550bc9b5..ddfc2d19c 100644 --- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js @@ -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) ) diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 0c6074fc3..1339afb6a 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -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); diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 4c87a80a7..b4091498e 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -364,7 +364,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_Percent(false); @@ -389,7 +389,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_Percent(false); @@ -461,7 +461,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnXPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_Percent(true); @@ -550,7 +550,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this.spnYPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_Percent(true); @@ -1149,7 +1149,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat if (this._originalProps.get_WrappingStyle()===Asc.c_oAscWrapStyle2.Inline && properties.get_WrappingStyle() !== undefined && properties.get_WrappingStyle()!==Asc.c_oAscWrapStyle2.Inline ) { if ( properties.get_PositionH()===null || properties.get_PositionH()===undefined ) { - properties.put_PositionH(new CImagePositionH()); + properties.put_PositionH(new Asc.CImagePositionH()); properties.get_PositionH().put_UseAlign(false); properties.get_PositionH().put_Percent(false); properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); @@ -1158,7 +1158,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat } if ( properties.get_PositionV()===null || properties.get_PositionV()===undefined ) { - properties.put_PositionV(new CImagePositionV()); + properties.put_PositionV(new Asc.CImagePositionV()); properties.get_PositionV().put_UseAlign(false); properties.get_PositionV().put_Percent(false); properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); @@ -1285,7 +1285,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onHAlignSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._state.HAlignType = record.value; this._changedProps.get_PositionH().put_UseAlign(true); @@ -1298,7 +1298,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onHRelativeSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._state.HAlignFrom = record.value; this._changedProps.get_PositionH().put_UseAlign(true); @@ -1311,7 +1311,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onHPositionSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._state.HPositionFrom = record.value; this._changedProps.get_PositionH().put_UseAlign(false); @@ -1328,7 +1328,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onHPositionPcSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._state.HPositionPcFrom = record.value; this._changedProps.get_PositionH().put_UseAlign(false); @@ -1345,7 +1345,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onVAlignSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._state.VAlignType = record.value; this._changedProps.get_PositionV().put_UseAlign(true); @@ -1358,7 +1358,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onVRelativeSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._state.VAlignFrom = record.value; this._changedProps.get_PositionV().put_UseAlign(true); @@ -1373,7 +1373,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onVPositionSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._state.VPositionFrom = record.value; this._changedProps.get_PositionV().put_UseAlign(false); @@ -1392,7 +1392,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onVPositionPcSelect: function(combo, record){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._state.VPositionPcFrom = record.value; this._changedProps.get_PositionV().put_UseAlign(false); @@ -1409,7 +1409,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioHAlignChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._changedProps.get_PositionH().put_UseAlign(newValue); if (newValue) { @@ -1431,7 +1431,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioHPositionChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); if (newValue) { this._changedProps.get_PositionH().put_UseAlign(false); @@ -1453,7 +1453,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioHPositionPcChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CImagePositionH()); + this._changedProps.put_PositionH(new Asc.CImagePositionH()); this._changedProps.get_PositionH().put_Percent(newValue); if (newValue) { @@ -1475,7 +1475,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioVAlignChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._changedProps.get_PositionV().put_UseAlign(newValue); if (newValue) { @@ -1499,7 +1499,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioVPositionChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); if (newValue) { this._changedProps.get_PositionV().put_UseAlign(false); @@ -1523,7 +1523,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat onRadioVPositionPcChange: function(field, newValue, eOpts) { if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CImagePositionV()); + this._changedProps.put_PositionV(new Asc.CImagePositionV()); this._changedProps.get_PositionV().put_Percent(newValue); if (newValue) { diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index f75b7c191..2ff261def 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -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); diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 9fd362e28..fcb1ee445 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -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); diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 07e463111..774cf09bc 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -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 != ''); diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index e091caaa0..e18bbaeca 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -124,7 +124,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.tableStylerColumns = this.options.tableStylerColumns; this.borderProps = this.options.borderProps; this.pageWidth = (this.options.sectionProps) ? this.options.sectionProps.get_W() - this.options.sectionProps.get_LeftMargin() - this.options.sectionProps.get_RightMargin() : 210; - this._originalProps = new CTableProp(this.options.tableProps); + this._originalProps = new Asc.CTableProp(this.options.tableProps); }, render: function() { @@ -342,7 +342,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat 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); @@ -364,7 +364,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat 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(); } @@ -384,7 +384,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat 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(); } @@ -404,7 +404,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat 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(); } @@ -424,7 +424,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat 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(); } @@ -684,7 +684,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) - this._changedProps.put_PositionH(new CTablePositionH()); + this._changedProps.put_PositionH(new Asc.CTablePositionH()); this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_RelativeFrom(this._state.HPositionFrom); @@ -708,7 +708,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){ if (this._changedProps) { if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) - this._changedProps.put_PositionV(new CTablePositionV()); + this._changedProps.put_PositionV(new Asc.CTablePositionV()); this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_RelativeFrom(this._state.VPositionFrom); @@ -1091,7 +1091,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat for (var j=0; j