Commit 1382eb44 authored by GoshaZotov's avatar GoshaZotov

Merge remote-tracking branch 'remotes/origin/develop' into feature/cell-formatastable

parents c8add353 0cd00a4f
.idea/
Common/AllFonts.js
Common/Images/fonts_thumbnail.png
Common/Images/fonts_thumbnail@2x.png
cell/sdk-all.js
slide/sdk-all.js
word/sdk-all.js
**/node_modules
common/AllFonts.js
common/Images/fonts_thumbnail.png
common/Images/fonts_thumbnail@2x.png
copy "D:\Projects\wwwrootOffice\apps\documenteditor\main\index.html" "D:\Projects\wwwrootOffice\apps\documenteditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\index.html" "D:\Projects\wwwrootOffice\apps\documenteditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Excel\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app.js" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Excel\app.js" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app.js" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\app.js" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Common\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js"
......@@ -2,4 +2,4 @@
cd /D %~dp0
@echo on
call grunt.cmd --no-color
\ No newline at end of file
call grunt --no-color
\ No newline at end of file
{
"info": {
"version": "3.6.0",
"build": 163
},
"update_src": {
"revision": "HEAD",
"src": "../common ../word"
},
"compile": {
"sdk": {
"src": [
"../common/Native/Wrappers/memory.js",
"../common/Build/License.js",
"../common/browser.js",
"../common/docscoapicommon.js",
"../common/docscoapi.js",
"../common/apiCommon.js",
"../common/spellcheckapi.js",
"../common/wordcopypaste.js",
"../common/spellCheckLanguage.js",
"../common/spellCheckLanguagesAll.js",
"../common/downloaderfiles.js",
"../common/commonDefines.js",
"../common/editorscommon.js",
"../common/Private/editorscommon.js",
"../common/Shapes/Serialize.js",
"../common/Shapes/SerializeWriter.js",
"../common/SerializeCommonWordExcel.js",
"../common/SerializeChart.js",
"../common/Drawings/Format/Constants.js",
"../common/Drawings/Format/Format.js",
"../common/FontsFreeType/font_map.js",
"../word/Drawing/Externals.js",
"../word/Drawing/GlobalLoaders.js",
"../word/Drawing/translations.js",
"../common/Charts/charts.js",
"../common/Charts/ChartsDrawer.js",
"../common/Charts/DrawingArea.js",
"../common/Charts/DrawingObjects.js",
"../common/NumFormat.js",
"../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../common/Drawings/TrackObjects/MoveTracks.js",
"../common/Drawings/TrackObjects/NewShapeTracks.js",
"../common/Drawings/TrackObjects/PolyLine.js",
"../common/Drawings/TrackObjects/ResizeTracks.js",
"../common/Drawings/TrackObjects/RotateTracks.js",
"../common/Drawings/TrackObjects/Spline.js",
"../common/Drawings/ArcTo.js",
"../common/Drawings/ColorArray.js",
"../common/Drawings/CommonController.js",
"../common/Drawings/DrawingObjectsHandlers.js",
"../common/Drawings/Hit.js",
"../common/Drawings/Joined.js",
"../common/Drawings/Math.js",
"../common/Drawings/Format/Shape.js",
"../common/Drawings/Format/Image.js",
"../common/Drawings/Format/GroupShape.js",
"../common/Drawings/Format/ChartSpace.js",
"../common/Drawings/Format/ChartFormat.js",
"../common/Drawings/Format/CreateGeometry.js",
"../common/Drawings/Format/Geometry.js",
"../common/Drawings/Format/Path.js",
"../common/Drawings/Format/TextBody.js",
"../common/Drawings/TextDrawer.js",
"../word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../word/Editor/GraphicObjects/DrawingStates.js",
"../word/Editor/GraphicObjects/GraphicObjects.js",
"../word/Editor/GraphicObjects/GraphicPage.js",
"../word/Editor/GraphicObjects/WrapManager.js",
"../word/Editor/CollaborativeEditing.js",
"../word/Editor/Comments.js",
"../word/Editor/History.js",
"../word/Editor/Styles.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
"../word/Editor/Run.js",
"../word/Editor/Math.js",
"../word/Editor/Paragraph.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/Numbering.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/Document.js",
"../word/Editor/Common.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Serialize2.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/Metafile.js",
"../word/Drawing/GraphicsEvents.js",
"../common/Scrolls/iscroll.js",
"../word/Drawing/WorkEvents.js",
"../common/Controls.js",
"../word/Drawing/Rulers.js",
"../word/Drawing/documentrenderer.js",
"../common/scroll.js",
"../word/Editor/SerializeCommon.js",
"../word/document/empty.js",
"../word/Math/mathTypes.js",
"../word/Math/mathText.js",
"../word/Math/mathContent.js",
"../word/Math/base.js",
"../word/Math/fraction.js",
"../word/Math/degree.js",
"../word/Math/matrix.js",
"../word/Math/limit.js",
"../word/Math/nary.js",
"../word/Math/radical.js",
"../word/Math/operators.js",
"../word/Math/accent.js",
"../word/Math/borderBox.js",
"../cell/utils/utils.js",
"../cell/model/CellComment.js",
"../cell/model/Serialize.js",
"../cell/model/WorkbookElems.js",
"../cell/model/Workbook.js",
"../cell/model/CellInfo.js",
"../common/AdvancedOptions.js",
"../common/commonDefines.js",
"../word/apiDefines.js",
"../word/apiCommon.js",
"../word/api.js",
"../common/Native/Wrappers/TextMeasurerWrapper.js",
"../common/Native/Wrappers/DrawingDocument.js",
"../common/Native/Wrappers/DrawingStream.js",
"../common/Native/Wrappers/ShapeDrawer.js",
"../common/Native/Wrappers/Overlay.js",
"../common/Native/Wrappers/HtmlPage.js",
"../common/Native/Wrappers/api.js",
"../common/Private/Locks.js"
],
"dst": "../word/sdk-all.js",
"externs": [
"../common/Native/jquery_native.js",
"../../web-apps/vendor/xregexp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../word/Build/Log"
},
"defines": {
"src": [],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdkjs/word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk_native"
]
}
}
\ No newline at end of file
{
"info": {
"version": "3.7.0",
"build": 148
},
"update_src": {
"revision": "HEAD",
"src": "../common ../word ../cell ../slide"
},
"compile": {
"sdk": {
"common": [
"../common/Build/License.js",
"../common/browser.js",
"../common/docscoapicommon.js",
"../common/docscoapi.js",
"../common/downloaderfiles.js",
"../common/apiCommon.js",
"../common/commonDefines.js",
"../common/editorscommon.js",
"../common/NumFormat.js",
"../common/Charts/charts.js",
"../common/Charts/DrawingArea.js",
"../common/Charts/DrawingObjects.js",
"../common/Charts/ChartsDrawer.js",
"../common/Charts/3DTransformation.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
"../common/FontsFreeType/FontManager.js",
"../common/FontsFreeType/font_map.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/WorkEvents.js",
"../word/Drawing/Externals.js",
"../word/Drawing/Metafile.js",
"../common/GlobalLoaders.js",
"../cell/apiDefines.js",
"../cell/document/empty-workbook.js",
"../cell/utils/utils.js",
"../cell/model/clipboard.js",
"../cell/model/autofilters.js",
"../cell/graphics/DrawingContext.js",
"../cell/graphics/pdfprinter.js",
"../cell/model/CollaborativeEditing.js",
"../cell/model/ConditionalFormatting.js",
"../cell/model/FormulaObjects/parserFormula.js",
"../cell/model/FormulaObjects/_xlfnFunctions.js",
"../cell/model/FormulaObjects/dateandtimeFunctions.js",
"../cell/model/FormulaObjects/engineeringFunctions.js",
"../cell/model/FormulaObjects/cubeFunctions.js",
"../cell/model/FormulaObjects/databaseFunctions.js",
"../cell/model/FormulaObjects/textanddataFunctions.js",
"../cell/model/FormulaObjects/statisticalFunctions.js",
"../cell/model/FormulaObjects/financialFunctions.js",
"../cell/model/FormulaObjects/mathematicFunctions.js",
"../cell/model/FormulaObjects/lookupandreferenceFunctions.js",
"../cell/model/FormulaObjects/informationFunctions.js",
"../cell/model/FormulaObjects/logicalFunctions.js",
"../cell/model/Serialize.js",
"../cell/model/WorkbookElems.js",
"../cell/model/Workbook.js",
"../cell/model/CellInfo.js",
"../common/AdvancedOptions.js",
"../cell/model/History.js",
"../cell/model/UndoRedo.js",
"../cell/model/CellComment.js",
"../cell/view/mobileTouch.js",
"../cell/view/iscroll.js",
"../cell/view/StringRender.js",
"../cell/view/CellTextRender.js",
"../cell/view/CellEditorView.js",
"../cell/view/WorksheetView.js",
"../cell/view/HandlerList.js",
"../cell/view/EventsController.js",
"../cell/view/WorkbookView.js",
"../common/scroll.js",
"../word/Editor/SerializeCommon.js",
"../common/Drawings/Math.js",
"../common/Drawings/ArcTo.js",
"../word/Drawing/ColorArray.js",
"../common/Shapes/Serialize.js",
"../common/Shapes/SerializeWriter.js",
"../common/SerializeCommonWordExcel.js",
"../common/SerializeChart.js",
"../common/Drawings/Hit.js",
"../common/Drawings/States.js",
"../common/Drawings/DrawingObjectsHandlers.js",
"../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../common/Drawings/TrackObjects/ResizeTracks.js",
"../common/Drawings/TrackObjects/RotateTracks.js",
"../common/Drawings/TrackObjects/NewShapeTracks.js",
"../common/Drawings/TrackObjects/PolyLine.js",
"../common/Drawings/TrackObjects/Spline.js",
"../common/Drawings/TrackObjects/MoveTracks.js",
"../common/Drawings/CommonController.js",
"../common/Drawings/Format/Constants.js",
"../common/Drawings/Format/Format.js",
"../common/Drawings/Format/CreateGeometry.js",
"../common/Drawings/Format/Geometry.js",
"../common/Drawings/Format/Path.js",
"../common/Drawings/Format/Shape.js",
"../common/Drawings/Format/GroupShape.js",
"../common/Drawings/Format/Image.js",
"../common/Drawings/Format/ChartSpace.js",
"../common/Drawings/Format/ChartFormat.js",
"../common/Drawings/Format/TextBody.js",
"../common/Drawings/TextDrawer.js",
"../common/wordcopypaste.js",
"../cell/view/DrawingObjectsController.js",
"../cell/model/DrawingObjects/Graphics.js",
"../cell/model/DrawingObjects/Overlay.js",
"../common/Controls.js",
"../cell/model/DrawingObjects/ShapeDrawer.js",
"../cell/model/DrawingObjects/DrawingDocument.js",
"../cell/model/DrawingObjects/Format/ShapePrototype.js",
"../cell/model/DrawingObjects/Format/ImagePrototype.js",
"../cell/model/DrawingObjects/Format/GroupPrototype.js",
"../cell/model/DrawingObjects/Format/ChartSpacePrototype.js",
"../slide/Editor/Format/GraphicFrame.js",
"../word/Editor/Comments.js",
"../word/Editor/Styles.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
"../word/Editor/Run.js",
"../word/Editor/Math.js",
"../word/Editor/Paragraph.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/Numbering.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Serialize2.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Editor/GraphicObjects/WrapManager.js",
"../word/Editor/Common.js",
"../word/Math/mathTypes.js",
"../word/Math/mathText.js",
"../word/Math/mathContent.js",
"../word/Math/base.js",
"../word/Math/fraction.js",
"../word/Math/degree.js",
"../word/Math/matrix.js",
"../word/Math/limit.js",
"../word/Math/nary.js",
"../word/Math/radical.js",
"../word/Math/operators.js",
"../word/Math/accent.js",
"../word/Math/borderBox.js",
"../common/CollaborativeEditingBase.js",
"../cell/model/DrawingObjects/GlobalCounters.js",
"../word/apiCommon.js",
"../cell/apiCommonExport.js",
"../common/apiBase.js",
"../cell/api.js"
],
"private": [
"../common/Private/license.js",
"../cell/Private/comments.js"
],
"desktop": [
"../common/Local/common.js",
"../cell/Local/api.js"
],
"exclude_mobile": [],
"dst": "../cell/sdk-all.js",
"externs": [
"../common/Build/Externs.js",
"../../web-apps/vendor/jquery/jquery.min.js",
"../../web-apps/vendor/underscore/underscore-min.js",
"../../web-apps/vendor/sockjs/sockjs.min.js",
"../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../web-apps/vendor/jszip/jszip.min.js",
"../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js",
"../../web-apps/vendor/perfect-scrollbar/src/jquery.mousewheel.js",
"../../web-apps/vendor/perfect-scrollbar/src/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../cell/Build/Log"
},
"defines": {
"src": [
"../common/Shapes/EditorSettings.js",
"../common/commonDefines.js",
"../cell/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdkjs/cell"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
\ No newline at end of file
{
"info": {
"version": "3.7.0",
"build": 158
},
"update_src": {
"revision": "HEAD",
"src": "../common ../word ../slide"
},
"compile": {
"sdk": {
"common": [
"../common/Build/License.js",
"../common/browser.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
"../common/FontsFreeType/FontManager.js",
"../common/FontsFreeType/font_map.js",
"../word/Drawing/Externals.js",
"../common/GlobalLoaders.js",
"../common/commonDefines.js",
"../common/apiCommon.js",
"../common/downloaderfiles.js",
"../common/docscoapicommon.js",
"../common/docscoapi.js",
"../common/wordcopypaste.js",
"../common/editorscommon.js",
"../slide/Drawing/ThemeLoader.js",
"../common/Charts/DrawingObjects.js",
"../common/SerializeCommonWordExcel.js",
"../common/SerializeChart.js",
"../common/Charts/charts.js",
"../common/Charts/ChartsDrawer.js",
"../common/Charts/3DTransformation.js",
"../common/Charts/DrawingArea.js",
"../common/NumFormat.js",
"../word/Editor/Serialize2.js",
"../word/Editor/Styles.js",
"../word/Editor/Numbering.js",
"../word/Drawing/Metafile.js",
"../common/CollaborativeEditingBase.js",
"../slide/Editor/CollaborativeEditing.js",
"../word/Drawing/GraphicsEvents.js",
"../word/Drawing/WorkEvents.js",
"../common/Controls.js",
"../word/Drawing/Rulers.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Common.js",
"../word/Editor/Sections.js",
"../common/scroll.js",
"../word/Editor/History.js",
"../common/Drawings/Hit.js",
"../common/Drawings/States.js",
"../common/Drawings/DrawingObjectsHandlers.js",
"../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../common/Drawings/TrackObjects/ResizeTracks.js",
"../common/Drawings/TrackObjects/RotateTracks.js",
"../common/Drawings/TrackObjects/NewShapeTracks.js",
"../common/Drawings/TrackObjects/PolyLine.js",
"../common/Drawings/TrackObjects/Spline.js",
"../common/Drawings/TrackObjects/MoveTracks.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../word/Drawing/ShapeDrawer.js",
"../slide/Drawing/Transitions.js",
"../slide/Drawing/DrawingDocument.js",
"../slide/Drawing/HtmlPage.js",
"../slide/apiDefines.js",
"../common/Drawings/Format/Constants.js",
"../common/Shapes/Serialize.js",
"../common/Shapes/SerializeWriter.js",
"../word/Editor/SerializeCommon.js",
"../common/Drawings/Math.js",
"../common/Drawings/ArcTo.js",
"../word/Drawing/ColorArray.js",
"../slide/Editor/Format/Presentation.js",
"../common/Drawings/CommonController.js",
"../cell/view/DrawingObjectsController.js",
"../slide/Editor/DrawingObjectsController.js",
"../common/Drawings/Format/Format.js",
"../common/Drawings/Format/CreateGeometry.js",
"../common/Drawings/Format/Geometry.js",
"../common/Drawings/Format/Path.js",
"../common/Drawings/Format/Shape.js",
"../common/Drawings/Format/Image.js",
"../common/Drawings/Format/GroupShape.js",
"../common/Drawings/Format/ChartSpace.js",
"../common/Drawings/Format/ChartFormat.js",
"../common/Drawings/Format/TextBody.js",
"../common/Drawings/TextDrawer.js",
"../slide/Editor/Format/Slide.js",
"../slide/Editor/Format/SlideMaster.js",
"../slide/Editor/Format/Layout.js",
"../slide/Editor/Format/Comments.js",
"../word/Editor/Styles.js",
"../word/Editor/Numbering.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
"../word/Editor/Run.js",
"../word/Math/mathTypes.js",
"../word/Math/mathText.js",
"../word/Math/mathContent.js",
"../word/Math/base.js",
"../word/Math/fraction.js",
"../word/Math/degree.js",
"../word/Math/matrix.js",
"../word/Math/limit.js",
"../word/Math/nary.js",
"../word/Math/radical.js",
"../word/Math/operators.js",
"../word/Math/accent.js",
"../word/Math/borderBox.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/Paragraph.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/Math.js",
"../word/Editor/Spelling.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
"../slide/Editor/Format/ShapePrototype.js",
"../slide/Editor/Format/ImagePrototype.js",
"../slide/Editor/Format/GroupPrototype.js",
"../slide/Editor/Format/ChartSpacePrototype.js",
"../slide/Editor/Format/GraphicFrame.js",
"../common/apiBase.js",
"../slide/api.js",
"../slide/apiCommon.js",
"../word/apiCommon.js",
"../slide/apiExport.js",
"../cell/utils/utils.js",
"../cell/model/Serialize.js",
"../cell/model/WorkbookElems.js",
"../cell/model/Workbook.js",
"../cell/model/CellInfo.js",
"../common/AdvancedOptions.js"
],
"private": [
"../common/Private/license.js",
"../slide/Private/comments.js",
"../common/Private/Locks.js"
],
"desktop": [
"../common/Local/common.js",
"../slide/Local/api.js"
],
"exclude_mobile": [],
"dst": "../slide/sdk-all.js",
"externs": [
"../common/Build/Externs.js",
"../../web-apps/vendor/jquery/jquery.min.js",
"../../web-apps/vendor/underscore/underscore-min.js",
"../../web-apps/vendor/sockjs/sockjs.min.js",
"../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../web-apps/vendor/jszip/jszip.min.js",
"../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../slide/Build/Log"
},
"defines": {
"src": [
"../common/Shapes/EditorSettings.js",
"../slide/themes/Themes.js",
"../slide/apiDefines.js",
"../common/commonDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdkjs/slide"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
\ No newline at end of file
{
"info": {
"version": "3.7.0",
"build": 167
},
"update_src": {
"revision": "HEAD",
"src": "../common ../word"
},
"compile": {
"sdk": {
"common": [
"../common/Build/License.js",
"../common/browser.js",
"../common/docscoapicommon.js",
"../common/docscoapi.js",
"../common/apiCommon.js",
"../common/spellcheckapi.js",
"../common/wordcopypaste.js",
"../common/spellCheckLanguage.js",
"../common/spellCheckLanguagesAll.js",
"../common/downloaderfiles.js",
"../common/commonDefines.js",
"../common/editorscommon.js",
"../common/Shapes/Serialize.js",
"../common/Shapes/SerializeWriter.js",
"../common/SerializeCommonWordExcel.js",
"../common/SerializeChart.js",
"../common/Drawings/Format/Constants.js",
"../common/Drawings/Format/Format.js",
"../common/FontsFreeType/font_engine.js",
"../common/FontsFreeType/FontFile.js",
"../common/FontsFreeType/FontManager.js",
"../common/FontsFreeType/font_map.js",
"../word/Drawing/Externals.js",
"../common/GlobalLoaders.js",
"../word/Drawing/translations.js",
"../common/Charts/charts.js",
"../common/Charts/ChartsDrawer.js",
"../common/Charts/3DTransformation.js",
"../common/Charts/DrawingArea.js",
"../common/Charts/DrawingObjects.js",
"../common/NumFormat.js",
"../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../common/Drawings/TrackObjects/MoveTracks.js",
"../common/Drawings/TrackObjects/NewShapeTracks.js",
"../common/Drawings/TrackObjects/PolyLine.js",
"../common/Drawings/TrackObjects/ResizeTracks.js",
"../common/Drawings/TrackObjects/RotateTracks.js",
"../common/Drawings/TrackObjects/Spline.js",
"../common/Drawings/ArcTo.js",
"../common/Drawings/ColorArray.js",
"../common/Drawings/CommonController.js",
"../common/Drawings/DrawingObjectsHandlers.js",
"../common/Drawings/Hit.js",
"../common/Drawings/Joined.js",
"../common/Drawings/Math.js",
"../common/Drawings/Format/Shape.js",
"../common/Drawings/Format/Image.js",
"../common/Drawings/Format/GroupShape.js",
"../common/Drawings/Format/ChartSpace.js",
"../common/Drawings/Format/ChartFormat.js",
"../common/Drawings/Format/CreateGeometry.js",
"../common/Drawings/Format/Geometry.js",
"../common/Drawings/Format/Path.js",
"../common/Drawings/Format/TextBody.js",
"../common/Drawings/TextDrawer.js",
"../word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../slide/Editor/Format/GraphicFrame.js",
"../word/Editor/GraphicObjects/DrawingStates.js",
"../word/Editor/GraphicObjects/GraphicObjects.js",
"../word/Editor/GraphicObjects/GraphicPage.js",
"../word/Editor/GraphicObjects/WrapManager.js",
"../word/Editor/CollaborativeEditing.js",
"../word/Editor/Comments.js",
"../word/Editor/History.js",
"../word/Editor/Styles.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
"../word/Editor/Run.js",
"../word/Editor/Math.js",
"../word/Editor/Paragraph.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/Numbering.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/Document.js",
"../word/Editor/Common.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Serialize2.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/ShapeDrawer.js",
"../word/Drawing/Metafile.js",
"../common/CollaborativeEditingBase.js",
"../word/Drawing/DrawingDocument.js",
"../word/Drawing/GraphicsEvents.js",
"../common/Scrolls/iscroll.js",
"../word/Drawing/WorkEvents.js",
"../common/Controls.js",
"../word/Drawing/Rulers.js",
"../word/Drawing/HtmlPage.js",
"../word/Drawing/documentrenderer.js",
"../common/scroll.js",
"../word/Editor/SerializeCommon.js",
"../word/apiDefines.js",
"../common/apiBase.js",
"../word/api.js",
"../word/apiCommon.js",
"../word/apiExport.js",
"../word/document/empty.js",
"../word/Math/mathTypes.js",
"../word/Math/mathText.js",
"../word/Math/mathContent.js",
"../word/Math/base.js",
"../word/Math/fraction.js",
"../word/Math/degree.js",
"../word/Math/matrix.js",
"../word/Math/limit.js",
"../word/Math/nary.js",
"../word/Math/radical.js",
"../word/Math/operators.js",
"../word/Math/accent.js",
"../word/Math/borderBox.js",
"../cell/utils/utils.js",
"../cell/model/CellComment.js",
"../cell/model/Serialize.js",
"../cell/model/WorkbookElems.js",
"../cell/model/Workbook.js",
"../cell/model/CellInfo.js",
"../common/AdvancedOptions.js"
],
"private": [
"../common/Private/license.js",
"../common/Private/versionHistory.js",
"../word/Private/comments.js",
"../word/Private/StyleManager.js",
"../word/Private/MailMerge.js",
"../word/Private/TrackRevisions.js",
"../common/Private/Locks.js"
],
"desktop": [
"../common/Local/common.js",
"../word/Local/api.js"
],
"exclude_mobile": [
],
"dst": "../word/sdk-all.js",
"externs": [
"../common/Build/Externs.js",
"../../web-apps/vendor/jquery/jquery.min.js",
"../../web-apps/vendor/underscore/underscore-min.js",
"../../web-apps/vendor/sockjs/sockjs.min.js",
"../../web-apps/vendor/xregexp/xregexp-all-min.js",
"../../web-apps/vendor/jszip/jszip.min.js",
"../../web-apps/vendor/jszip-utils/jszip-utils.min.js",
"../../web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../word/Build/Log"
},
"defines": {
"src": [
"../common/Shapes/EditorSettings.js",
"../common/commonDefines.js",
"../word/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdkjs/word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk"
]
}
}
\ No newline at end of file
@echo off
cd /D %~dp0
SET GRUNT_OLD=grunt@0.3.17
SET GRUNT_CLI=grunt-cli
echo Check is there old grunt installed.
call npm list -g %GRUNT_OLD% && call npm uninstall -g grunt
echo Installation grunt-cli
call npm list -g %GRUNT_CLI% || call npm install -g %GRUNT_CLI%
call npm install
{
"name": "common",
"version": "0.0.0",
"homepage": "http://www.teamlab.com",
"private": true,
"dependencies": {
"grunt": "0.4.2",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.3.0",
"grunt-contrib-copy": "0.5.0",
"grunt-exec": "0.4.5",
"grunt-replace": "0.7.3",
"grunt-closure-tools": "0.9.9"
}
}
\ No newline at end of file
{
"info": {
"version": "3.6.0",
"build": 163
},
"update_src": {
"revision": "HEAD",
"src": "../../common ../../word"
},
"compile": {
"sdk": {
"src": [
"../../common/Native/Wrappers/memory.js",
"../../common/Build/License.js",
"../../common/browser.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/apiCommon.js",
"../../common/spellcheckapi.js",
"../../common/wordcopypaste.js",
"../../common/spellCheckLanguage.js",
"../../common/spellCheckLanguagesAll.js",
"../../common/downloaderfiles.js",
"../../common/commonDefines.js",
"../../common/editorscommon.js",
"../../common/Private/editorscommon.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Drawings/Format/Format.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/Externals.js",
"../../word/Drawing/GlobalLoaders.js",
"../../word/Drawing/translations.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/NumFormat.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/ArcTo.js",
"../../common/Drawings/ColorArray.js",
"../../common/Drawings/CommonController.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/Joined.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../../word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../../word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../../word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../../word/Editor/GraphicObjects/DrawingStates.js",
"../../word/Editor/GraphicObjects/GraphicObjects.js",
"../../word/Editor/GraphicObjects/GraphicPage.js",
"../../word/Editor/GraphicObjects/WrapManager.js",
"../../word/Editor/CollaborativeEditing.js",
"../../word/Editor/Comments.js",
"../../word/Editor/History.js",
"../../word/Editor/Styles.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Editor/Math.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Sections.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Document.js",
"../../word/Editor/Common.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Table/TableRecalculate.js",
"../../word/Editor/Table/TableDraw.js",
"../../word/Editor/Table/TableRow.js",
"../../word/Editor/Table/TableCell.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
"../../word/Editor/Spelling.js",
"../../word/Drawing/Graphics.js",
"../../word/Drawing/Overlay.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/Metafile.js",
"../../word/Drawing/GraphicsEvents.js",
"../../common/Scrolls/iscroll.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Drawing/documentrenderer.js",
"../../common/scroll.js",
"../../word/Editor/SerializeCommon.js",
"../../word/document/empty.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../cell/utils/utils.js",
"../../cell/model/CellComment.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../common/commonDefines.js",
"../../word/apiDefines.js",
"../../word/apiCommon.js",
"../../word/api.js",
"../../common/Native/Wrappers/TextMeasurerWrapper.js",
"../../common/Native/Wrappers/DrawingDocument.js",
"../../common/Native/Wrappers/DrawingStream.js",
"../../common/Native/Wrappers/ShapeDrawer.js",
"../../common/Native/Wrappers/Overlay.js",
"../../common/Native/Wrappers/HtmlPage.js",
"../../common/Native/Wrappers/api.js",
"../../common/Private/Locks.js"
],
"dst": "../../word/sdk-all.js",
"externs": [
"../../common/Native/jquery_native.js",
"../../common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../word/Build/Log"
},
"defines": {
"src": [],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdkjs/word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk_native"
]
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"closure_compiler": "compiler.jar",
"menu_path": "../../../menu/sdk"
}
\ No newline at end of file
@echo off
cd /D %~dp0
echo Installation grunt-cli
echo Installation
call npm install -g grunt-cli
call npm install
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
module.exports = function(grunt) {
var defaultConfig, packageFile;
grunt.loadNpmTasks('grunt-contrib');
grunt.registerTask('build_webword_init', 'Initialize build WebWord SDK.', function(){
defaultConfig = './webword.json';
packageFile = require(defaultConfig);
if (packageFile)
grunt.log.ok('WebWord config loaded successfully'.green);
else
grunt.log.error().writeln('Could not load config file'.red);
});
grunt.registerTask('build_webexcel_init', 'Initialize build WebExcel SDK.', function(){
defaultConfig = './webexcel.json';
packageFile = require(defaultConfig);
if (packageFile)
grunt.log.ok('WebExcel config loaded successfully'.green);
else
grunt.log.error().writeln('Could not load config file'.red);
});
grunt.registerTask('build_webpowerpoint_init', 'Initialize build WebPowerPoint SDK.', function(){
defaultConfig = './webpowerpoint.json';
packageFile = require(defaultConfig);
if (packageFile)
grunt.log.ok('WebPowerPoint config loaded successfully'.green);
else
grunt.log.error().writeln('Could not load config file'.red);
});
grunt.registerTask('build_sdk', 'Build sdk.', function(){
if (packageFile) {
if (packageFile['tasks']['build'])
grunt.task.run(packageFile['tasks']['build']);
else
grunt.log.error().writeln('Not found "build" task in configure'.red);
} else {
grunt.log.error().writeln('Is not load configure file.'.red);
}
});
grunt.registerTask('build_webword', ['build_webword_init', 'build_sdk']);
grunt.registerTask('build_webexcel', ['build_webexcel_init', 'build_sdk']);
grunt.registerTask('build_webpowerpoint', ['build_webpowerpoint_init', 'build_sdk']);
grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
grunt.registerTask('compile_sdk_init', function() {
var pkg = grunt.file.readJSON(defaultConfig);
pkg.info.rev = "unknown";
if(undefined !== process.env['BUILD_NUMBER'])
pkg.info.build = parseInt(process.env['BUILD_NUMBER']);
if(undefined !== process.env['SVN_REVISION'])
pkg.info.rev = parseInt(process.env['SVN_REVISION']);
grunt.initConfig({
pkg: pkg,
uglify: {
options: {
banner: '/*\n' +
' * (c) Copyright Ascensio System SIA 2010-<%= grunt.template.today("yyyy") %>\n' +
' *\n' +
' * This program is a free software product. You can redistribute it and/or \n' +
' * modify it under the terms of the GNU Affero General Public License (AGPL) \n' +
' * version 3 as published by the Free Software Foundation. In accordance with \n' +
' * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \n' +
' * that Ascensio System SIA expressly excludes the warranty of non-infringement\n' +
' * of any third-party rights.\n' +
' *\n' +
' * This program is distributed WITHOUT ANY WARRANTY; without even the implied \n' +
' * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For \n' +
' * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html\n' +
' *\n' +
' * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,\n' +
' * EU, LV-1021.\n' +
' *\n' +
' * The interactive user interfaces in modified source and object code versions\n' +
' * of the Program must display Appropriate Legal Notices, as required under \n' +
' * Section 5 of the GNU AGPL version 3.\n' +
' *\n' +
' * Pursuant to Section 7(b) of the License you must retain the original Product\n' +
' * logo when distributing the program. Pursuant to Section 7(e) we decline to\n' +
' * grant you any rights under trademark law for use of our trademarks.\n' +
' *\n' +
' * All the Product\'s GUI elements, including illustrations and icon sets, as\n' +
' * well as technical writing content are licensed under the terms of the\n' +
' * Creative Commons Attribution-ShareAlike 4.0 International. See the License\n' +
' * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode\n' +
' *\n' +
' * Version: <%= pkg.info.version %> (build:<%= pkg.info.build %>, rev:<%= pkg.info.rev %>)\n' +
' */'
},
sdk: {
src: packageFile['compile']["sdk"]['src'],
dest: packageFile['compile']["sdk"]['dst']
}
}
});
});
grunt.registerTask('compile_sdk', ['compile_sdk_init', 'uglify']);
grunt.registerTask('default', 'build_all');
};
\ No newline at end of file
@echo off
cd /D %~dp0
@echo on
call grunt.cmd --no-color
{
"name": "common",
"version": "0.0.0",
"homepage": "http://www.onlyoffice.com",
"private": true,
"dependencies": {
"grunt": "0.4.2",
"grunt-contrib": "0.9.0"
}
}
\ No newline at end of file
{
"info": {
"version": "3.5.0",
"build": 1,
"homepage": "http://www.onlyoffice.com"
},
"compile": {
"sdk": {
"src": [
"../../common/browser.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/downloaderfiles.js",
"../../common/apiCommon.js",
"../../common/commonDefines.js",
"../../common/editorscommon.js",
"../../common/NumFormat.js",
"../../common/Charts/charts.js",
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/WorkEvents.js",
"../../word/Drawing/Externals.js",
"../../word/Drawing/Metafile.js",
"../../common/GlobalLoaders.js",
"../../cell/apiDefines.js",
"../../cell/document/empty-workbook.js",
"../../cell/utils/utils.js",
"../../cell/model/clipboard.js",
"../../cell/model/autofilters.js",
"../../cell/graphics/DrawingContext.js",
"../../cell/graphics/pdfprinter.js",
"../../cell/model/CollaborativeEditing.js",
"../../cell/model/ConditionalFormatting.js",
"../../cell/model/FormulaObjects/parserFormula.js",
"../../cell/model/FormulaObjects/_xlfnFunctions.js",
"../../cell/model/FormulaObjects/dateandtimeFunctions.js",
"../../cell/model/FormulaObjects/engineeringFunctions.js",
"../../cell/model/FormulaObjects/cubeFunctions.js",
"../../cell/model/FormulaObjects/databaseFunctions.js",
"../../cell/model/FormulaObjects/textanddataFunctions.js",
"../../cell/model/FormulaObjects/statisticalFunctions.js",
"../../cell/model/FormulaObjects/financialFunctions.js",
"../../cell/model/FormulaObjects/mathematicFunctions.js",
"../../cell/model/FormulaObjects/lookupandreferenceFunctions.js",
"../../cell/model/FormulaObjects/informationFunctions.js",
"../../cell/model/FormulaObjects/logicalFunctions.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../cell/model/History.js",
"../../cell/model/UndoRedo.js",
"../../cell/model/CellComment.js",
"../../cell/view/mobileTouch.js",
"../../cell/view/iscroll.js",
"../../cell/view/StringRender.js",
"../../cell/view/CellTextRender.js",
"../../cell/view/CellEditorView.js",
"../../cell/view/WorksheetView.js",
"../../cell/view/HandlerList.js",
"../../cell/view/EventsController.js",
"../../cell/view/WorkbookView.js",
"../../common/scroll.js",
"../../word/Editor/SerializeCommon.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/ArcTo.js",
"../../word/Drawing/ColorArray.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/States.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../common/Drawings/CommonController.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Drawings/Format/Format.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../common/wordcopypaste.js",
"../../cell/view/DrawingObjectsController.js",
"../../cell/model/DrawingObjects/Graphics.js",
"../../cell/model/DrawingObjects/Overlay.js",
"../../common/Controls.js",
"../../cell/model/DrawingObjects/ShapeDrawer.js",
"../../cell/model/DrawingObjects/DrawingDocument.js",
"../../cell/model/DrawingObjects/Format/ShapePrototype.js",
"../../cell/model/DrawingObjects/Format/ImagePrototype.js",
"../../cell/model/DrawingObjects/Format/GroupPrototype.js",
"../../cell/model/DrawingObjects/Format/ChartSpacePrototype.js",
"../../slide/Editor/Format/GraphicFrame.js",
"../../word/Editor/Comments.js",
"../../word/Editor/Styles.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Editor/Math.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Sections.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Document.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/FontClassification.js",
"../../word/Editor/Spelling.js",
"../../word/Editor/GraphicObjects/WrapManager.js",
"../../word/Editor/Common.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../common/CollaborativeEditingBase.js",
"../../cell/model/DrawingObjects/GlobalCounters.js",
"../../word/apiCommon.js",
"../../common/apiBase.js",
"../../cell/api.js",
"../../common/Shapes/EditorSettings.js"
],
"dst": "../../cell/sdk-all.js"
}
},
"tasks": {
"build": "compile_sdk"
}
}
\ No newline at end of file
{
"info": {
"version": "3.5.0",
"build": 1,
"homepage": "http://www.onlyoffice.com"
},
"compile": {
"sdk": {
"src": [
"../../common/browser.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/Externals.js",
"../../common/GlobalLoaders.js",
"../../common/commonDefines.js",
"../../common/apiCommon.js",
"../../common/downloaderfiles.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/wordcopypaste.js",
"../../common/editorscommon.js",
"../../slide/Drawing/ThemeLoader.js",
"../../common/Charts/DrawingObjects.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/DrawingArea.js",
"../../common/NumFormat.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Styles.js",
"../../word/Editor/Numbering.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../slide/Editor/CollaborativeEditing.js",
"../../word/Drawing/GraphicsEvents.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Editor/Table.js",
"../../word/Editor/Common.js",
"../../word/Editor/Sections.js",
"../../common/scroll.js",
"../../word/Editor/History.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/States.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/Graphics.js",
"../../word/Drawing/Overlay.js",
"../../word/Drawing/ShapeDrawer.js",
"../../slide/Drawing/Transitions.js",
"../../slide/Drawing/DrawingDocument.js",
"../../slide/Drawing/HtmlPage.js",
"../../slide/apiDefines.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../word/Editor/SerializeCommon.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/ArcTo.js",
"../../word/Drawing/ColorArray.js",
"../../slide/Editor/Format/Presentation.js",
"../../common/Drawings/CommonController.js",
"../../cell/view/DrawingObjectsController.js",
"../../slide/Editor/DrawingObjectsController.js",
"../../common/Drawings/Format/Format.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../slide/Editor/Format/Slide.js",
"../../slide/Editor/Format/SlideMaster.js",
"../../slide/Editor/Format/Layout.js",
"../../slide/Editor/Format/Comments.js",
"../../word/Editor/Styles.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Document.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Table.js",
"../../word/Editor/Math.js",
"../../word/Editor/Spelling.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
"../../slide/Editor/Format/ShapePrototype.js",
"../../slide/Editor/Format/ImagePrototype.js",
"../../slide/Editor/Format/GroupPrototype.js",
"../../slide/Editor/Format/ChartSpacePrototype.js",
"../../slide/Editor/Format/GraphicFrame.js",
"../../common/apiBase.js",
"../../slide/api.js",
"../../slide/apiCommon.js",
"../../word/apiCommon.js",
"../../cell/utils/utils.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../common/Shapes/EditorSettings.js",
"../../slide/themes/Themes.js"
],
"dst": "../../slide/sdk-all.js"
}
},
"tasks": {
"build": "compile_sdk"
}
}
\ No newline at end of file
{
"info": {
"version": "3.5.0",
"build": 1,
"homepage": "http://www.onlyoffice.com"
},
"compile": {
"sdk": {
"src": [
"../../common/browser.js",
"../../common/docscoapicommon.js",
"../../common/docscoapi.js",
"../../common/apiCommon.js",
"../../common/spellcheckapi.js",
"../../common/wordcopypaste.js",
"../../common/spellCheckLanguage.js",
"../../common/spellCheckLanguagesAll.js",
"../../common/downloaderfiles.js",
"../../common/commonDefines.js",
"../../common/editorscommon.js",
"../../common/Shapes/Serialize.js",
"../../common/Shapes/SerializeWriter.js",
"../../common/SerializeCommonWordExcel.js",
"../../common/SerializeChart.js",
"../../common/Drawings/Format/Constants.js",
"../../common/Drawings/Format/Format.js",
"../../common/FontsFreeType/font_engine.js",
"../../common/FontsFreeType/FontFile.js",
"../../common/FontsFreeType/FontManager.js",
"../../common/FontsFreeType/font_map.js",
"../../word/Drawing/Externals.js",
"../../common/GlobalLoaders.js",
"../../word/Drawing/translations.js",
"../../common/Charts/charts.js",
"../../common/Charts/ChartsDrawer.js",
"../../common/Charts/DrawingArea.js",
"../../common/Charts/DrawingObjects.js",
"../../common/NumFormat.js",
"../../common/Drawings/TrackObjects/AdjustmentTracks.js",
"../../common/Drawings/TrackObjects/MoveTracks.js",
"../../common/Drawings/TrackObjects/NewShapeTracks.js",
"../../common/Drawings/TrackObjects/PolyLine.js",
"../../common/Drawings/TrackObjects/ResizeTracks.js",
"../../common/Drawings/TrackObjects/RotateTracks.js",
"../../common/Drawings/TrackObjects/Spline.js",
"../../common/Drawings/ArcTo.js",
"../../common/Drawings/ColorArray.js",
"../../common/Drawings/CommonController.js",
"../../common/Drawings/DrawingObjectsHandlers.js",
"../../common/Drawings/Hit.js",
"../../common/Drawings/Joined.js",
"../../common/Drawings/Math.js",
"../../common/Drawings/Format/Shape.js",
"../../common/Drawings/Format/Image.js",
"../../common/Drawings/Format/GroupShape.js",
"../../common/Drawings/Format/ChartSpace.js",
"../../common/Drawings/Format/ChartFormat.js",
"../../common/Drawings/Format/CreateGeometry.js",
"../../common/Drawings/Format/Geometry.js",
"../../common/Drawings/Format/Path.js",
"../../common/Drawings/Format/TextBody.js",
"../../common/Drawings/TextDrawer.js",
"../../word/Editor/GraphicObjects/Format/ShapePrototype.js",
"../../word/Editor/GraphicObjects/Format/ImagePrototype.js",
"../../word/Editor/GraphicObjects/Format/GroupPrototype.js",
"../../word/Editor/GraphicObjects/Format/ChartSpacePrototype.js",
"../../slide/Editor/Format/GraphicFrame.js",
"../../word/Editor/GraphicObjects/DrawingStates.js",
"../../word/Editor/GraphicObjects/GraphicObjects.js",
"../../word/Editor/GraphicObjects/GraphicPage.js",
"../../word/Editor/GraphicObjects/WrapManager.js",
"../../word/Editor/CollaborativeEditing.js",
"../../word/Editor/Comments.js",
"../../word/Editor/History.js",
"../../word/Editor/Styles.js",
"../../word/Editor/FlowObjects.js",
"../../word/Editor/ParagraphContent.js",
"../../word/Editor/ParagraphContentBase.js",
"../../word/Editor/Hyperlink.js",
"../../word/Editor/Field.js",
"../../word/Editor/Run.js",
"../../word/Editor/Math.js",
"../../word/Editor/Paragraph.js",
"../../word/Editor/Paragraph_Recalculate.js",
"../../word/Editor/Sections.js",
"../../word/Editor/Numbering.js",
"../../word/Editor/HeaderFooter.js",
"../../word/Editor/Document.js",
"../../word/Editor/Common.js",
"../../word/Editor/DocumentContent.js",
"../../word/Editor/Table.js",
"../../word/Editor/Serialize2.js",
"../../word/Editor/Search.js",
"../../word/Editor/FontClassification.js",
"../../word/Editor/Spelling.js",
"../../word/Drawing/Graphics.js",
"../../word/Drawing/Overlay.js",
"../../word/Drawing/HatchPattern.js",
"../../word/Drawing/ShapeDrawer.js",
"../../word/Drawing/Metafile.js",
"../../common/CollaborativeEditingBase.js",
"../../word/Drawing/DrawingDocument.js",
"../../word/Drawing/GraphicsEvents.js",
"../../common/Scrolls/iscroll.js",
"../../word/Drawing/WorkEvents.js",
"../../common/Controls.js",
"../../word/Drawing/Rulers.js",
"../../word/Drawing/HtmlPage.js",
"../../word/Drawing/documentrenderer.js",
"../../common/scroll.js",
"../../word/Editor/SerializeCommon.js",
"../../word/apiDefines.js",
"../../common/apiBase.js",
"../../word/api.js",
"../../word/apiCommon.js",
"../../word/document/empty.js",
"../../word/Math/mathTypes.js",
"../../word/Math/mathText.js",
"../../word/Math/mathContent.js",
"../../word/Math/base.js",
"../../word/Math/fraction.js",
"../../word/Math/degree.js",
"../../word/Math/matrix.js",
"../../word/Math/limit.js",
"../../word/Math/nary.js",
"../../word/Math/radical.js",
"../../word/Math/operators.js",
"../../word/Math/accent.js",
"../../word/Math/borderBox.js",
"../../cell/utils/utils.js",
"../../cell/model/CellComment.js",
"../../cell/model/Serialize.js",
"../../cell/model/WorkbookElems.js",
"../../cell/model/Workbook.js",
"../../cell/model/CellInfo.js",
"../../common/AdvancedOptions.js",
"../../common/Shapes/EditorSettings.js"
],
"dst": "../../word/sdk-all.js"
}
},
"tasks": {
"build": "compile_sdk"
}
}
\ No newline at end of file
{
"name": "common",
"version": "0.0.0",
"homepage": "http://www.teamlab.com",
"private": true,
"dependencies": {
"google-closure-compiler": "^20160315.0.0",
"grunt": "0.4.5",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.3.0",
"grunt-contrib-copy": "0.5.0",
"grunt-exec": "0.4.5",
"grunt-replace": "0.7.3"
}
}
......@@ -2,6 +2,6 @@
cd /D %~dp0
@echo on
call grunt.cmd
call grunt
pause
\ No newline at end of file
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/**
* app.js
*
* Created by Maxim Kadushkin on 21 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
*
*/
'use strict';
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
//allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/Excel/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
keymaster : 'common/main/lib/core/keymaster',
tip : 'common/main/lib/util/Tip',
localstorage : 'common/main/lib/util/LocalStorage',
analytics : 'common/Analytics',
gateway : 'common/Gateway',
locale : 'common/locale',
irregularstack : 'common/IrregularStack'
},
shim: {
underscore: {
exports: '_'
},
backbone: {
deps: [
'underscore',
'jquery'
],
exports: 'Backbone'
},
bootstrap: {
deps: [
'jquery'
]
},
perfectscrollbar: {
deps: [
'jmousewheel'
]
},
notification: {
deps: [
'backbone'
]
},
core: {
deps: [
'backbone',
'notification',
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
]
},
analytics: {
deps: [
'jquery'
]
}
}
});
require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils',
'jsrsasign',
//'allfonts',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
/**
* Application instance with SSE namespace defined
*/
var app = new Backbone.Application({
nameSpace: 'SSE',
autoCreate: false,
controllers : [
'Viewport',
'DocumentHolder',
'CellEditor',
'FormulaDialog',
'Print',
'Toolbar',
'Statusbar',
'RightMenu',
'LeftMenu',
'Main',
'Common.Controllers.Fonts',
'Common.Controllers.Chat',
'Common.Controllers.Comments'
]
});
Common.Locale.apply();
require([
'spreadsheeteditor/main/app/controller/Viewport',
'spreadsheeteditor/main/app/controller/DocumentHolder',
'spreadsheeteditor/main/app/controller/CellEditor',
'spreadsheeteditor/main/app/controller/Toolbar',
'spreadsheeteditor/main/app/controller/Statusbar',
'spreadsheeteditor/main/app/controller/RightMenu',
'spreadsheeteditor/main/app/controller/LeftMenu',
'spreadsheeteditor/main/app/controller/Main',
'spreadsheeteditor/main/app/controller/Print',
'spreadsheeteditor/main/app/view/ParagraphSettings',
'spreadsheeteditor/main/app/view/ImageSettings',
'spreadsheeteditor/main/app/view/ChartSettings',
'spreadsheeteditor/main/app/view/ShapeSettings',
'spreadsheeteditor/main/app/view/TextArtSettings',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts',
'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat'
], function() {
app.start();
});
});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -3186,18 +3186,18 @@ function CDrawingDocument(drawingObjects)
this.SelectEnabled = function(bIsEnabled)
{
// this.m_bIsSelection = bIsEnabled;
// if (false === this.m_bIsSelection)
// {
// this.SelectClear();
this.m_bIsSelection = bIsEnabled;
if (false === this.m_bIsSelection)
{
this.SelectClear();
// //this.m_oWordControl.CheckUnShowOverlay();
// //this.drawingObjects.OnUpdateOverlay();
// this.drawingObjects.getOverlay().m_oContext.globalAlpha = 1.0;
// }
}
}
this.SelectClear = function()
{
this.Native["DD_SelectClear"]();
}
this.SearchClear = function()
{
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -631,7 +631,7 @@ function CFontFile(fileName, faceIndex)
oSizes.oBBox.fMinY = (yMin >> 6);
oSizes.oBBox.fMaxY = (yMax >> 6);
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
oSizes.fAdvanceX += 1;
var dstM = oSizes.oMetrics;
......@@ -710,7 +710,7 @@ function CFontFile(fileName, faceIndex)
pString.SetBBox( nIndex, charSymbolObj.oBBox.fMinX, charSymbolObj.oBBox.fMaxY, charSymbolObj.oBBox.fMaxX, charSymbolObj.oBBox.fMinY );
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
fPenX += 1;
......@@ -982,7 +982,7 @@ function CFontFile(fileName, faceIndex)
pString.SetBBox (nIndex, charSymbolObj.oBBox.fMinX, charSymbolObj.oBBox.fMaxY, charSymbolObj.oBBox.fMaxX, charSymbolObj.oBBox.fMinY);
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
fPenX += 1;
......@@ -1271,7 +1271,7 @@ function CFontFile(fileName, faceIndex)
}
fPenX += charSymbolObj.fAdvanceX + this.m_fCharSpacing;
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
{
// Когда текст делаем жирным сами, то мы увеличиваем расстояние на 1 пиксель в ширину (независимо от DPI и размера текста всегда 1 пиксель)
//fPenX += 1;
......@@ -1437,7 +1437,7 @@ function CFontFile(fileName, faceIndex)
oSizes.oBBox.fMinY = (yMin >> 6);
oSizes.oBBox.fMaxY = (yMax >> 6);
if (this.m_bNeedDoBold)
if (this.m_bNeedDoBold && this.m_oFontManager.IsAdvanceNeedBoldFonts)
oSizes.fAdvanceX += 1;
var dstM = oSizes.oMetrics;
......
......@@ -1335,6 +1335,8 @@ function CFontManager()
this.LOAD_MODE = 40970;
this.IsAdvanceNeedBoldFonts = true;
this.AfterLoad = function()
{
if (null == this.m_pFont)
......@@ -1719,4 +1721,9 @@ function CFontManager()
this.LOAD_MODE = 40970;
}
}
this.SetAdvanceNeedBoldFonts = function(value)
{
this.IsAdvanceNeedBoldFonts = value;
}
}
\ No newline at end of file
......@@ -710,7 +710,6 @@
DocsCoApi.prototype.disconnect = function() {
// Отключаемся сами
clearInterval(this.pingIntervalID);
this.isCloseCoAuthoring = true;
this._send({"type": "close"});
this._state = ConnectionState.ClosedCoAuth;
......@@ -740,10 +739,6 @@
}
};
DocsCoApi.prototype.ping = function() {
this._send({'type': 'ping'});
};
DocsCoApi.prototype._sendPrebuffered = function() {
for (var i = 0; i < this._msgBuffer.length; i++) {
this._sendRaw(this._msgBuffer[i]);
......@@ -1154,8 +1149,6 @@
//Send prebuffered
this._sendPrebuffered();
this.pingIntervalID = setInterval(function() {t.ping();}, this.pingInterval);
}
//TODO: Add errors
};
......@@ -1173,9 +1166,6 @@
this._isAuth = false;
this._documentFormatSave = documentFormatSave;
this.pingInterval = 60 * 1000;
this.pingIntervalID = null;
this._initSocksJs();
};
DocsCoApi.prototype.getDocId = function() {
......@@ -1300,7 +1290,7 @@
}
}
t._state = ConnectionState.Reconnect;
var bIsDisconnectAtAll = t.attemptCount >= t.maxAttemptCount;
var bIsDisconnectAtAll = (4001 === evt.code || t.attemptCount >= t.maxAttemptCount);
if (bIsDisconnectAtAll) {
t._state = ConnectionState.ClosedAll;
}
......@@ -1308,7 +1298,7 @@
t.onDisconnect(evt.reason, bIsDisconnectAtAll, t.isCloseCoAuthoring);
}
//Try reconect
if (t.attemptCount < t.maxAttemptCount) {
if (!bIsDisconnectAtAll) {
t._tryReconnect();
}
};
......
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/**
* app.js
*
* Created by Julia Radzhabova on 26 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
*
*/
'use strict';
require.config({
// The shim config allows us to configure dependencies for
// scripts that do not call define() to register a module
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
//allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/PowerPoint/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
keymaster : 'common/main/lib/core/keymaster',
tip : 'common/main/lib/util/Tip',
localstorage : 'common/main/lib/util/LocalStorage',
analytics : 'common/Analytics',
gateway : 'common/Gateway',
locale : 'common/locale',
irregularstack : 'common/IrregularStack'
},
shim: {
underscore: {
exports: '_'
},
backbone: {
deps: [
'underscore',
'jquery'
],
exports: 'Backbone'
},
bootstrap: {
deps: [
'jquery'
]
},
perfectscrollbar: {
deps: [
'jmousewheel'
]
},
notification: {
deps: [
'backbone'
]
},
core: {
deps: [
'backbone',
'notification',
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
]
},
analytics: {
deps: [
'jquery'
]
}
}
});
require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils',
'jsrsasign',
//'allfonts',
'sockjs',
'xregexp',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
/**
* Application instance with PE namespace defined
*/
var app = new Backbone.Application({
nameSpace: 'PE',
autoCreate: false,
controllers : [
'Viewport',
'DocumentHolder',
'Toolbar',
'Statusbar',
'RightMenu',
'LeftMenu',
'Main',
'Common.Controllers.Fonts'
/** coauthoring begin **/
, 'Common.Controllers.Chat',
'Common.Controllers.Comments',
/** coauthoring end **/
/** proprietary begin **/
'Common.Controllers.ExternalDiagramEditor'
/** proprietary end **/
]
});
Common.Locale.apply();
require([
'presentationeditor/main/app/controller/Viewport',
'presentationeditor/main/app/controller/DocumentHolder',
'presentationeditor/main/app/controller/Toolbar',
'presentationeditor/main/app/controller/Statusbar',
'presentationeditor/main/app/controller/RightMenu',
'presentationeditor/main/app/controller/LeftMenu',
'presentationeditor/main/app/controller/Main',
'presentationeditor/main/app/view/ParagraphSettings',
'presentationeditor/main/app/view/ImageSettings',
'presentationeditor/main/app/view/ShapeSettings',
'presentationeditor/main/app/view/SlideSettings',
'presentationeditor/main/app/view/TableSettings',
'presentationeditor/main/app/view/TextArtSettings',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Fonts'
/** coauthoring begin **/
,'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat',
/** coauthoring end **/
/** proprietary begin **/
'presentationeditor/main/app/view/ChartSettings',
'common/main/lib/controller/ExternalDiagramEditor'
/** proprietary end **/
], function() {
app.start();
});
});
\ No newline at end of file
This diff is collapsed.
......@@ -433,7 +433,8 @@ function CEditorPage(api)
_text_bx_back.setAttribute("type", "password");
}
_text_bx_back.willValidate = false;
// в некоторых браузерах - readonly
try {_text_bx_back.willValidate = false;}catch(err){}
this.m_oMainView.HtmlElement.appendChild(_text_bx_back);
this.TextBoxBackground = CreateControl("id_text_box_background");
......
......@@ -2000,6 +2000,9 @@ CDocument.prototype =
var StartIndex = this.FullRecalc.StartIndex;
var bResetStartElement = this.FullRecalc.ResetStartElement;
//console.log("Page " + PageIndex + " Section " + SectionIndex + " Column " + ColumnIndex + " Element " + StartIndex);
//console.log(this.RecalcInfo);
var StartPos = this.Get_PageContentStartPos2(PageIndex, ColumnIndex, 0, StartIndex);
var X = StartPos.X;
......
......@@ -1323,7 +1323,7 @@ Paragraph.prototype.private_RecalculateLineBottomBound = function(CurLine, CurPa
&& true === ParaPr.WidowControl
&& CurLine - this.Pages[CurPage].StartLine <= 1
&& CurLine >= 1 && true != PRS.BreakPageLine
&& ( 0 === RealCurPage && null != this.Get_DocumentPrev() ) )
&& ( 0 === CurPage && null != this.Get_DocumentPrev() ) )
{
// Вызываем данную функцию для удаления картинок с предыдущей страницы
this.Recalculate_Drawing_AddPageBreak(0, 0, true);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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