Commit 2b6d5fd5 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Добавлена обработка события закрытия фрейма диаграммы в апи.

Не сейвим прит тереке автофигуры в быстром совместном редактировании.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66701 954022d7-b5bf-4e40-9824-e11837661b57
parent e0d64427
......@@ -480,6 +480,9 @@ baseEditorsApi.prototype.asc_getChartPreviews = function(chartType) {
};
baseEditorsApi.prototype.asc_getTextArtPreviews = function() {
return this.textArtPreviewManager.getWordArtStyles();
};
baseEditorsApi.prototype.asc_onCloseChartFrame = function() {
};
// Add image
baseEditorsApi.prototype._addImageUrl = function() {
......
......@@ -2447,6 +2447,10 @@ var editor;
return this.wb ? this.wb.getCellEditMode() : false;
};
spreadsheet_api.prototype.asc_getIsTrackShape = function() {
return this.wb ? this.wb.getIsTrackShape() : false;
};
spreadsheet_api.prototype.asc_setCellFontName = function(fontName) {
var t = this, fonts = {};
fonts[fontName] = 1;
......@@ -2842,7 +2846,7 @@ var editor;
////////////////////////////AutoSave api/////////////////////////////////
/////////////////////////////////////////////////////////////////////////
spreadsheet_api.prototype._autoSave = function() {
if ((0 === this.autoSaveGap && !this.collaborativeEditing.getFast()) || this.asc_getCellEditMode() ||
if ((0 === this.autoSaveGap && !this.collaborativeEditing.getFast()) || this.asc_getCellEditMode() || this.asc_getIsTrackShape() ||
!History.IsEndTransaction() || !this.canSave) {
return;
}
......@@ -3208,6 +3212,7 @@ var editor;
prot["asc_addImage"] = prot.asc_addImage;
prot["asc_setData"] = prot.asc_setData;
prot["asc_getData"] = prot.asc_getData;
prot["asc_onCloseChartFrame"] = prot.asc_onCloseChartFrame;
// Cell comment interface
prot["asc_addComment"] = prot.asc_addComment;
......
......@@ -1462,6 +1462,16 @@
return this.controller.isCellEditMode;
};
WorkbookView.prototype.getIsTrackShape = function(){
var ws = this.getWorksheet();
if(!ws){
return false;
}
if(ws.objectRender && ws.objectRender.controller){
return ws.objectRender.controller.checkTrackDrawings();
}
};
WorkbookView.prototype.getZoom = function () {
return this.drawingCtx.getZoom();
};
......
......@@ -243,6 +243,7 @@ asc_docs_api.prototype['deleteImage'] = asc_docs_api.prototype.deleteImage;
asc_docs_api.prototype['set_ImgDistanceFromText'] = asc_docs_api.prototype.set_ImgDistanceFromText;
asc_docs_api.prototype['set_PositionOnPage'] = asc_docs_api.prototype.set_PositionOnPage;
asc_docs_api.prototype['get_OriginalSizeImage'] = asc_docs_api.prototype.get_OriginalSizeImage;
asc_docs_api.prototype['asc_onCloseChartFrame'] = asc_docs_api.prototype.asc_onCloseChartFrame;
asc_docs_api.prototype['sync_AddImageCallback'] = asc_docs_api.prototype.sync_AddImageCallback;
asc_docs_api.prototype['sync_ImgPropCallback'] = asc_docs_api.prototype.sync_ImgPropCallback;
asc_docs_api.prototype['SetDrawingFreeze'] = asc_docs_api.prototype.SetDrawingFreeze;
......
......@@ -14693,7 +14693,7 @@ CDocument.prototype.Continue_FastCollaborativeEditing = function()
if (true !== this.CollaborativeEditing.Is_Fast() || true === this.CollaborativeEditing.Is_SingleUser())
return;
if (true === this.Selection_Is_TableBorderMove() || true === this.Api.isStartAddShape)
if (true === this.Selection_Is_TableBorderMove() || true === this.Api.isStartAddShape || this.DrawingObjects.checkTrackDrawings())
return;
var HaveChanges = this.History.Have_Changes(false);
......
......@@ -468,6 +468,7 @@ asc_docs_api.prototype['asc_getAnchorPosition'] = asc_docs_api.prototype.asc_get
asc_docs_api.prototype['asc_getChartObject'] = asc_docs_api.prototype.asc_getChartObject;
asc_docs_api.prototype['asc_addChartDrawingObject'] = asc_docs_api.prototype.asc_addChartDrawingObject;
asc_docs_api.prototype['asc_doubleClickOnChart'] = asc_docs_api.prototype.asc_doubleClickOnChart;
asc_docs_api.prototype['asc_onCloseChartFrame'] = asc_docs_api.prototype.asc_onCloseChartFrame;
asc_docs_api.prototype['asc_editChartDrawingObject'] = asc_docs_api.prototype.asc_editChartDrawingObject;
asc_docs_api.prototype['asc_getChartPreviews'] = asc_docs_api.prototype.asc_getChartPreviews;
asc_docs_api.prototype['asc_getTextArtPreviews'] = asc_docs_api.prototype.asc_getTextArtPreviews;
......
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