Commit e9734844 authored by Oleg Korshul's avatar Oleg Korshul

.

parent 6d962b95
......@@ -13631,11 +13631,6 @@ CGeometry2.prototype =
return false;
},
getObjectType: function()
{
return CLASS_TYPE_GEOMETRY;
},
AddPath: function(path)
{
this.pathLst.push(path);
......@@ -13903,52 +13898,6 @@ CSortFaces.prototype =
return {intersections: intersections, reverseIntersections: reverseIntersections, countIntersection: countIntersection};
},
sortFaces: function(faces)
{
var t = this;
var iterCount = 0;
var newArr = [];
var lastFaces = faces;
while(lastFaces.length !== 0)
{
var firstFaces1 = [], lastFaces1 = [];
t._getFirstLastFaces(lastFaces, firstFaces1, lastFaces1);
newArr = firstFaces1.concat(newArr);
lastFaces = lastFaces1;
iterCount++;
if(iterCount > 50)
{
newArr = lastFaces.concat(newArr);
break;
}
}
return newArr;
},
_getFirstLastFaces: function(sortZIndexPaths, first, last)
{
//перебираем все грани
for(var i = 0; i < all.length; i++)
{
var plainVerge = all[i];
var isFirstVerge = this._isIntersectionFacesPointLines(plainVerge, i, all);
//push into array
if(!isFirstVerge)
{
first.push(plainVerge);
}
else
{
last.push(plainVerge);
}
}
},
//смотрим есть ли пересечения точек, выходящих из вершин данной грани, с другими гранями
_isIntersectionFacesPointLines: function(plainVerge, i, sortZIndexPaths)
{
......
......@@ -416,8 +416,8 @@
{
if (this.Api.asc_IsFocus() && !AscCommon.g_clipboardBase.IsFocus() && !AscCommon.g_clipboardBase.IsWorking())
{
if (document.activeElement != oThis.HtmlArea)
oThis.HtmlArea.focus();
if (document.activeElement != this.HtmlArea)
this.HtmlArea.focus();
}
},
......
......@@ -176,7 +176,7 @@ CDocMeta.prototype.selectAllCheckStart = function()
}
this.waitSelectAll = true;
editor.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.SlowOperation);
editor.sync_StartAction(window['Asc'].c_oAscAsyncActionType.BlockInteraction, window['Asc'].c_oAscAsyncAction.SlowOperation);
};
CDocMeta.prototype.selectAllCheckEnd = function()
......@@ -184,7 +184,7 @@ CDocMeta.prototype.selectAllCheckEnd = function()
if (this.waitSelectAll)
{
this.waitSelectAll = false;
editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.SlowOperation);
editor.sync_EndAction(window['Asc'].c_oAscAsyncActionType.BlockInteraction, window['Asc'].c_oAscAsyncAction.SlowOperation);
this.selectAll();
}
};
\ No newline at end of file
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