Skip to content

S
sdkjs
Commit e6f68986 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60484 954022d7-b5bf-4e40-9824-e11837661b57
parent 5809d883
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 0 deletions
Common/docscoapi.js
View file @ e6f68986
...@@ -835,6 +835,15 @@ ...@@ -835,6 +835,15 @@
} }
this._onGetLock(data); 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); this._updateChanges(data["changes"], data["changesIndex"], true);
// Посылать нужно всегда, т.к. на это рассчитываем при открытии // Посылать нужно всегда, т.к. на это рассчитываем при открытии
if (this.onFirstLoadChangesEnd) if (this.onFirstLoadChangesEnd)
......
Excel/SpreadsheetTestMenu.html
View file @ e6f68986
...@@ -206,6 +206,9 @@ ...@@ -206,6 +206,9 @@
<script type="text/javascript" src="../Word/Math/operators.js"></script> <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/accent.js"></script>
<script type="text/javascript" src="../Word/Math/borderBox.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"> <style type="text/css">
#teamlab-title { #teamlab-title {
position: fixed; position: fixed;
......
Excel/index.html
View file @ e6f68986
...@@ -348,6 +348,9 @@ ...@@ -348,6 +348,9 @@
<script type="text/javascript" src="../../../../OfficeWeb/Word/Math/accent.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/Math/accent.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Math/borderBox.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 --> <!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script> <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> <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
......
PowerPoint/PowerPoint.html
View file @ e6f68986
...@@ -188,6 +188,9 @@ ...@@ -188,6 +188,9 @@
<script src="../PowerPoint/Editor/Format/GroupPrototype.js"></script> <script src="../PowerPoint/Editor/Format/GroupPrototype.js"></script>
<script src="../PowerPoint/Editor/Format/ChartSpacePrototype.js"></script> <script src="../PowerPoint/Editor/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../PowerPoint/Editor/Format/GraphicFrame.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> </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"> <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;"> <div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;">
......
PowerPoint/index.html
View file @ e6f68986
...@@ -349,6 +349,9 @@ ...@@ -349,6 +349,9 @@
<script src="../../../../OfficeWeb/PowerPoint/Editor/Format/ChartSpacePrototype.js"></script> <script src="../../../../OfficeWeb/PowerPoint/Editor/Format/ChartSpacePrototype.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/GraphicFrame.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 --> <!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script> <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> <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
......
Word/TextEditor.html
View file @ e6f68986
...@@ -213,6 +213,9 @@ ...@@ -213,6 +213,9 @@
<script type="text/javascript" src="../Excel/model/Workbook.js"></script> <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/CellInfo.js"></script>
<script type="text/javascript" src="../Excel/model/AdvancedOptions.js"></script> <script type="text/javascript" src="../Excel/model/AdvancedOptions.js"></script>
<!-- apply changes -->
<script type="text/javascript" src="../OfflineDocuments/ApplyDocumentChanges.js"></script>
</head> </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"> <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">
......
Word/index.html
View file @ e6f68986
...@@ -346,6 +346,9 @@ ...@@ -346,6 +346,9 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellInfo.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/AdvancedOptions.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 --> <!-- application -->
<script type="text/javascript" src="../../../sdk/Common/docscoapisettings.js"></script> <script type="text/javascript" src="../../../sdk/Common/docscoapisettings.js"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7