Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

global clases -> Asc namespace

Browse source
This commit is contained in:
Alexander.Trofimov 2016-04-05 15:57:51 +03:00
parent eec1f68457
commit 7d6675b5b8
27 changed files with 125 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/cache-scripts.html
View file

@ -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>

4
apps/common/main/lib/controller/Comments.js
View file

@ -53,8 +53,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);

2
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -704,7 +704,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();

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -111,7 +111,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) {

4
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1260,7 +1260,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();
@ -1625,7 +1625,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);

4
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -371,13 +371,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);

20
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -571,7 +571,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();
@ -1490,7 +1490,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);
@ -1699,12 +1699,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);
@ -1839,13 +1839,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);
@ -2179,7 +2179,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);
} }
@ -2401,7 +2401,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);
} }
@ -2505,7 +2505,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 **/
@ -2958,7 +2958,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);

2
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -824,7 +824,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);

2
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -160,7 +160,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) )

4
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -253,13 +253,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);

40
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -364,7 +364,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionH().put_Percent(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){ this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionV().put_Percent(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){ this.spnXPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionH().put_Percent(true); 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){ this.spnYPc.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionV().put_Percent(true); 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 (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 ) { 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_UseAlign(false);
properties.get_PositionH().put_Percent(false); properties.get_PositionH().put_Percent(false);
properties.get_PositionH().put_RelativeFrom(Asc.c_oAscRelativeFromH.Column); 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 ) { 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_UseAlign(false);
properties.get_PositionV().put_Percent(false); properties.get_PositionV().put_Percent(false);
properties.get_PositionV().put_RelativeFrom(Asc.c_oAscRelativeFromV.Paragraph); 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){ onHAlignSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HAlignType = record.value;
this._changedProps.get_PositionH().put_UseAlign(true); this._changedProps.get_PositionH().put_UseAlign(true);
@ -1298,7 +1298,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onHRelativeSelect: function(combo, record){ onHRelativeSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HAlignFrom = record.value;
this._changedProps.get_PositionH().put_UseAlign(true); this._changedProps.get_PositionH().put_UseAlign(true);
@ -1311,7 +1311,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onHPositionSelect: function(combo, record){ onHPositionSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HPositionFrom = record.value;
this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_UseAlign(false);
@ -1328,7 +1328,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onHPositionPcSelect: function(combo, record){ onHPositionPcSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HPositionPcFrom = record.value;
this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_UseAlign(false);
@ -1345,7 +1345,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onVAlignSelect: function(combo, record){ onVAlignSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VAlignType = record.value;
this._changedProps.get_PositionV().put_UseAlign(true); this._changedProps.get_PositionV().put_UseAlign(true);
@ -1358,7 +1358,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onVRelativeSelect: function(combo, record){ onVRelativeSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VAlignFrom = record.value;
this._changedProps.get_PositionV().put_UseAlign(true); this._changedProps.get_PositionV().put_UseAlign(true);
@ -1373,7 +1373,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onVPositionSelect: function(combo, record){ onVPositionSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VPositionFrom = record.value;
this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_UseAlign(false);
@ -1392,7 +1392,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onVPositionPcSelect: function(combo, record){ onVPositionPcSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VPositionPcFrom = record.value;
this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_UseAlign(false);
@ -1409,7 +1409,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioHAlignChange: function(field, newValue, eOpts) { onRadioHAlignChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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); this._changedProps.get_PositionH().put_UseAlign(newValue);
if (newValue) { if (newValue) {
@ -1431,7 +1431,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioHPositionChange: function(field, newValue, eOpts) { onRadioHPositionChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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) { if (newValue) {
this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_UseAlign(false);
@ -1453,7 +1453,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioHPositionPcChange: function(field, newValue, eOpts) { onRadioHPositionPcChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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); this._changedProps.get_PositionH().put_Percent(newValue);
if (newValue) { if (newValue) {
@ -1475,7 +1475,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioVAlignChange: function(field, newValue, eOpts) { onRadioVAlignChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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); this._changedProps.get_PositionV().put_UseAlign(newValue);
if (newValue) { if (newValue) {
@ -1499,7 +1499,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioVPositionChange: function(field, newValue, eOpts) { onRadioVPositionChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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) { if (newValue) {
this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_UseAlign(false);
@ -1523,7 +1523,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
onRadioVPositionPcChange: function(field, newValue, eOpts) { onRadioVPositionPcChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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); this._changedProps.get_PositionV().put_Percent(newValue);
if (newValue) { if (newValue) {

2
apps/documenteditor/main/app/view/MailMergeSettings.js
View file

@ -659,7 +659,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);

4
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1112,13 +1112,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);

22
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -89,7 +89,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;
@ -353,8 +353,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');
@ -383,7 +383,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);
} }
@ -392,7 +392,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)
@ -410,7 +410,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);
} }
@ -422,8 +422,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') {
@ -451,7 +451,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);
@ -522,7 +522,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());
@ -655,7 +655,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 != '');

60
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file

@ -124,7 +124,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableStylerColumns = this.options.tableStylerColumns; this.tableStylerColumns = this.options.tableStylerColumns;
this.borderProps = this.options.borderProps; 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.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() { render: function() {
@ -342,7 +342,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
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);
@ -364,7 +364,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
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();
} }
@ -384,7 +384,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
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();
} }
@ -404,7 +404,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
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();
} }
@ -424,7 +424,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
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();
} }
@ -684,7 +684,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.spnX.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionH().put_RelativeFrom(this._state.HPositionFrom); 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){ this.spnY.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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_UseAlign(false);
this._changedProps.get_PositionV().put_RelativeFrom(this._state.VPositionFrom); 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<this.tableBordersImageSpacing.columns; j++) { for (var j=0; j<this.tableBordersImageSpacing.columns; j++) {
this.tableBordersImageSpacing.getCell(j, i).on('borderclick', function(ct, border, size, color){ this.tableBordersImageSpacing.getCell(j, i).on('borderclick', function(ct, border, size, color){
if (this.ChangedCellBorders===undefined) { if (this.ChangedCellBorders===undefined) {
this.ChangedCellBorders = new CBorders(); this.ChangedCellBorders = new Asc.CBorders();
} }
this._UpdateCellBordersStyle(ct, border, size, color, this.CellBorders, this.ChangedCellBorders); this._UpdateCellBordersStyle(ct, border, size, color, this.CellBorders, this.ChangedCellBorders);
}, this); }, this);
@ -1099,7 +1099,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
} }
this.tableBordersImageSpacing.on('borderclick', function(ct, border, size, color){ this.tableBordersImageSpacing.on('borderclick', function(ct, border, size, color){
if (this.ChangedTableBorders===undefined) { if (this.ChangedTableBorders===undefined) {
this.ChangedTableBorders = new CBorders(); this.ChangedTableBorders = new Asc.CBorders();
} }
this._UpdateTableBordersStyle(ct, border, size, color, this.TableBorders, this.ChangedTableBorders); this._UpdateTableBordersStyle(ct, border, size, color, this.TableBorders, this.ChangedTableBorders);
}, this); }, this);
@ -1109,11 +1109,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableBordersImage.getCell(j, i).on('borderclick', function(ct, border, size, color){ this.tableBordersImage.getCell(j, i).on('borderclick', function(ct, border, size, color){
if (this._allTable) { if (this._allTable) {
if (this.ChangedTableBorders===undefined) { if (this.ChangedTableBorders===undefined) {
this.ChangedTableBorders = new CBorders(); this.ChangedTableBorders = new Asc.CBorders();
} }
} else { } else {
if (this.ChangedCellBorders===undefined) { if (this.ChangedCellBorders===undefined) {
this.ChangedCellBorders = new CBorders(); this.ChangedCellBorders = new Asc.CBorders();
} }
} }
this._UpdateCellBordersStyle(ct, border, size, color, (this._allTable) ? this.TableBorders : this.CellBorders, (this._allTable) ? this.ChangedTableBorders : this.ChangedCellBorders); this._UpdateCellBordersStyle(ct, border, size, color, (this._allTable) ? this.TableBorders : this.CellBorders, (this._allTable) ? this.ChangedTableBorders : this.ChangedCellBorders);
@ -1123,11 +1123,11 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableBordersImage.on('borderclick', function(ct, border, size, color){ this.tableBordersImage.on('borderclick', function(ct, border, size, color){
if (this._allTable) { if (this._allTable) {
if (this.ChangedTableBorders===undefined) { if (this.ChangedTableBorders===undefined) {
this.ChangedTableBorders = new CBorders(); this.ChangedTableBorders = new Asc.CBorders();
} }
} else { } else {
if (this.ChangedCellBorders===undefined) { if (this.ChangedCellBorders===undefined) {
this.ChangedCellBorders = new CBorders(); this.ChangedCellBorders = new Asc.CBorders();
} }
} }
this._UpdateTableBordersStyle(ct, border, size, color, (this._allTable) ? this.TableBorders : this.CellBorders, (this._allTable) ? this.ChangedTableBorders : this.ChangedCellBorders); this._UpdateTableBordersStyle(ct, border, size, color, (this._allTable) ? this.TableBorders : this.CellBorders, (this._allTable) ? this.ChangedTableBorders : this.ChangedCellBorders);
@ -1346,9 +1346,9 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this._state.horizontalPropChanged = false; this._state.horizontalPropChanged = false;
// borders // borders
this.TableBorders = new CBorders(props.get_TableBorders()); this.TableBorders = new Asc.CBorders(props.get_TableBorders());
this.CellBorders = new CBorders(props.get_CellBorders()); this.CellBorders = new Asc.CBorders(props.get_CellBorders());
this._UpdateBordersNoSpacing_(); this._UpdateBordersNoSpacing_();
this._UpdateBordersSpacing_(); this._UpdateBordersSpacing_();
@ -1421,7 +1421,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.ShowHideSpacing(this.chAllowSpacing.getValue()==='checked'); this.ShowHideSpacing(this.chAllowSpacing.getValue()==='checked');
} }
this._changedProps = new CTableProp(); this._changedProps = new Asc.CTableProp();
this._cellBackground = null; this._cellBackground = null;
this.ChangedTableBorders = undefined; this.ChangedTableBorders = undefined;
this.ChangedCellBorders = undefined; this.ChangedCellBorders = undefined;
@ -1498,7 +1498,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.cmbHAlign.setValue(this._state.HAlignType); this.cmbHAlign.setValue(this._state.HAlignType);
this.radioHAlign.setValue(true); this.radioHAlign.setValue(true);
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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(true); this._changedProps.get_PositionH().put_UseAlign(true);
this._changedProps.get_PositionH().put_Align(this._state.HAlignType); this._changedProps.get_PositionH().put_Align(this._state.HAlignType);
@ -1514,7 +1514,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onHAlignSelect: function(combo, record){ onHAlignSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HAlignType = record.value; this._state.HAlignType = record.value;
this._changedProps.get_PositionH().put_UseAlign(true); this._changedProps.get_PositionH().put_UseAlign(true);
@ -1527,7 +1527,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onHRelativeSelect: function(combo, record){ onHRelativeSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HAlignFrom = record.value; this._state.HAlignFrom = record.value;
this._changedProps.get_PositionH().put_UseAlign(true); this._changedProps.get_PositionH().put_UseAlign(true);
@ -1539,7 +1539,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onHPositionSelect: function(combo, record){ onHPositionSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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._state.HPositionFrom = record.value; this._state.HPositionFrom = record.value;
this._changedProps.get_PositionH().put_UseAlign(false); this._changedProps.get_PositionH().put_UseAlign(false);
@ -1555,7 +1555,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onVAlignSelect: function(combo, record){ onVAlignSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VAlignType = record.value; this._state.VAlignType = record.value;
this._changedProps.get_PositionV().put_UseAlign(true); this._changedProps.get_PositionV().put_UseAlign(true);
@ -1567,7 +1567,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onVRelativeSelect: function(combo, record){ onVRelativeSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VAlignFrom = record.value; this._state.VAlignFrom = record.value;
this._changedProps.get_PositionV().put_UseAlign(true); this._changedProps.get_PositionV().put_UseAlign(true);
@ -1581,7 +1581,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onVPositionSelect: function(combo, record){ onVPositionSelect: function(combo, record){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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._state.VPositionFrom = record.value; this._state.VPositionFrom = record.value;
this._changedProps.get_PositionV().put_UseAlign(false); this._changedProps.get_PositionV().put_UseAlign(false);
@ -1598,7 +1598,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onRadioHAlignChange: function(field, newValue, eOpts) { onRadioHAlignChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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(newValue); this._changedProps.get_PositionH().put_UseAlign(newValue);
if (newValue) { if (newValue) {
@ -1619,7 +1619,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onRadioHPositionChange: function(field, newValue, eOpts) { onRadioHPositionChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionH()===null || this._changedProps.get_PositionH()===undefined) 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(!newValue); this._changedProps.get_PositionH().put_UseAlign(!newValue);
if (newValue) { if (newValue) {
@ -1643,7 +1643,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onRadioVAlignChange: function(field, newValue, eOpts) { onRadioVAlignChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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(newValue); this._changedProps.get_PositionV().put_UseAlign(newValue);
if (newValue) { if (newValue) {
@ -1664,7 +1664,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
onRadioVPositionChange: function(field, newValue, eOpts) { onRadioVPositionChange: function(field, newValue, eOpts) {
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_PositionV()===null || this._changedProps.get_PositionV()===undefined) 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(!newValue); this._changedProps.get_PositionV().put_UseAlign(!newValue);
if (newValue) { if (newValue) {
@ -1707,7 +1707,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.CellColor = {Value: 1, Color: color}; this.CellColor = {Value: 1, Color: color};
if (this._cellBackground === null) if (this._cellBackground === null)
this._cellBackground = new CBackground(); this._cellBackground = new Asc.CBackground();
if (this.CellColor.Color=='transparent') { if (this.CellColor.Color=='transparent') {
this._cellBackground.put_Value(1); this._cellBackground.put_Value(1);
@ -1725,7 +1725,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
if (this._changedProps) { if (this._changedProps) {
var background = this._changedProps.get_TableBackground(); var background = this._changedProps.get_TableBackground();
if (background===undefined) { if (background===undefined) {
background = new CBackground(); background = new Asc.CBackground();
this._changedProps.put_TableBackground(background); this._changedProps.put_TableBackground(background);
} }
if (this.TableColor.Color=='transparent') { if (this.TableColor.Color=='transparent') {

2
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -58,7 +58,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/");

2
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -712,7 +712,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();

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -105,7 +105,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;

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1187,7 +1187,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();

10
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -249,7 +249,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;
@ -363,7 +363,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);
} }
@ -392,7 +392,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);
} }
@ -450,7 +450,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);
@ -471,7 +471,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);

8
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -552,7 +552,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();
@ -1105,7 +1105,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);
} }
@ -1718,7 +1718,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);
} }
@ -1802,7 +1802,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)) {

2
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -237,7 +237,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";

2
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -219,7 +219,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() !== '')

12
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -1058,7 +1058,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);
@ -1071,7 +1071,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);
@ -1083,7 +1083,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);
@ -1094,7 +1094,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);
@ -1105,7 +1105,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);
@ -1117,7 +1117,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);

18
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -84,7 +84,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 = {};
@ -313,8 +313,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');
@ -343,7 +343,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);
} }
@ -355,8 +355,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') {
@ -383,7 +383,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);
@ -452,7 +452,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
@ -564,7 +564,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 != '');

14
apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
View file

@ -89,7 +89,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() {
@ -208,7 +208,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);
@ -230,7 +230,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();
} }
@ -250,7 +250,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();
} }
@ -270,7 +270,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();
} }
@ -290,7 +290,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();
} }
@ -348,7 +348,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();
} }
}, },

2
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -60,7 +60,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/");