Commit fab4f008 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Добавлена функция в апи для нового сохранения.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56680 954022d7-b5bf-4e40-9824-e11837661b57
parent 78373aec
...@@ -758,8 +758,6 @@ asc_docs_api.prototype.TranslateStyleName = function(style_name) ...@@ -758,8 +758,6 @@ asc_docs_api.prototype.TranslateStyleName = function(style_name)
asc_docs_api.prototype.SetUnchangedDocument = function() asc_docs_api.prototype.SetUnchangedDocument = function()
{ {
this.isDocumentModify = false; this.isDocumentModify = false;
//this.WordControl.m_oDrawingDocument.m_bIsSendApiDocChanged = false;
this.asc_fireCallback("asc_onDocumentModifiedChanged"); this.asc_fireCallback("asc_onDocumentModifiedChanged");
} }
...@@ -2736,6 +2734,47 @@ asc_docs_api.prototype.Paste = function() ...@@ -2736,6 +2734,47 @@ asc_docs_api.prototype.Paste = function()
asc_docs_api.prototype.Share = function(){ asc_docs_api.prototype.Share = function(){
} }
asc_docs_api.prototype.asc_Save2 = function()
{
if (true === this.canSave)
{
this.canSave = false;
this.CoAuthoringApi.askSaveChanges(OnSave_Callback2);
}
}
function OnSave_Callback2(e)
{
if ( false == e["saveLock"] )
{
editor.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.Save);
if ( c_oAscCollaborativeMarksShowType.LastChanges === editor.CollaborativeMarksShowType )
CollaborativeEditing.Clear_CollaborativeMarks();
// Принимаем чужие изменения
safe_Apply_Changes();
// Пересылаем свои изменения
CollaborativeEditing.Send_Changes();
// Выставляем, что документ не модифицирован
editor.SetUnchangedDocument();
editor.canSave = true;
editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Save);
// Снимаем лок с функции сохранения на сервере
editor.CoAuthoringApi.unSaveChanges();
}
else
{
setTimeout( function(){ editor.CoAuthoringApi.askSaveChanges( OnSave_Callback2 ); }, 1000 );
}
}
asc_docs_api.prototype.asc_Save = function (isAutoSave) { asc_docs_api.prototype.asc_Save = function (isAutoSave) {
if(true === this.canSave) { if(true === this.canSave) {
this.canSave = false; this.canSave = false;
......
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