Commit f11f85e1 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 24343 - Ошибка в консоли при переносе двух автофигур на разных страницах в серую область

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56797 954022d7-b5bf-4e40-9824-e11837661b57
parent 1daed914
...@@ -342,7 +342,7 @@ DrawingObjectsController.prototype = ...@@ -342,7 +342,7 @@ DrawingObjectsController.prototype =
selector.selectObject(object, pageIndex); selector.selectObject(object, pageIndex);
if(!is_selected) if(!is_selected)
this.updateOverlay(); this.updateOverlay();
this.checkSelectedObjectsForMove(group); this.checkSelectedObjectsForMove(group, pageIndex);
if(!isRealObject(group)) if(!isRealObject(group))
{ {
this.resetInternalSelection(); this.resetInternalSelection();
...@@ -427,12 +427,13 @@ DrawingObjectsController.prototype = ...@@ -427,12 +427,13 @@ DrawingObjectsController.prototype =
}, },
checkSelectedObjectsForMove: function(group) checkSelectedObjectsForMove: function(group, pageIndex)
{ {
var selected_object = group ? group.selectedObjects : this.selectedObjects; var selected_object = group ? group.selectedObjects : this.selectedObjects;
var b_check_page = isRealNumber(pageIndex);
for(var i = 0; i < selected_object.length; ++i) for(var i = 0; i < selected_object.length; ++i)
{ {
if(selected_object[i].canMove()) if(selected_object[i].canMove() && (!b_check_page || selected_object[i].selectStartPage === pageIndex))
{ {
this.arrPreTrackObjects.push(selected_object[i].createMoveTrack()); this.arrPreTrackObjects.push(selected_object[i].createMoveTrack());
} }
......
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