git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62157 954022d7-b5bf-4e40-9824-e11837661b57

e47244f5 · Oleg.Korshul · Alexander.Trofimov · 85c199a6 · e47244f5 · e47244f5
Commit e47244f5 authored Apr 17, 2015 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

PowerPoint/api.js PowerPoint/api.js +6 -4

Word/api.js Word/api.js +5 -2

No files found.
--- a/PowerPoint/api.js
+++ b/PowerPoint/api.js
@@ -156,6 +156,7 @@ function asc_docs_api(name)

    this.IsLongActionCurrent = 0;
    this.LongActionCallbacks = [];
+	this.LongActionCallbacksParams = [];
 	
 	this.TrackFile = null;
 	
@@ -1660,8 +1661,7 @@ asc_docs_api.prototype.sync_StartAction = function(type, id){
        this.IsLongActionCurrent++;
 };
 asc_docs_api.prototype.sync_EndAction = function(type, id){
-	//this.AsyncAction
-	this.asc_fireCallback("asc_onEndAction", type, id);
+    this.asc_fireCallback("asc_onEndAction", type, id);

    if (c_oAscAsyncActionType.BlockInteraction == type)
    {
@@ -1672,9 +1672,10 @@ asc_docs_api.prototype.sync_EndAction = function(type, id){
            var _length = this.LongActionCallbacks.length;
            for (var i = 0; i < _length; i++)
            {
-                this.LongActionCallbacks[i]();
+                this.LongActionCallbacks[i](this.LongActionCallbacksParams[i]);
            }
            this.LongActionCallbacks.splice(0, _length);
+            this.LongActionCallbacksParams.splice(0, _length);
        }
    }
 };
@@ -1683,11 +1684,12 @@ asc_docs_api.prototype.asc_IsLongAction = function()
 {
    return (0 == this.IsLongActionCurrent) ? false : true;
 };
-asc_docs_api.prototype.asc_CheckLongActionCallback = function(_callback)
+asc_docs_api.prototype.asc_CheckLongActionCallback = function(_callback, _param)
 {
    if (this.asc_IsLongAction())
    {
        this.LongActionCallbacks[this.LongActionCallbacks.length] = _callback;
+        this.LongActionCallbacksParams[this.LongActionCallbacksParams.length] = _param;
        return false;
    }
    else

--- a/Word/api.js
+++ b/Word/api.js
@@ -440,6 +440,7 @@ function asc_docs_api(name)
 	
    this.IsLongActionCurrent = 0;
    this.LongActionCallbacks = [];
+    this.LongActionCallbacksParams = [];

    this.ParcedDocument = false;
 	this.isStartCoAuthoringOnEndLoad = false;	// Подсоединились раньше, чем документ загрузился
@@ -2616,9 +2617,10 @@ asc_docs_api.prototype.sync_EndAction = function(type, id){
            var _length = this.LongActionCallbacks.length;
            for (var i = 0; i < _length; i++)
            {
-                this.LongActionCallbacks[i]();
+                this.LongActionCallbacks[i](this.LongActionCallbacksParams[i]);
            }
            this.LongActionCallbacks.splice(0, _length);
+            this.LongActionCallbacksParams.splice(0, _length);
        }
    }
 };
@@ -2627,11 +2629,12 @@ asc_docs_api.prototype.asc_IsLongAction = function()
 {
    return (0 == this.IsLongActionCurrent) ? false : true;
 };
-asc_docs_api.prototype.asc_CheckLongActionCallback = function(_callback)
+asc_docs_api.prototype.asc_CheckLongActionCallback = function(_callback, _param)
 {
    if (this.asc_IsLongAction())
    {
        this.LongActionCallbacks[this.LongActionCallbacks.length] = _callback;
+        this.LongActionCallbacksParams[this.LongActionCallbacksParams.length] = _param;
        return false;
    }
    else