Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

This commit is contained in:
Julia Radzhabova 2016-04-14 10:04:53 +03:00
commit 271bbc70d6
3 changed files with 20 additions and 15 deletions

View file

@ -251,6 +251,7 @@
<script type="text/javascript" src="../../../../sdkjs/common/spellCheckLanguagesAll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<!-- For chart editor -->
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
@ -364,7 +365,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>

View file

@ -235,21 +235,30 @@
<script type="text/javascript">
window.g_debug_mode = true;
</script>
<!-- sdk -->
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
@ -340,12 +349,8 @@
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Layout.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Comments.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/slide/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiBase.js"></script>

View file

@ -247,13 +247,15 @@
<script type="text/javascript" src="../../../../sdkjs/common/docscoapi.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/commonDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/apiCommon.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
@ -269,8 +271,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/apiDefines.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/utils/utils.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/ConditionalFormatting.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/clipboard.js"></script>
@ -297,6 +297,7 @@
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellComment.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/Serialize.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/WorkbookElems.js"></script>
@ -304,7 +305,6 @@
<script type="text/javascript" src="../../../../sdkjs/cell/model/CellInfo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AdvancedOptions.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/UndoRedo.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/StringRender.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/view/CellTextRender.js"></script>