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

c_oAscVerticalTextAlign -> c_oAscVAlign

Browse source 
TEXT_ALIGN_BOTTOM -> Bottom
TEXT_ALIGN_CTR -> Center
TEXT_ALIGN_DIST -> Dist
TEXT_ALIGN_JUST -> Just
TEXT_ALIGN_TOP -> Top
This commit is contained in:
Alexander.Trofimov 2016-11-10 14:24:18 +03:00
parent 3134a3f73c
commit 4f491a750c
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2696,21 +2696,21 @@ define([
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM valign : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(paragraphVAlign, me)) }).on('click', _.bind(paragraphVAlign, me))
] ]
}) })
@ -2915,9 +2915,9 @@ define([
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if ( isInShape || isInChart ) { if ( isInShape || isInChart ) {
var align = value.imgProps.value.get_VerticalTextAlign(); var align = value.imgProps.value.get_VerticalTextAlign();
me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
var dir = value.imgProps.value.get_Vert(); var dir = value.imgProps.value.get_Vert();
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);

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

@ -466,9 +466,9 @@ define([
btnVerticalAlign = this.toolbar.btnVerticalAlign; btnVerticalAlign = this.toolbar.btnVerticalAlign;
switch (v) { switch (v) {
case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; case Asc.c_oAscVAlign.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_oAscVAlign.Center: 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.Bottom: index = 2; align = 'btn-align-bottom'; break;
default: index = -255; align = 'btn-align-middle'; break; default: index = -255; align = 'btn-align-middle'; break;
} }

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

@ -2169,19 +2169,19 @@ define([
caption : me.topCellText, caption : me.topCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR value : Asc.c_oAscVAlign.Center
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(onItemClick, me)) }).on('click', _.bind(onItemClick, me))
] ]
}) })
@ -2345,9 +2345,9 @@ define([
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if (isInShape || isInChart) { if (isInShape || isInChart) {
var align = value.shapeProps.value.get_VerticalTextAlign(); var align = value.shapeProps.value.get_VerticalTextAlign();
me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
var dir = value.shapeProps.value.get_Vert(); var dir = value.shapeProps.value.get_Vert();
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);

6
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -453,7 +453,7 @@ define([
icls : 'btn-align-top', icls : 'btn-align-top',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}, },
{ {
caption : me.textAlignMiddle, caption : me.textAlignMiddle,
@ -461,7 +461,7 @@ define([
icls : 'btn-align-middle', icls : 'btn-align-middle',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, value : Asc.c_oAscVAlign.Center,
checked : true checked : true
}, },
{ {
@ -470,7 +470,7 @@ define([
icls : 'btn-align-bottom', icls : 'btn-align-bottom',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
} }
] ]
}) })

6
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1216,9 +1216,9 @@ define([
align = value.asc_getVerticalTextAlign(), align = value.asc_getVerticalTextAlign(),
direct = value.asc_getVert(); direct = value.asc_getVert();
isObjLocked = isObjLocked || value.asc_getLocked(); isObjLocked = isObjLocked || value.asc_getLocked();
documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal); documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal);
documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert);

6
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -470,19 +470,19 @@ define([
caption : me.topCellText, caption : me.topCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}), }),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR value : Asc.c_oAscVAlign.Center
}), }),
this.menuParagraphBottom = new Common.UI.MenuItem({ this.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
}) })
] ]
}) })