Commit ef3be604 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Попрвила баг : если находимся в плейсхолдере, Selection_IsEmpty возвращает false

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58365 954022d7-b5bf-4e40-9824-e11837661b57
parent e2e2757e
...@@ -4539,6 +4539,9 @@ ParaRun.prototype.Selection_IsEmpty = function(CheckEnd) ...@@ -4539,6 +4539,9 @@ ParaRun.prototype.Selection_IsEmpty = function(CheckEnd)
if ( true !== Selection.Use ) if ( true !== Selection.Use )
return true; return true;
if(this.Type == para_Math_Run && this.IsPlaceholder())
return false;
var StartPos = Selection.StartPos; var StartPos = Selection.StartPos;
var EndPos = Selection.EndPos; var EndPos = Selection.EndPos;
......
...@@ -742,9 +742,6 @@ CMathBase.prototype = ...@@ -742,9 +742,6 @@ CMathBase.prototype =
var bInsideSelect = bEqual && this.elements[startX][startY].bInside == true && !this.elements[startX][startY].IsSelectEmpty(); var bInsideSelect = bEqual && this.elements[startX][startY].bInside == true && !this.elements[startX][startY].IsSelectEmpty();
if(this.constructor.name == "CNary")
console.log("bInsideSelect " + bInsideSelect);
return (!this.SelectStart.bOutside && !this.SelectEnd.bOutside) && bEqual && !bInsideSelect; return (!this.SelectStart.bOutside && !this.SelectEnd.bOutside) && bEqual && !bInsideSelect;
}, },
Recalculate_CurPos: function(_X, Y, CurrentRun, _CurRange, _CurLine, _CurPage, UpdateCurPos, UpdateTarget, ReturnTarget) Recalculate_CurPos: function(_X, Y, CurrentRun, _CurRange, _CurLine, _CurPage, UpdateCurPos, UpdateTarget, ReturnTarget)
......
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