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

Bug 25213 - Не выделяются все изображения при нажатии на Ctrl+A

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57140 954022d7-b5bf-4e40-9824-e11837661b57
parent d599d63d
...@@ -1423,15 +1423,15 @@ DrawingObjectsController.prototype = ...@@ -1423,15 +1423,15 @@ DrawingObjectsController.prototype =
insertHyperlink: function (options) { insertHyperlink: function (options) {
//TODO this.checkSelectedObjectsAndCallback(this.hyperlinkAdd, [{Text: options.text, Value: options.hyperlinkModel.Hyperlink, ToolTip: options.hyperlinkModel.Tooltip}]);
}, },
removeHyperlink: function () { removeHyperlink: function () {
// TODO this.checkSelectedObjectsAndCallback(this.hyperlinkRemove, []);
}, },
canAddHyperlink: function() { canAddHyperlink: function() {
//TODO return this.hyperlinkCanAdd();
}, },
getParagraphParaPr: function() getParagraphParaPr: function()
...@@ -3159,8 +3159,34 @@ DrawingObjectsController.prototype = ...@@ -3159,8 +3159,34 @@ DrawingObjectsController.prototype =
selectAll: function() selectAll: function()
{ {
var content = this.getTargetDocContent(); var content = this.getTargetDocContent(), i;
content && content.Select_All(); if(content)
{
content.Select_All();
}
else if(!this.document)
{
if(this.selection.groupSelection)
{
if(!this.selection.groupSelection.selection.chartSelection)
{
this.selection.groupSelection.resetSelection();
for(i = this.selection.groupSelection.arrGraphicObjects.length - 1; i > -1; --i)
{
this.selection.groupSelection.selectObject(this.selection.groupSelection.arrGraphicObjects[i], 0);
}
}
}
else if(!this.selection.chartSelection)
{
this.resetSelection();
var drawings = this.getDrawingObjects();
for(i = drawings.length - 1; i > -1; --i)
{
this.selectObject(drawings[i], 0);
}
}
}
this.updateSelectionState(); this.updateSelectionState();
}, },
......
...@@ -1816,7 +1816,12 @@ CGroupShape.prototype = ...@@ -1816,7 +1816,12 @@ CGroupShape.prototype =
resetSelection: function(graphicObjects) resetSelection: function(graphicObjects)
{ {
this.selection.textSelection = null; this.selection.textSelection = null;
if(this.selection.chartSelection)
{
this.selection.chartSelection.resetSelection();
}
this.selection.chartSelection = null; this.selection.chartSelection = null;
for(var i = this.selectedObjects.length - 1; i > -1; --i) for(var i = this.selectedObjects.length - 1; i > -1; --i)
{ {
var old_gr = this.selectedObjects[i].group; var old_gr = this.selectedObjects[i].group;
......
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