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

Методы setStartPointHistory, setEndPointHistory для отмены создания очек в...

Методы setStartPointHistory, setEndPointHistory для  отмены создания  очек в истории при изменении свойств автофигур с помощью слайдеров;

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50792 954022d7-b5bf-4e40-9824-e11837661b57
parent 9094d2ad
...@@ -1981,6 +1981,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1981,6 +1981,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.sheetsChanged(); this.sheetsChanged();
}, },
setStartPointHistory: function(){History.Create_NewPoint(); History.StartTransaction()},
setEndPointHistory: function(){History.EndTransaction()},
// Удаление листа // Удаление листа
asc_deleteWorksheet: function () { asc_deleteWorksheet: function () {
// Проверка глобального лока // Проверка глобального лока
......
...@@ -587,6 +587,8 @@ function asc_docs_api(name) ...@@ -587,6 +587,8 @@ function asc_docs_api(name)
this.SelectedObjectsStack = new Array(); this.SelectedObjectsStack = new Array();
this.noCreatePoint = false;
this.OpenDocumentProgress = new CDocOpenProgress(); this.OpenDocumentProgress = new CDocOpenProgress();
this._lastConvertProgress = 0; this._lastConvertProgress = 0;
...@@ -2709,6 +2711,8 @@ asc_docs_api.prototype.sync_CanRedoCallback = function(bCanRedo) ...@@ -2709,6 +2711,8 @@ asc_docs_api.prototype.sync_CanRedoCallback = function(bCanRedo)
this.asc_fireCallback("asc_onCanRedo", bCanRedo); this.asc_fireCallback("asc_onCanRedo", bCanRedo);
} }
asc_docs_api.prototype.setStartPointHistory = function(){this.noCreatePoint = true; History.Create_NewPoint();};
asc_docs_api.prototype.setEndPointHistory = function(){this.noCreatePoint = false; };
function CDocInfoProp(obj) function CDocInfoProp(obj)
{ {
...@@ -4945,7 +4949,8 @@ asc_docs_api.prototype.ImgApply = function(obj) ...@@ -4945,7 +4949,8 @@ asc_docs_api.prototype.ImgApply = function(obj)
if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Image_Properties, AdditionalData) ) if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Image_Properties, AdditionalData) )
{ {
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(); if(!this.noCreatePoint)
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
if(ImagePr.ImageUrl != undefined && ImagePr.ImageUrl != null && ImagePr.ImageUrl != "") if(ImagePr.ImageUrl != undefined && ImagePr.ImageUrl != null && ImagePr.ImageUrl != "")
{ {
var _img = this.ImageLoader.LoadImage(ImagePr.ImageUrl, 1) var _img = this.ImageLoader.LoadImage(ImagePr.ImageUrl, 1)
......
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