diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 1dc58890b..7cd5aef47 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2696,21 +2696,21 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + valign : Asc.c_oAscVAlign.Top }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + valign : Asc.c_oAscVAlign.Center }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + valign : Asc.c_oAscVAlign.Bottom }).on('click', _.bind(paragraphVAlign, me)) ] }) @@ -2915,9 +2915,9 @@ define([ menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! if ( isInShape || isInChart ) { var align = value.imgProps.value.get_VerticalTextAlign(); - me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); var dir = value.imgProps.value.get_Vert(); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 1fdb231a1..e158fec23 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -466,9 +466,9 @@ define([ btnVerticalAlign = this.toolbar.btnVerticalAlign; switch (v) { - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR: index = 1; align = 'btn-align-middle'; break; - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM: index = 2; align = 'btn-align-bottom'; break; + case Asc.c_oAscVAlign.Top: index = 0; align = 'btn-align-top'; break; + case Asc.c_oAscVAlign.Center: index = 1; align = 'btn-align-middle'; break; + case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-align-bottom'; break; default: index = -255; align = 'btn-align-middle'; break; } diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 383ccb65d..e2e712b8b 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2169,19 +2169,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }).on('click', _.bind(onItemClick, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVAlign.Center }).on('click', _.bind(onItemClick, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom }).on('click', _.bind(onItemClick, me)) ] }) @@ -2345,9 +2345,9 @@ define([ menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! if (isInShape || isInChart) { var align = value.shapeProps.value.get_VerticalTextAlign(); - me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); var dir = value.shapeProps.value.get_Vert(); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 940e6cab5..671606671 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -453,7 +453,7 @@ define([ icls : 'btn-align-top', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }, { caption : me.textAlignMiddle, @@ -461,7 +461,7 @@ define([ icls : 'btn-align-middle', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, + value : Asc.c_oAscVAlign.Center, checked : true }, { @@ -470,7 +470,7 @@ define([ icls : 'btn-align-bottom', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom } ] }) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 1c0671027..4ac3399de 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1216,9 +1216,9 @@ define([ align = value.asc_getVerticalTextAlign(), direct = value.asc_getVert(); isObjLocked = isObjLocked || value.asc_getLocked(); - documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal); documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 8d2efff01..da1e92db1 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -470,19 +470,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVAlign.Center }), this.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom }) ] })