Skip to content

S
sdkjs
Commit 7d75b65b authored by Anna.Pavlova's avatar Anna.Pavlova
Browse files
Options

Удалена тестовая функция для контекстного меню формул 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68256 954022d7-b5bf-4e40-9824-e11837661b57
parent 815b0b79
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 481 deletions
Word/Editor/Math.js
View file @ 7d75b65b
......@@ -1582,486 +1582,6 @@ ParaMath.prototype.Add_ToContent = function(Pos, Item, UpdatePosition)
};
ParaMath.prototype.Load_PropsFromMenu_2 = function(Pr) //тестовая функция для контекстного меню
{
var PrevState = TEST_PREV_STATE_MENU;
var TypeMathMenu, Gap;
switch(Pr.Type)
{
case c_oAscMathInterfaceType.Fraction:
{
if(Pr.FractionType == c_oAscMathInterfaceFraction.NoBar)
{
Pr.FractionType = c_oAscMathInterfaceFraction.Bar;
}
else
{
Pr.FractionType++;
}
TEST_PREV_STATE_MENU = Pr.FractionType;
break;
}
case c_oAscMathInterfaceType.Radical:
{
if(Pr.HideDegree != undefined && PrevState !== c_oAscMathMenuTypes.RadicalHideDegree)
{
Pr.HideDegree = !Pr.HideDegree;
TEST_PREV_STATE_MENU = c_oAscMathMenuTypes.RadicalHideDegree;
}
else
{
Pr.remove_Radical();
//Pr.Action |= c_oMathMenuAction.RemoveRadical;
TEST_PREV_STATE_MENU = c_oAscMathMenuTypes.DeleteElement;
}
break;
}
case c_oAscMathInterfaceType.LargeOperator:
{
/*if(Pr.HideUpper !== true && Pr.HideLower !== true && PrevState !== c_oAscMathMenuTypes.NaryLimLoc)
{
}*/
/*if(PrevState !== c_oAscMathMenuTypes.NaryLimLoc && Pr.HideUpper !== true && Pr.HideLower !== true)
{
TypeMathMenu = c_oAscMathMenuTypes.NaryLimLoc;
}
else if(PrevState !== c_oAscMathMenuTypes.NaryHideUpperIterator && Pr.HideUpper !== undefined)
{
TypeMathMenu = c_oAscMathMenuTypes.NaryHideUpperIterator;
}
else if(PrevState !== c_oAscMathMenuTypes.NaryHideLowerIterator && Pr.HideLower !== undefined)
{
TypeMathMenu = c_oAscMathMenuTypes.NaryHideLowerIterator;
}
this.Root.Load_PropsFromMenu(c_oAscMathMenuTypes.IncreaseArgSize);*/
break;
}
case c_oAscMathInterfaceType.Delimiter:
{
if(PrevState == c_oAscMathMenuTypes.DelimiterAddToRight)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterAddToLeft;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterAddToLeft)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterRemoveContent;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterRemoveContent && Pr != undefined && Pr.Grow == true)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterShpCentred;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterRemoveContent || PrevState == c_oAscMathMenuTypes.DelimiterShpCentred)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterGrow;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterGrow)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterHideBegOper;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterHideBegOper)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterHideEndOper;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterHideEndOper)
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterAddToRight;
}
/*if(PrevState == c_oAscMathMenuTypes.DelimiterRemoveContent)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterAddToRight;
}
else if(PrevState == c_oAscMathMenuTypes.DelimiterAddToRight)
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterAddToLeft;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.DelimiterRemoveContent;
}*/
break;
}
case c_oAscMathInterfaceType.GroupChar:
{
if(PrevState == c_oAscMathMenuTypes.GroupCharOver || Pr.bCanChangePos == false)
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}
else if(Pr.bCanChangePos == true)
{
if(Pr.bUnder == false)
{
TypeMathMenu = c_oAscMathMenuTypes.GroupCharUnder;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.GroupCharOver;
}
}
break;
}
case c_oAscMathInterfaceType.Limit:
{
/*if(Pr.bUnder)
{
TypeMathMenu = c_oAscMathMenuTypes.LimitOver;
}
else if(PrevState == c_oAscMathMenuTypes.LimitOver)
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.LimitUnder;
}*/
if(PrevState == c_oAscMathMenuTypes.IncreaseArgSize)
{
TypeMathMenu = c_oAscMathMenuTypes.DecreaseArgSize;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.IncreaseArgSize;
}
break;
}
case c_oAscMathInterfaceType.BorderBox:
{
if(PrevState == c_oAscMathMenuTypes.BorderBoxHideTop)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxHideBot;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxHideBot)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxHideLeft;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxHideLeft)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxHideRight;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxHideRight)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxStrikeHor;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxStrikeHor)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxStrikeVer;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxStrikeVer)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxStrikeTopLTR;
}
else if(PrevState == c_oAscMathMenuTypes.BorderBoxStrikeTopLTR)
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxStrikeTopRTL;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.BorderBoxHideTop;
}
break;
}
case c_oAscMathInterfaceType.Matrix:
{
/*if(PrevState == c_oAscMathMenuTypes.MatrixAddRowUnder)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixAddRowOver;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixAddRowOver)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRemoveRow;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixAddRowUnder;
}*/
/*if(PrevState == c_oAscMathMenuTypes.MatrixAddColumnToRight)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixAddColumnToLeft;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixAddColumnToLeft)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRemoveColumn;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixAddColumnToRight;
}*/
/*if(Pr.BaseJc == BASEJC_CENTER)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixBaseJcTop;
}
else if(Pr.BaseJc == BASEJC_TOP)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixBaseJcBottom;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixBaseJcCenter;
}*/
/*if(Pr.ColumnJc == MCJC_CENTER)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnJcLeft;
}
else if(Pr.ColumnJc == MCJC_LEFT)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnJcRight;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnJcCenter;
}*/
/*if(PrevState == c_oAscMathMenuTypes.MatrixRowOneAndHalfGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRowDoubleGap;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixRowDoubleGap)
{
// сделать проверку на то, что Gap - целое число
// Gap >> 0
// Gap * 20
TypeMathMenu = c_oAscMathMenuTypes.MatrixRowExactlyGap;
Gap = 720;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixRowExactlyGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRowSingleGap;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixRowSingleGap)
{
// кратно 0,5
// Gap >> 0
TypeMathMenu = c_oAscMathMenuTypes.MatrixRowMultipleGap;
Gap = 5;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRowOneAndHalfGap;
}*/
/*if(PrevState == c_oAscMathMenuTypes.MatrixColumnOneAndHalfGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnDoubleGap;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixColumnDoubleGap)
{
// Gap >> 0
// Gap*20
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnExactlyGap;
Gap = 720;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixColumnExactlyGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnSingleGap;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixColumnSingleGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnMultipleGap;
// count = GapMenu / 0.21163
// count >> 0
// if(GapMenu < (((0.21163*count)* 100 + 0.5) >> 0 )/100 )
// count--; // count передаем в качестве параметра Gap
Gap = 6;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixColumnMultipleGap)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixMinColumnWidth;
// Gap >> 0
// Gap*20
Gap = 1440;
}
else if(PrevState == c_oAscMathMenuTypes.MatrixMinColumnWidth)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixHidePlaceholders;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixColumnOneAndHalfGap;
}*/
if(PrevState == c_oAscMathMenuTypes.MatrixRemoveColumn)
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRemoveRow;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.MatrixRemoveColumn;
}
break;
}
case c_oAscMathInterfaceType.EqArray:
{
/*if(PrevState == c_oAscMathMenuTypes.EqArrayAddRowUnder)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayAddRowOver;
}
else if(PrevState == c_oAscMathMenuTypes.EqArrayAddRowOver)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRemoveRow;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayAddRowUnder;
}*/
/*if(Pr.BaseJc == BASEJC_CENTER)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayBaseJcTop;
}
else if(Pr.BaseJc == BASEJC_TOP)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayBaseJcBottom;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayBaseJcCenter;
}*/
if(PrevState == c_oAscMathMenuTypes.EqArrayRowOneAndHalfGap)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRowDoubleGap;
}
else if(PrevState == c_oAscMathMenuTypes.EqArrayRowDoubleGap)
{
// сделать проверку на то, что Gap - целое число
// Gap >> 0
// Gap * 20
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRowExactlyGap;
Gap = 720;
}
else if(PrevState == c_oAscMathMenuTypes.EqArrayRowExactlyGap)
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRowSingleGap;
}
else if(PrevState == c_oAscMathMenuTypes.EqArrayRowSingleGap)
{
// кратно 0,5
// Gap >> 0
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRowMultipleGap;
Gap = 5;
}
else if(PrevState == c_oAscMathMenuTypes.EqArrayRowMultipleGap )
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.EqArrayRowOneAndHalfGap;
}
break;
}
case c_oAscMathInterfaceType.Script:
{
/*if(Pr.Type == Math_Menu_DegreeType.SubSupScript )
{
if(PrevState == c_oAscMathMenuTypes.DeleteSubScript)
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteSuperScript;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteSubScript;
}
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}*/
/*if(PrevState == c_oAscMathMenuTypes.IncreaseArgSize)
{
TypeMathMenu = c_oAscMathMenuTypes.DecreaseArgSize;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.IncreaseArgSize;
}*/
if(Pr.ScriptType == c_oAscMathInterfaceScript.SubSup)
{
if(PrevState !== c_oAscMathMenuTypes.DeleteSuperScript)
{
Pr.put_ScriptType(c_oAscMathInterfaceScript.Sup);
TEST_PREV_STATE_MENU = c_oAscMathMenuTypes.DeleteSuperScript;
}
else
{
Pr.put_ScriptType(c_oAscMathInterfaceScript.Sub);
TEST_PREV_STATE_MENU = c_oAscMathMenuTypes.DeleteSubScript;
}
}
break;
}
case c_oAscMathInterfaceType.Bar:
{
if(Pr.Pos == LOCATION_TOP && PrevState !== c_oAscMathMenuTypes.BarLineOver)
{
TypeMathMenu = c_oAscMathMenuTypes.BarLineUnder;
}
else if(PrevState !== c_oAscMathMenuTypes.BarLineOver)
{
TypeMathMenu = c_oAscMathMenuTypes.BarLineOver;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.DeleteElement;
}
break;
}
case c_oAscMathInterfaceType.Accent:
{
break;
}
case c_oAscMathInterfaceType.Box:
{
if(PrevState == c_oAscMathMenuTypes.IncreaseArgSize)
{
TypeMathMenu = c_oAscMathMenuTypes.DecreaseArgSize;
}
else
{
TypeMathMenu = c_oAscMathMenuTypes.IncreaseArgSize;
}
break;
}
}
this.Root.Set_MenuProps(Pr);
};
ParaMath.prototype.Get_MenuProps = function()
{
return this.Root.Get_MenuProps();
......@@ -2157,7 +1677,7 @@ ParaMath.prototype.Recalculate_Range = function(PRS, ParaPr, Depth)
if(this.ParaMathRPI.bInline == false)
{
PRS.RestartPageRecalcInfo.Object = this; // т.к. this.ParaMathRPI.bInline == false
// и чтобы на проверке bResetPageInfo не перебить параметры
// и чтобы на проверке bResetPageInfo не перебить параметры
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7