Реализовал схему для подключения изменений

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

Реализовал схему для подключения изменений
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60484 954022d7-b5bf-4e40-9824-e11837661b57
e6f68986 · Alexander.Trofimov · Alexander.Trofimov · 5809d883 · e6f68986 · e6f68986
Commit e6f68986 authored Jan 14, 2015 by Alexander.Trofimov Committed by Alexander.Trofimov May 18, 2016
7 changed files
--- a/Common/docscoapi.js
+++ b/Common/docscoapi.js
@@ -835,6 +835,15 @@
 				}
 				this._onGetLock(data);
 			}
+			// Применения изменений пользователя
+			if (window['AscApplyChanges'] && window['AscChanges']) {
+				var userOfflineChanges = window['AscChanges'], changeOneUser;
+				for (var i = 0; i < userOfflineChanges.length; ++i) {
+					changeOneUser = userOfflineChanges[i];
+					for (var j = 0; j < changeOneUser.length; ++j)
+						this.onSaveChanges(changeOneUser[j], null, true);
+				}
+			}
 			this._updateChanges(data["changes"], data["changesIndex"], true);
 			// Посылать нужно всегда, т.к. на это рассчитываем при открытии
 			if (this.onFirstLoadChangesEnd)

--- a/Excel/SpreadsheetTestMenu.html
+++ b/Excel/SpreadsheetTestMenu.html
@@ -206,6 +206,9 @@
 <script type="text/javascript" src="../Word/Math/operators.js"></script>
 <script type="text/javascript" src="../Word/Math/accent.js"></script>
 <script type="text/javascript" src="../Word/Math/borderBox.js"></script>
+
+<!-- apply changes -->
+<script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script>
 <style type="text/css">
 #teamlab-title {
    position: fixed;

--- a/Excel/index.html
+++ b/Excel/index.html
@@ -348,6 +348,9 @@
    <script type="text/javascript" src="../../../../OfficeWeb/Word/Math/accent.js"></script>
    <script type="text/javascript" src="../../../../OfficeWeb/Word/Math/borderBox.js"></script>
 	
+	<!-- apply changes -->
+	<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
+	
 	<!-- debug begin -->
    <script type="text/javascript">var less=less||{};less.env='development';</script>
    <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>

--- a/PowerPoint/PowerPoint.html
+++ b/PowerPoint/PowerPoint.html
@@ -188,6 +188,9 @@
    <script src="../PowerPoint/Editor/Format/GroupPrototype.js"></script>
    <script src="../PowerPoint/Editor/Format/ChartSpacePrototype.js"></script>
    <script type="text/javascript" src="../PowerPoint/Editor/Format/GraphicFrame.js"></script>
+	
+	<!-- apply changes -->
+	<script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script>
    </head>
    <body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on">
 		<div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;">

--- a/PowerPoint/index.html
+++ b/PowerPoint/index.html
@@ -349,6 +349,9 @@
 <script src="../../../../OfficeWeb/PowerPoint/Editor/Format/ChartSpacePrototype.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/GraphicFrame.js"></script>

+<!-- apply changes -->
+<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
+
 <!-- debug begin -->
 <script type="text/javascript">var less=less||{};less.env='development';</script>
 <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>

--- a/Word/TextEditor.html
+++ b/Word/TextEditor.html
@@ -213,6 +213,9 @@
 		<script type="text/javascript" src="../Excel/model/Workbook.js"></script>
 		<script type="text/javascript" src="../Excel/model/CellInfo.js"></script>
 		<script type="text/javascript" src="../Excel/model/AdvancedOptions.js"></script>
+		
+		<!-- apply changes -->
+		<script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script>

    </head>
    <body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on">

--- a/Word/index.html
+++ b/Word/index.html
@@ -346,6 +346,9 @@
    <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellInfo.js"></script>
    <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/AdvancedOptions.js"></script>
 	
+	<!-- apply changes -->
+	<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
+	
    <!-- application -->
    <script type="text/javascript" src="../../../sdk/Common/docscoapisettings.js"></script>
    <script data-main="app" src="../../../vendor/requirejs/require.js"></script>