Skip to content

S
sdkjs
Commit 2615d720 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov
Browse files
Options

удаление в формуле 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58629 954022d7-b5bf-4e40-9824-e11837661b57
parent aafe75c5
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 84 deletions
Word/Editor/Math.js
View file @ 2615d720
...@@ -246,8 +246,6 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText) ...@@ -246,8 +246,6 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText)
} }
else if (oElem.Type == para_Math_Run && oElem.IsPlaceholder() && bOnAddText == true) else if (oElem.Type == para_Math_Run && oElem.IsPlaceholder() && bOnAddText == true)
{ {
History.Create_NewPoint();
var Items = []; var Items = [];
Items.push(oContent.Content.content[0]); Items.push(oContent.Content.content[0]);
oContent.Content.content.splice( 0, 1 ); oContent.Content.content.splice( 0, 1 );
...@@ -276,17 +274,16 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText) ...@@ -276,17 +274,16 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText)
} }
else //слева ран else //слева ран
{ {
History.Create_NewPoint(); if(prevElem.Content.length == 0 && !bOnAddText)
{
this.RemoveEmptyRun(prevElem);
this.Remove( Direction, bOnAddText );
return;
}
prevElem.Remove(Direction, bOnAddText); prevElem.Remove(Direction, bOnAddText);
if(prevElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его if(prevElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
{ this.RemoveEmptyRun(prevElem);
var Items = [];
Items.push(prevElem.Parent.content[0]);
prevElem.Parent.content.splice( 0, 1 );
History.Add(prevElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: 0});
prevElem.Parent.CurPos--;
}
return; return;
} }
} }
...@@ -322,7 +319,6 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText) ...@@ -322,7 +319,6 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText)
} }
else //справа ран else //справа ран
{ {
History.Create_NewPoint();
nextElem.State.ContentPos = 0; nextElem.State.ContentPos = 0;
nextElem.Remove(Direction, bOnAddText); nextElem.Remove(Direction, bOnAddText);
if(nextElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его if(nextElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
...@@ -337,17 +333,18 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText) ...@@ -337,17 +333,18 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText)
} }
} }
History.Create_NewPoint(); oElem.Remove(Direction, bOnAddText);
oElem.Remove(Direction, bOnAddText);
if(oElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его if (oElem.Content.length == 0 && oContent.Start == oContent.Content.content.length - 1 &&
oContent.Start >0 && oContent.Content.content[oContent.Start-1].Type == para_Math_Composition) //тк это крайний правый пустой ран и слева композиция, он остается.
return;
else if( oElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
{ {
var Items = []; var Items = [];
Items.push(oElem.Parent.content[oContent.Start]); Items.push(oElem.Parent.content[oContent.Start]);
oElem.Parent.content.splice( oContent.Start, 1 ); oElem.Parent.content.splice( oContent.Start, 1 );
History.Add(oElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: oContent.Start}); History.Add(oElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: oContent.Start});
oContent.Content.CurPos--; this.PosTransitLeft(oContent.Content);
if (oContent.Content.CurPos < 0)
oContent.Content.CurPos = 0;
oContent.Content.SetRunEmptyToContent(true); oContent.Content.SetRunEmptyToContent(true);
} }
} }
...@@ -357,99 +354,135 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText) ...@@ -357,99 +354,135 @@ ParaMath.prototype.Remove = function(Direction, bOnAddText)
}, },
ParaMath.prototype.RemoveElem = function(oContent, Direction, bOnAdd) ParaMath.prototype.RemoveElem = function(oContent, Direction, bOnAdd)
{ {
var oMath = oContent.Content; var oMath = oContent.Content;
var oMathContent = oMath.content; var oMathContent = oMath.content;
var start = oMath.Selection.Start,
end = oMath.Selection.End;
var start = oMath.Selection.Start, var bRightSelect = true;
end = oMath.Selection.End;
var bRightSelect = true;
if(start > end)
{
bRightSelect = false;
start = oMath.Selection.End;
end = oMath.Selection.Start;
}
var oStartContent = oMathContent[start]; if(start > end)
if ( para_Math_Run == oStartContent.Type) {
if (oStartContent.Selection.StartPos == oStartContent.Selection.EndPos == oStartContent.Content.length) bRightSelect = false;
start++;//у левого рана буквы не заселекчены, но в селект он попал, так что его удалять не надо start = oMath.Selection.End;
end = oMath.Selection.Start;
var oEndContent = oMathContent[end]; }
if ( para_Math_Run == oEndContent.Type && !bRightSelect)
if (oEndContent.Selection.StartPos == oEndContent.Selection.EndPos && oEndContent.Selection.EndPos == oEndContent.Content.length) var oStartContent = oMathContent[start];
end--;//у правого рана буквы не заселекчены, но в селект он попал, так что его удалять не надо if ( para_Math_Run == oStartContent.Type)
if (oStartContent.Selection.StartPos == oStartContent.Selection.EndPos == oStartContent.Content.length)
start++;//у левого рана буквы не заселекчены, но в селект он попал, так что его удалять не надо
var nStartContent = start; var oEndContent = oMathContent[end];
var nEndContent = end; if ( para_Math_Run == oEndContent.Type && !bRightSelect)
if (oEndContent.Selection.StartPos == oEndContent.Selection.EndPos && oEndContent.Selection.EndPos == oEndContent.Content.length)
History.Create_NewPoint(); end--;//у правого рана буквы не заселекчены, но в селект он попал, так что его удалять не надо
var Items = [];
var nStartContent = start;
var oElem = oMathContent[start]; var nEndContent = end;
if ( para_Math_Run == oElem.Type && oElem.Selection.Use)
History.Create_NewPoint();
var Items = [];
var oElem = oMathContent[start];
if ( para_Math_Run == oElem.Type && oElem.Selection.Use)
{
if (oElem.Selection.EndPos - oElem.Selection.StartPos != oElem.Content.length)
{ {
oElem.Remove(Direction,false); oElem.Remove(Direction,false);
start++; start++;
if (!bRightSelect) if (!bRightSelect)
oMath.CurPos++; oMath.CurPos++;
} }
else else
{ nStartContent--;
Items.push(oElem); }
History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: start}); else
} {
Items.push(oElem);
History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: start});
}
if ( start != end)
{
Items = []; Items = [];
for (var i=nStartContent+1; i<nEndContent; i++) for (var i=nStartContent+1; i<nEndContent; i++)
{ {
oElem = oMathContent[i]; oElem = oMathContent[i];
Items.push(oElem); Items.push(oElem);
} }
if (Items.length > 0) if (Items.length > 0)
History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: nStartContent+1}); History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: nStartContent+1});
Items = []; Items = [];
var oElem = oMathContent[end]; var oElem = oMathContent[end];
if ( para_Math_Run == oElem.Type && oElem.Selection.Use) if ( para_Math_Run == oElem.Type && oElem.Selection.Use)
{ {
oElem.Remove(Direction,false); if (oElem.Selection.EndPos - oElem.Selection.StartPos != oElem.Content.length)
end--; {
if (bRightSelect) oElem.Remove(Direction,false);
oMath.CurPos--; end--;
if (bRightSelect)
this.PosTransitLeft(oMath);
}
else
nEndContent++;
} }
else else
{ {
Items.push(oElem); Items.push(oElem);
History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: end}); History.Add(oMath, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: end});
} }
}
var len = end - start + 1;
oMathContent.splice( start, len ); var len = end - start + 1;
oMathContent.splice( start, len );
if (bRightSelect)
oMath.CurPos = oMath.CurPos - len + 1; if (bRightSelect)
oMath.CurPos = oMath.CurPos - len + 1;
//добавляем пустой ран на месте удаленных элементов, и ставим на него селект
var oMRun = new ParaRun(this.Paragraph, true); //добавляем пустой ран на месте удаленных элементов, и ставим на него селект
//oMRun.Pr = oStartContent.Pr; var oMRun = new ParaRun(this.Paragraph, true);
var items = []; //oMRun.Pr = oStartContent.Pr;
oMathContent.splice(oMath.CurPos, 0, oMRun); var items = [];
items.push(oMRun); oMathContent.splice(oMath.CurPos, 0, oMRun);
var Pos = oMath.CurPos, items.push(oMRun);
PosEnd = Pos + 1; var Pos = oMath.CurPos,
History.Add(oContent.Content, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd}); PosEnd = Pos + 1;
History.Add(oContent.Content, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd});
if (oMath.CurPos < 0)
oMath.CurPos = 0; oContent.Content.SetRunEmptyToContent(true);
if (oMath.CurPos < 0)
this.Selection_Remove(); oMath.CurPos = 0;
return;
}; this.Selection_Remove();
return;
};
ParaMath.prototype.RemoveEmptyRun = function(oElem)
{
var Items = [];
Items.push(oElem.Parent.content[oElem.Parent.CurPos]);
oElem.Parent.content.splice( oElem.Parent.CurPos, 1 );
History.Add(oElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: oElem.Parent.CurPos});
this.PosTransitLeft(oElem.Parent)
}
ParaMath.prototype.PosTransitLeft = function(oElem)
{
var oPreElem;
if (oElem.CurPos > 0)
{
oElem.CurPos--;
oPreElem = oElem.content[oElem.CurPos];
if (oPreElem.Type == para_Math_Run)
oPreElem.State.ContentPos = oPreElem.Content.length;
}
}
ParaMath.prototype.GetSelectContent = function() ParaMath.prototype.GetSelectContent = function()
{ {
......
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