Commit 71e8669a authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

объединил скроллы word и excel в один. теперь в коммонах.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50252 954022d7-b5bf-4e40-9824-e11837661b57
parent 81299d84
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
"../Excel/view/HandlerList.js", "../Excel/view/HandlerList.js",
"../Excel/view/EventsController.js", "../Excel/view/EventsController.js",
"../Excel/view/WorkbookView.js", "../Excel/view/WorkbookView.js",
"../Excel/view/scroll.js", "../Common/scroll.js",
"../Word/Editor/SerializeCommon.js", "../Word/Editor/SerializeCommon.js",
"../Excel/model/DrawingObjects/Format/Format.js", "../Excel/model/DrawingObjects/Format/Format.js",
"../Word/Editor/GraphicObjects/ObjectTypes/CreateGeometry.js", "../Word/Editor/GraphicObjects/ObjectTypes/CreateGeometry.js",
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
"../PowerPoint/Editor/Format/Table.js", "../PowerPoint/Editor/Format/Table.js",
"../Word/Editor/Common.js", "../Word/Editor/Common.js",
"../Word/Editor/Sections.js", "../Word/Editor/Sections.js",
"../Word/Drawing/scrolls/scroll.js", "../Common/scroll.js",
"../PowerPoint/Editor/History.js", "../PowerPoint/Editor/History.js",
"../PowerPoint/Editor/Format/Paragraph.js", "../PowerPoint/Editor/Format/Paragraph.js",
"../PowerPoint/Editor/FlowObjects.js", "../PowerPoint/Editor/FlowObjects.js",
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
"../Word/Drawing/Rulers.js", "../Word/Drawing/Rulers.js",
"../Word/Drawing/HtmlPage.js", "../Word/Drawing/HtmlPage.js",
"../Word/Drawing/documentrenderer.js", "../Word/Drawing/documentrenderer.js",
"../Word/Drawing/scrolls/scroll.js", "../Common/scroll.js",
"../Word/Editor/SerializeCommon.js", "../Word/Editor/SerializeCommon.js",
"../Word/apiDefines.js", "../Word/apiDefines.js",
"../Word/api-all.js", "../Word/api-all.js",
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
"../Word/Drawing/Rulers.js", "../Word/Drawing/Rulers.js",
"../Word/Drawing/HtmlPage.js", "../Word/Drawing/HtmlPage.js",
"../Word/Drawing/documentrenderer.js", "../Word/Drawing/documentrenderer.js",
"../Word/Drawing/scrolls/scroll.js", "../Common/scroll.js",
"../Word/Editor/SerializeCommon.js", "../Word/Editor/SerializeCommon.js",
"../Word/apiDefines.js", "../Word/apiDefines.js",
"../Word/apiCommon.js", "../Word/apiCommon.js",
......
This diff is collapsed.
...@@ -86,8 +86,9 @@ ...@@ -86,8 +86,9 @@
<script type="text/javascript" src="model/AdvancedOptions.js"></script> <script type="text/javascript" src="model/AdvancedOptions.js"></script>
<script type="text/javascript" src="model/History.js"></script> <script type="text/javascript" src="model/History.js"></script>
<script type="text/javascript" src="model/UndoRedo.js"></script> <script type="text/javascript" src="model/UndoRedo.js"></script>
<script type="text/javascript" src="view/scroll.js"></script>
<script type="text/javascript" src="../Common/scroll.js"></script>
<script type="text/javascript" src="view/StringRender.js"></script> <script type="text/javascript" src="view/StringRender.js"></script>
<script type="text/javascript" src="view/CellTextRender.js"></script> <script type="text/javascript" src="view/CellTextRender.js"></script>
<script type="text/javascript" src="view/CellEditorView.js"></script> <script type="text/javascript" src="view/CellEditorView.js"></script>
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/History.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/History.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/model/UndoRedo.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/scroll.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/StringRender.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellTextRender.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/CellEditorView.js"></script>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<script type="text/javascript" src="../../OfficeWeb/Word/Drawing/Externals.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Drawing/AllFonts.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/AllFonts.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Drawing/GlobalLoaders.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/apiCommon.js"></script> <script type="text/javascript" src="../../OfficeWeb/Common/apiCommon.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/downloaderfiles.js"></script> <script type="text/javascript" src="../../OfficeWeb/Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/docscoapicommon.js"></script> <script type="text/javascript" src="../../OfficeWeb/Common/docscoapicommon.js"></script>
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<script type="text/javascript" src="../../OfficeWeb/Word/Editor/Common.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Editor/Common.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Editor/Sections.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/History.js"></script> <script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/History.js"></script>
<script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/FlowObjects.js"></script> <script type="text/javascript" src="../../OfficeWeb/PowerPoint/Editor/FlowObjects.js"></script>
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Table.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/Format/Table.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Common.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Sections.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/History.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/History.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/FlowObjects.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Editor/FlowObjects.js"></script>
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<script type="text/javascript" src="apiCommon.js"></script> <script type="text/javascript" src="apiCommon.js"></script>
<script type="text/javascript" src="api.js"></script> <script type="text/javascript" src="api.js"></script>
<script type="text/javascript" src="merge/api_merge.js"></script> <script type="text/javascript" src="merge/api_merge.js"></script>
<script type="text/javascript" src="Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../Common/scroll.js"></script>
<script type="text/javascript" src="../Common/Shapes/EditorSettings.js"></script> <script type="text/javascript" src="../Common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../Common/Shapes/Serialize.js"></script> <script type="text/javascript" src="../Common/Shapes/Serialize.js"></script>
......
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
<script type="text/javascript" src="apiDefines.js"></script> <script type="text/javascript" src="apiDefines.js"></script>
<script type="text/javascript" src="apiCommon.js"></script> <script type="text/javascript" src="apiCommon.js"></script>
<script type="text/javascript" src="api.js"></script> <script type="text/javascript" src="api.js"></script>
<script type="text/javascript" src="Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../Common/scroll.js"></script>
<script type="text/javascript" src="Editor/CollaborativeEditing.js"></script> <script type="text/javascript" src="Editor/CollaborativeEditing.js"></script>
<script type="text/javascript" src="../Common/Shapes/EditorSettings.js"></script> <script type="text/javascript" src="../Common/Shapes/EditorSettings.js"></script>
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/Serialize.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/Serialize.js"></script>
......
body { margin: 0; padding: 0; vertical-align:top; overflow:hidden;-moz-user-select: none; -khtml-user-select: none; user-select: none;} body { margin: 0; padding: 0; vertical-align:top; overflow:hidden;-moz-user-select: none; -khtml-user-select: none; user-select: none;-webkit-user-select: none;}
div, table, tbody, tr, th, td, form { div, table, tbody, tr, th, td, form {
margin:0; margin:0;
padding:0; padding:0;
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<script type="text/javascript" src="../../OfficeWeb/Word/apiDefines.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/apiDefines.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/apiCommon.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/apiCommon.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/api.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/api.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../../OfficeWeb/Common/scroll.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script> <script type="text/javascript" src="../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<script type="text/javascript" src="apiDefines.js"></script> <script type="text/javascript" src="apiDefines.js"></script>
<script type="text/javascript" src="apiCommon.js"></script> <script type="text/javascript" src="apiCommon.js"></script>
<!--<script type="text/javascript" src="api.js"></script>--> <!--<script type="text/javascript" src="api.js"></script>-->
<script type="text/javascript" src="Drawing/scrolls/scroll.js"></script> <script type="text/javascript" src="../Common/scroll.js"></script>
<!----> <!---->
<script type="text/javascript" src="Math/docfiles/api.js"></script> <script type="text/javascript" src="Math/docfiles/api.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