Skip to content

S
sdkjs
Commit 36fc14bd authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov
Browse files
Options

Сделано ускорение пересчета одного параграфа для случая, когда параграф разбит... 

Сделано ускорение пересчета одного параграфа для случая, когда параграф разбит на 2 страницы. Исправлен баг с быстрым пересчетом параграфа, внутри которого есть flow-объекты с обтеканием.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58295 954022d7-b5bf-4e40-9824-e11837661b57
parent 7d1e4bee
Hide whitespace changes
Inline Side-by-side
Showing with 1364 additions and 1248 deletions
Build/deploy/sdk_configs/nativeword.json
View file @ 36fc14bd
{
"info": {
"version": "3.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/docscoapisettings.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/apiCommon.js",
"../../Common/spellcheckapisettings.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/trackFile.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",
"../../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/Run.js",
"../../Word/Editor/Math.js",
"../../Word/Editor/Paragraph.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/Metafile.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Common/Scrolls/iscroll.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/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",
"../../Excel/utils/utils.js",
"../../Excel/model/CellComment.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/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"
],
"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",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk_native"
]
}
{
"info": {
"version": "3.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/docscoapisettings.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/apiCommon.js",
"../../Common/spellcheckapisettings.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/trackFile.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",
"../../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/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/Metafile.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Common/Scrolls/iscroll.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/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",
"../../Excel/utils/utils.js",
"../../Excel/model/CellComment.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/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"
],
"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",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Word"
}
},
"tasks": {
"build": [
"increment_build",
"compile_sdk_native"
]
}
}
\ No newline at end of file
Build/deploy/sdk_configs/webexcel.json
View file @ 36fc14bd
{
"info": {
"version": "3.0",
"build": 146
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word ../../Excel ../../PowerPoint"
},
"extract_api": {
"src": "../../Word/apiCommon.js",
"dst": "../../Excel/Build/Log/apiCommonExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/docscoapisettings.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",
"../../Word/Drawing/HatchPattern.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/Externals.js",
"../../Word/Drawing/Metafile.js",
"../../Excel/model/DrawingObjects/GlobalLoaders.js",
"../../Common/trackFile.js",
"../../Excel/apiDefines.js",
"../../Excel/document/empty-workbook.js",
"../../Excel/utils/utils.js",
"../../Excel/model/clipboard.js",
"../../Excel/model/autofilters.js",
"../../Excel/graphics/DrawingContext.js",
"../../Excel/graphics/pdfprinter.js",
"../../Excel/model/CollaborativeEditing.js",
"../../Excel/model/ConditionalFormatting.js",
"../../Excel/model/FormulaObjects/parserFormula.js",
"../../Excel/model/FormulaObjects/dateandtimeFunctions.js",
"../../Excel/model/FormulaObjects/engineeringFunctions.js",
"../../Excel/model/FormulaObjects/cubeFunctions.js",
"../../Excel/model/FormulaObjects/databaseFunctions.js",
"../../Excel/model/FormulaObjects/textanddataFunctions.js",
"../../Excel/model/FormulaObjects/statisticalFunctions.js",
"../../Excel/model/FormulaObjects/financialFunctions.js",
"../../Excel/model/FormulaObjects/mathematicFunctions.js",
"../../Excel/model/FormulaObjects/lookupandreferenceFunctions.js",
"../../Excel/model/FormulaObjects/informationFunctions.js",
"../../Excel/model/FormulaObjects/logicalFunctions.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js",
"../../Excel/model/History.js",
"../../Excel/model/UndoRedo.js",
"../../Excel/model/CellComment.js",
"../../Excel/view/mobileTouch.js",
"../../Excel/view/iscroll.js",
"../../Excel/view/PopUpSelector.js",
"../../Excel/view/StringRender.js",
"../../Excel/view/CellTextRender.js",
"../../Excel/view/CellEditorView.js",
"../../Excel/view/WorksheetView.js",
"../../Excel/view/HandlerList.js",
"../../Excel/view/EventsController.js",
"../../Excel/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/wordcopypaste.js",
"../../Excel/view/DrawingObjectsController.js",
"../../Excel/model/DrawingObjects/Graphics.js",
"../../Excel/model/DrawingObjects/Overlay.js",
"../../Excel/model/DrawingObjects/Controls.js",
"../../Excel/model/DrawingObjects/ShapeDrawer.js",
"../../Excel/model/DrawingObjects/DrawingDocument.js",
"../../Excel/model/DrawingObjects/Format/ShapePrototype.js",
"../../Excel/model/DrawingObjects/Format/ImagePrototype.js",
"../../Excel/model/DrawingObjects/Format/GroupPrototype.js",
"../../Excel/model/DrawingObjects/Format/ChartSpacePrototype.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/Run.js",
"../../Word/Editor/Math.js",
"../../Word/Editor/Paragraph.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/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",
"../../Excel/model/DrawingObjects/GlobalCounters.js",
"../../Word/apiCommon.js",
"../../Excel/Build/Log/apiCommonExport.js",
"../../Excel/api.js"
],
"dst": "../../Excel/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Excel/jquery/jquery-1.7.1.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js",
"../../Common/3rdparty/perfect-scrollbar/jquery.mousewheel.js",
"../../Common/3rdparty/perfect-scrollbar/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../../Excel/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../Common/commonDefines.js",
"../../Excel/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Excel"
}
},
"deploy": {
"copy": {
"common": {
"expand": true,
"cwd": "../../Common/Charts/",
"src": "DrawingObjects.js",
"dest": "<%= pkg.menu_path %>/Excel/model/"
},
"api": {
"expand": true,
"cwd": "../../Excel/",
"src": [
"api.js",
"apiDefines.js",
"view/EventsController.js",
"view/HandlerList.js",
"model/AdvancedOptions.js",
"model/CellInfo.js",
"model/CellComment.js",
"utils/utils.js",
"css/*.css"
],
"dest": "<%= pkg.menu_path %>/Excel/"
},
"sdk": {
"expand": true,
"cwd": "../../Excel/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"doc": {
"expand": true,
"cwd": "../../Excel/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"log": {
"expand": true,
"cwd": "../../Excel/",
"src": "sdk-all.js.map",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"samlpe": {
"expand": true,
"cwd": "../../Excel/",
"src": "Spreadsheet.html.deploy",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"samlpe_files": {
"expand": true,
"cwd": "../../Excel/",
"src": [
"jquery/jquery-1.7.1.js",
"css/nav-buttons.png",
"css/gradient.png"
],
"dest": "<%= pkg.menu_path %>/Excel/"
}
},
"store_log": {
"dst": "../../Excel/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"extract_js_api",
"compile_sdk"
]
}
{
"info": {
"version": "3.0",
"build": 146
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word ../../Excel ../../PowerPoint"
},
"extract_api": {
"src": "../../Word/apiCommon.js",
"dst": "../../Excel/Build/Log/apiCommonExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/docscoapisettings.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",
"../../Word/Drawing/HatchPattern.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/Externals.js",
"../../Word/Drawing/Metafile.js",
"../../Excel/model/DrawingObjects/GlobalLoaders.js",
"../../Common/trackFile.js",
"../../Excel/apiDefines.js",
"../../Excel/document/empty-workbook.js",
"../../Excel/utils/utils.js",
"../../Excel/model/clipboard.js",
"../../Excel/model/autofilters.js",
"../../Excel/graphics/DrawingContext.js",
"../../Excel/graphics/pdfprinter.js",
"../../Excel/model/CollaborativeEditing.js",
"../../Excel/model/ConditionalFormatting.js",
"../../Excel/model/FormulaObjects/parserFormula.js",
"../../Excel/model/FormulaObjects/dateandtimeFunctions.js",
"../../Excel/model/FormulaObjects/engineeringFunctions.js",
"../../Excel/model/FormulaObjects/cubeFunctions.js",
"../../Excel/model/FormulaObjects/databaseFunctions.js",
"../../Excel/model/FormulaObjects/textanddataFunctions.js",
"../../Excel/model/FormulaObjects/statisticalFunctions.js",
"../../Excel/model/FormulaObjects/financialFunctions.js",
"../../Excel/model/FormulaObjects/mathematicFunctions.js",
"../../Excel/model/FormulaObjects/lookupandreferenceFunctions.js",
"../../Excel/model/FormulaObjects/informationFunctions.js",
"../../Excel/model/FormulaObjects/logicalFunctions.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js",
"../../Excel/model/History.js",
"../../Excel/model/UndoRedo.js",
"../../Excel/model/CellComment.js",
"../../Excel/view/mobileTouch.js",
"../../Excel/view/iscroll.js",
"../../Excel/view/PopUpSelector.js",
"../../Excel/view/StringRender.js",
"../../Excel/view/CellTextRender.js",
"../../Excel/view/CellEditorView.js",
"../../Excel/view/WorksheetView.js",
"../../Excel/view/HandlerList.js",
"../../Excel/view/EventsController.js",
"../../Excel/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/wordcopypaste.js",
"../../Excel/view/DrawingObjectsController.js",
"../../Excel/model/DrawingObjects/Graphics.js",
"../../Excel/model/DrawingObjects/Overlay.js",
"../../Excel/model/DrawingObjects/Controls.js",
"../../Excel/model/DrawingObjects/ShapeDrawer.js",
"../../Excel/model/DrawingObjects/DrawingDocument.js",
"../../Excel/model/DrawingObjects/Format/ShapePrototype.js",
"../../Excel/model/DrawingObjects/Format/ImagePrototype.js",
"../../Excel/model/DrawingObjects/Format/GroupPrototype.js",
"../../Excel/model/DrawingObjects/Format/ChartSpacePrototype.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/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/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",
"../../Excel/model/DrawingObjects/GlobalCounters.js",
"../../Word/apiCommon.js",
"../../Excel/Build/Log/apiCommonExport.js",
"../../Excel/api.js"
],
"dst": "../../Excel/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Excel/jquery/jquery-1.7.1.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js",
"../../Common/3rdparty/perfect-scrollbar/jquery.mousewheel.js",
"../../Common/3rdparty/perfect-scrollbar/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../../Excel/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../Common/commonDefines.js",
"../../Excel/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Excel"
}
},
"deploy": {
"copy": {
"common": {
"expand": true,
"cwd": "../../Common/Charts/",
"src": "DrawingObjects.js",
"dest": "<%= pkg.menu_path %>/Excel/model/"
},
"api": {
"expand": true,
"cwd": "../../Excel/",
"src": [
"api.js",
"apiDefines.js",
"view/EventsController.js",
"view/HandlerList.js",
"model/AdvancedOptions.js",
"model/CellInfo.js",
"model/CellComment.js",
"utils/utils.js",
"css/*.css"
],
"dest": "<%= pkg.menu_path %>/Excel/"
},
"sdk": {
"expand": true,
"cwd": "../../Excel/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"doc": {
"expand": true,
"cwd": "../../Excel/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"log": {
"expand": true,
"cwd": "../../Excel/",
"src": "sdk-all.js.map",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"samlpe": {
"expand": true,
"cwd": "../../Excel/",
"src": "Spreadsheet.html.deploy",
"dest": "<%= pkg.menu_path %>/Excel/"
},
"samlpe_files": {
"expand": true,
"cwd": "../../Excel/",
"src": [
"jquery/jquery-1.7.1.js",
"css/nav-buttons.png",
"css/gradient.png"
],
"dest": "<%= pkg.menu_path %>/Excel/"
}
},
"store_log": {
"dst": "../../Excel/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"extract_js_api",
"compile_sdk"
]
}
}
\ No newline at end of file
Build/deploy/sdk_configs/webpowerpoint.json
View file @ 36fc14bd
{
"info": {
"version": "3.0",
"build": 157
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word ../../PowerPoint"
},
"concat_api": {
"../../PowerPoint/api-all.js": [
"../../PowerPoint/api.js",
"../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js"
]
},
"extract_api": {
"src": "../../PowerPoint/api-all.js",
"dst": "../../PowerPoint/Build/Log/apiExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/FontsFreeType/font_engine.js",
"../../Common/FontsFreeType/FontFile.js",
"../../Common/FontsFreeType/FontManager.js",
"../../Common/AllFonts.js",
"../../Word/Drawing/Externals.js",
"../../Word/Drawing/GlobalLoaders.js",
"../../Common/commonDefines.js",
"../../Common/apiCommon.js",
"../../Common/downloaderfiles.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/docscoapisettings.js",
"../../Common/wordcopypaste.js",
"../../Common/editorscommon.js",
"../../PowerPoint/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",
"../../Common/trackFile.js",
"../../Word/Editor/Styles.js",
"../../Word/Editor/Numbering.js",
"../../Word/Drawing/Metafile.js",
"../../PowerPoint/Editor/CollaborativeEditing.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/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",
"../../PowerPoint/Drawing/Transitions.js",
"../../PowerPoint/Drawing/DrawingDocument.js",
"../../PowerPoint/Drawing/HtmlPage.js",
"../../PowerPoint/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",
"../../PowerPoint/Editor/Format/Presentation.js",
"../../Common/Drawings/CommonController.js",
"../../Excel/view/DrawingObjectsController.js",
"../../PowerPoint/Editor/DrawingObjectsController.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/Image.js",
"../../Common/Drawings/Format/GroupShape.js",
"../../Common/Drawings/Format/ChartSpace.js",
"../../Common/Drawings/Format/ChartFormat.js",
"../../Common/Drawings/Format/TextBody.js",
"../../PowerPoint/Editor/Format/Slide.js",
"../../PowerPoint/Editor/Format/SlideMaster.js",
"../../PowerPoint/Editor/Format/Layout.js",
"../../PowerPoint/Editor/Format/Comments.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/Styles.js",
"../../Word/Editor/Numbering.js",
"../../Word/Editor/ParagraphContent.js",
"../../Word/Editor/ParagraphContentBase.js",
"../../Word/Editor/Run.js",
"../../Word/Editor/Hyperlink.js",
"../../Word/Editor/FlowObjects.js",
"../../Word/Editor/Paragraph.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/FontClassification.js",
"../../PowerPoint/Editor/Format/ShapePrototype.js",
"../../PowerPoint/Editor/Format/ImagePrototype.js",
"../../PowerPoint/Editor/Format/GroupPrototype.js",
"../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
"../../PowerPoint/Editor/Format/GraphicFrame.js",
"../../PowerPoint/api-all.js",
"../../PowerPoint/Build/Log/apiExport.js"
],
"dst": "../../PowerPoint/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Word/Drawing/scrolls/jquery.min.js",
"../../Common/3rdparty/Underscore/underscore-min.js",
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../PowerPoint/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../PowerPoint/themes/Themes.js",
"../../PowerPoint/apiDefines.js",
"../../Common/commonDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/PowerPoint"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": [
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"sdk": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": [
"sdk-all.js",
"themes/theme*/**"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"doc": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"log": {
"expand": true,
"cwd": "../../PowerPoint/",
"flatten": true,
"src": [
"sdk-all.js.map",
"Build/Log/property.map",
"Build/Log/variable.map",
"Build/Log/apiExport.js"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"sample": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": "index.html.deploy",
"dest": "<%= pkg.menu_path %>/PowerPoint/"
}
},
"store_log": {
"dst": "../../PowerPoint/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"concat_js_api",
"extract_js_api",
"compile_sdk"
]
}
{
"info": {
"version": "3.0",
"build": 157
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word ../../PowerPoint"
},
"concat_api": {
"../../PowerPoint/api-all.js": [
"../../PowerPoint/api.js",
"../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js"
]
},
"extract_api": {
"src": "../../PowerPoint/api-all.js",
"dst": "../../PowerPoint/Build/Log/apiExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/FontsFreeType/font_engine.js",
"../../Common/FontsFreeType/FontFile.js",
"../../Common/FontsFreeType/FontManager.js",
"../../Common/AllFonts.js",
"../../Word/Drawing/Externals.js",
"../../Word/Drawing/GlobalLoaders.js",
"../../Common/commonDefines.js",
"../../Common/apiCommon.js",
"../../Common/downloaderfiles.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/docscoapisettings.js",
"../../Common/wordcopypaste.js",
"../../Common/editorscommon.js",
"../../PowerPoint/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",
"../../Common/trackFile.js",
"../../Word/Editor/Styles.js",
"../../Word/Editor/Numbering.js",
"../../Word/Drawing/Metafile.js",
"../../PowerPoint/Editor/CollaborativeEditing.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/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",
"../../PowerPoint/Drawing/Transitions.js",
"../../PowerPoint/Drawing/DrawingDocument.js",
"../../PowerPoint/Drawing/HtmlPage.js",
"../../PowerPoint/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",
"../../PowerPoint/Editor/Format/Presentation.js",
"../../Common/Drawings/CommonController.js",
"../../Excel/view/DrawingObjectsController.js",
"../../PowerPoint/Editor/DrawingObjectsController.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/Image.js",
"../../Common/Drawings/Format/GroupShape.js",
"../../Common/Drawings/Format/ChartSpace.js",
"../../Common/Drawings/Format/ChartFormat.js",
"../../Common/Drawings/Format/TextBody.js",
"../../PowerPoint/Editor/Format/Slide.js",
"../../PowerPoint/Editor/Format/SlideMaster.js",
"../../PowerPoint/Editor/Format/Layout.js",
"../../PowerPoint/Editor/Format/Comments.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/Styles.js",
"../../Word/Editor/Numbering.js",
"../../Word/Editor/ParagraphContent.js",
"../../Word/Editor/ParagraphContentBase.js",
"../../Word/Editor/Run.js",
"../../Word/Editor/Hyperlink.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/FontClassification.js",
"../../PowerPoint/Editor/Format/ShapePrototype.js",
"../../PowerPoint/Editor/Format/ImagePrototype.js",
"../../PowerPoint/Editor/Format/GroupPrototype.js",
"../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
"../../PowerPoint/Editor/Format/GraphicFrame.js",
"../../PowerPoint/api-all.js",
"../../PowerPoint/Build/Log/apiExport.js"
],
"dst": "../../PowerPoint/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Word/Drawing/scrolls/jquery.min.js",
"../../Common/3rdparty/Underscore/underscore-min.js",
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../PowerPoint/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../PowerPoint/themes/Themes.js",
"../../PowerPoint/apiDefines.js",
"../../Common/commonDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/PowerPoint"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": [
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"sdk": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": [
"sdk-all.js",
"themes/theme*/**"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"doc": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"log": {
"expand": true,
"cwd": "../../PowerPoint/",
"flatten": true,
"src": [
"sdk-all.js.map",
"Build/Log/property.map",
"Build/Log/variable.map",
"Build/Log/apiExport.js"
],
"dest": "<%= pkg.menu_path %>/PowerPoint/"
},
"sample": {
"expand": true,
"cwd": "../../PowerPoint/",
"src": "index.html.deploy",
"dest": "<%= pkg.menu_path %>/PowerPoint/"
}
},
"store_log": {
"dst": "../../PowerPoint/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"concat_js_api",
"extract_js_api",
"compile_sdk"
]
}
}
\ No newline at end of file
Build/deploy/sdk_configs/webword.json
View file @ 36fc14bd
{
"info": {
"version": "3.0",
"build": 161
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word"
},
"concat_api": {
"../../Word/api-all.js": [
"../../Word/api.js",
"../../Word/apiCommon.js"
]
},
"extract_api": {
"src": "../../Word/api-all.js",
"dst": "../../Word/Build/Log/apiExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/docscoapisettings.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/apiCommon.js",
"../../Common/spellcheckapisettings.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/trackFile.js",
"../../Common/FontsFreeType/font_engine.js",
"../../Common/FontsFreeType/FontFile.js",
"../../Common/FontsFreeType/FontManager.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",
"../../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/Run.js",
"../../Word/Editor/Math.js",
"../../Word/Editor/Paragraph.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",
"../../Word/Drawing/DrawingDocument.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Common/Scrolls/iscroll.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/Controls.js",
"../../Word/Drawing/Rulers.js",
"../../Word/Drawing/HtmlPage.js",
"../../Word/Drawing/documentrenderer.js",
"../../Common/scroll.js",
"../../Word/Editor/SerializeCommon.js",
"../../Word/apiDefines.js",
"../../Word/api-all.js",
"../../Word/Build/Log/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",
"../../Excel/utils/utils.js",
"../../Excel/model/CellComment.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js"
],
"dst": "../../Word/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Word/Drawing/scrolls/jquery.min.js",
"../../Common/3rdparty/Underscore/underscore-min.js",
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../Word/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../Common/commonDefines.js",
"../../Word/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Word"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../Word/",
"src": [
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/Word/"
},
"sdk": {
"expand": true,
"cwd": "../../Word/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Word/"
},
"fonts": {
"expand": true,
"cwd": "../../Fonts/",
"src": [
"js/*.js",
"native/*.ttf",
"native/*.ttc",
"native/*.otf",
"native/*.TTF",
"native/*.TTC",
"native/*.OTF",
"native/*.bin",
"native/*.BIN"
],
"dest": "<%= pkg.menu_path %>/Fonts/"
},
"doc": {
"expand": true,
"cwd": "../../Word/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/Word/"
},
"docscoapisettings": {
"expand": true,
"cwd": "../../Common/",
"src": [
"AllFonts.js",
"docscoapisettings.js",
"commonDefines.js",
"apiCommon.js",
"downloaderfiles.js",
"Images/*.cur",
"Images/fonts_thumbnail**.png",
"Native/jquery_native.js",
"Native/native.js"
],
"dest": "<%= pkg.menu_path %>/Common/"
},
"log": {
"expand": true,
"cwd": "../../Word/",
"src": [
"Build/Log/property.map",
"Build/Log/variable.map",
"Build/Log/apiExport.js"
],
"dest": "<%= pkg.menu_path %>/Word/"
}
},
"store_log": {
"dst": "../../Word/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"concat_js_api",
"extract_js_api",
"compile_sdk"
]
}
{
"info": {
"version": "3.0",
"build": 161
},
"update_src": {
"revision": "HEAD",
"src": "../../Common ../../Word"
},
"concat_api": {
"../../Word/api-all.js": [
"../../Word/api.js",
"../../Word/apiCommon.js"
]
},
"extract_api": {
"src": "../../Word/api-all.js",
"dst": "../../Word/Build/Log/apiExport.js"
},
"compile": {
"sdk": {
"src": [
"../../Common/Build/License.js",
"../../Common/browser.js",
"../../Common/docscoapisettings.js",
"../../Common/docscoapicommon.js",
"../../Common/docscoapi.js",
"../../Common/apiCommon.js",
"../../Common/spellcheckapisettings.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/trackFile.js",
"../../Common/FontsFreeType/font_engine.js",
"../../Common/FontsFreeType/FontFile.js",
"../../Common/FontsFreeType/FontManager.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",
"../../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/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",
"../../Word/Drawing/DrawingDocument.js",
"../../Word/Drawing/GraphicsEvents.js",
"../../Common/Scrolls/iscroll.js",
"../../Word/Drawing/WorkEvents.js",
"../../Word/Drawing/Controls.js",
"../../Word/Drawing/Rulers.js",
"../../Word/Drawing/HtmlPage.js",
"../../Word/Drawing/documentrenderer.js",
"../../Common/scroll.js",
"../../Word/Editor/SerializeCommon.js",
"../../Word/apiDefines.js",
"../../Word/api-all.js",
"../../Word/Build/Log/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",
"../../Excel/utils/utils.js",
"../../Excel/model/CellComment.js",
"../../Excel/model/Serialize.js",
"../../Excel/model/WorkbookElems.js",
"../../Excel/model/Workbook.js",
"../../Excel/model/CellInfo.js",
"../../Excel/model/AdvancedOptions.js"
],
"dst": "../../Word/sdk-all.js",
"externs": [
"../../Common/Build/Externs.js",
"../../Word/Drawing/scrolls/jquery.min.js",
"../../Common/3rdparty/Underscore/underscore-min.js",
"../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../Word/Build/Log",
"define": [
"ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
},
"defines": {
"src": [
"../../Common/Shapes/EditorSettings.js",
"../../Common/commonDefines.js",
"../../Word/apiDefines.js"
],
"dst": "apiDefines.min.js"
},
"source_map": {
"url": "http://localhost:8080/sdk/Word"
}
},
"deploy": {
"copy": {
"api": {
"expand": true,
"cwd": "../../Word/",
"src": [
"api.js",
"apiCommon.js",
"apiDefines.js"
],
"dest": "<%= pkg.menu_path %>/Word/"
},
"sdk": {
"expand": true,
"cwd": "../../Word/",
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Word/"
},
"fonts": {
"expand": true,
"cwd": "../../Fonts/",
"src": [
"js/*.js",
"native/*.ttf",
"native/*.ttc",
"native/*.otf",
"native/*.TTF",
"native/*.TTC",
"native/*.OTF",
"native/*.bin",
"native/*.BIN"
],
"dest": "<%= pkg.menu_path %>/Fonts/"
},
"doc": {
"expand": true,
"cwd": "../../Word/",
"src": "document/**",
"dest": "<%= pkg.menu_path %>/Word/"
},
"docscoapisettings": {
"expand": true,
"cwd": "../../Common/",
"src": [
"AllFonts.js",
"docscoapisettings.js",
"commonDefines.js",
"apiCommon.js",
"downloaderfiles.js",
"Images/*.cur",
"Images/fonts_thumbnail**.png",
"Native/jquery_native.js",
"Native/native.js"
],
"dest": "<%= pkg.menu_path %>/Common/"
},
"log": {
"expand": true,
"cwd": "../../Word/",
"src": [
"Build/Log/property.map",
"Build/Log/variable.map",
"Build/Log/apiExport.js"
],
"dest": "<%= pkg.menu_path %>/Word/"
}
},
"store_log": {
"dst": "../../Word/Build/Log"
}
},
"tasks": {
"build": [
"increment_build",
"concat_js_api",
"extract_js_api",
"compile_sdk"
]
}
}
\ No newline at end of file
Word/Editor/Document.js
View file @ 36fc14bd
......@@ -955,11 +955,9 @@ CDocument.prototype =
var Run = SimpleChanges[0].Class;
var Para = Run.Paragraph;
var Res = Para.Recalculate_Fast( SimpleChanges );
var Res = Para.Recalculate_Fast_Range( SimpleChanges );
if ( -1 !== Res )
{
//console.log( "Fast Range Recalc " + Res );
// Если изменения произошли на последней странице параграфа, и за данным параграфом следовал
// пустой параграф с новой секцией, тогда его тоже надо пересчитать.
if ( Res === Para.Get_StartPage_Absolute() + Para.Pages.length - 1 )
......@@ -988,35 +986,48 @@ CDocument.prototype =
}
}
// TODO: Тут надо вставить заглушку, что если у нас в долгом пересчете находится страница <= PageIndex + 1,
// по отношению к данной, тогда не надо делать быстрый пересчет.
if (SimpleChanges.length >= 1)
{
var Run = SimpleChanges[0].Class;
var Para = Run.Paragraph;
if (1 === Para.Pages.length)
{
var nPageNum = Para.Get_StartPage_Absolute();
var OldBounds = Para.Pages[0].Bounds;
var FastRecalcResult = Para.Recalculate_Page(nPageNum);
var FastPages = Para.Recalculate_Fast_WholeParagraph();
var FastPagesCount = FastPages.length;
if (FastRecalcResult === recalcresult_NextElement && 1 === Para.Pages.length && true === Para.Pages[0].Bounds.Compare(OldBounds))
if (FastPagesCount > 0)
{
// Если изменения произошли на последней странице параграфа, и за данным параграфом следовал
// пустой параграф с новой секцией, тогда его тоже надо пересчитать.
var NextElement = Para.Get_DocumentNext();
var LastFastPage = FastPages[FastPagesCount - 1];
if (null !== NextElement && true === this.Pages[LastFastPage].Check_EndSectionPara(NextElement))
{
//console.log( "Fast Paragraph Recalc " + Res );
var LastVisibleBounds = Para.Get_LastRangeVisibleBounds();
// Перерисуем страницу, на которой произошли изменения
this.DrawingDocument.OnRecalculatePage( nPageNum, this.Pages[nPageNum] );
this.DrawingDocument.OnEndRecalculate( false, true );
var ___X = LastVisibleBounds.X + LastVisibleBounds.W;
var ___Y = LastVisibleBounds.Y;
History.Reset_RecalcIndex();
// Делаем предел по X минимум 10 мм, чтобы всегда было видно элемент разрыва секции
NextElement.Reset(___X, ___Y, Math.max(___X + 10, NextElement.XLimit), 10000, LastFastPage);
NextElement.Recalculate_Page(LastFastPage);
}
return;
for (var Index = 0; Index < FastPagesCount; Index++)
{
var PageIndex = FastPages[Index];
this.DrawingDocument.OnRecalculatePage(PageIndex, this.Pages[PageIndex]);
}
this.DrawingDocument.OnEndRecalculate( false, true );
History.Reset_RecalcIndex();
return;
}
}
}
//console.log( "Long Recalc " + Res );
//console.log( "Long Recalc " );
// Очищаем данные пересчета
this.RecalcInfo.Reset();
......
Word/Editor/Paragraph.js
View file @ 36fc14bd
......@@ -2402,290 +2402,6 @@ Paragraph.prototype =
return true;
},
Recalculate_Fast : function(SimpleChanges)
{
if ( true === this.Parent.Is_HdrFtr(false) )
return -1;
var Run = SimpleChanges[0].Class;
var StartLine = Run.StartLine;
var StartRange = Run.StartRange;
var StartPos = this.Lines[StartLine].Ranges[StartRange].StartPos;
var EndPos = this.Lines[StartLine].Ranges[StartRange].EndPos;
var ParaPos = Run.Get_SimpleChanges_ParaPos(SimpleChanges);
if ( null === ParaPos )
return -1;
var Line = ParaPos.Line;
var Range = ParaPos.Range;
// TODO: Отключаем это ускорение в таблицах, т.к. в таблицах и так есть свое ускорение. Но можно и это ускорение
// подключить, для этого надо проверять изменились ли MinMax ширины и набираем ли мы в строке заголовков.
if ( undefined === this.Parent || true === this.Parent.Is_TableCellContent() )
return -1;
// Если мы находимся в строке, которая была полностью перенесена из-за обтекания, и мы добавляем пробел, или
// удаляем символ, тогда нам запускать обычный пересчет, т.к. первое слово может начать убираться в промежутках
// обтекания, которых у нас нет в отрезках строки
if ( true === this.Lines[Line].RangeY )
{
// TODO: Сделать проверку на добавление пробела и удаление
return -1;
}
// Если у нас есть PageBreak в строке, запускаем обычный пересчет, либо если это пустой параграф.
if ( this.Lines[Line].LineInfo & 1 || ( this.Lines[Line].LineInfo & 2 && this.Lines[Line].LineInfo & 4 ) )
return -1;
// Если у нас отрезок, в котором произошли изменения является отрезком с нумерацией, тогда надо запустить
// обычный пересчет.
var NumPr = this.Get_CompiledPr2(false).ParaPr.NumPr;
if ( null !== this.Numbering.Item && ( Line < this.Numbering.Line || ( Line === this.Numbering.Line && Range <= this.Numbering.Range ) ) && ( undefined !== NumPr && undefined !== NumPr.NumId && 0 !== NumPr.NumId && "0" !== NumPr.NumId ) )
{
// TODO: Сделать проверку на само изменение, переместилась ли нумерация
return -1;
}
if ( 0 === Line && 0 === Range && undefined !== this.Get_SectionPr() )
{
return -1;
}
// Если наш параграф является рамкой с авто шириной, тогда пересчитываем по обычному
// TODO: Улучишить данную проверку
if ( 1 === this.Lines.length && true !== this.Is_Inline() )
return -1;
// Мы должны пересчитать как минимум 3 отрезка: текущий, предыдущий и следующий, потому что при удалении элемента
// или добавлении пробела первое слово в данном отрезке может убраться в предыдущем отрезке, и кроме того при
// удалении возможен вариант, когда мы неправильно определили отрезок (т.е. более ранний взяли). Но возможен
// вариант, при котором предыдущий или/и следующий отрезки - пустые, т.е. там нет ни одного текстового элемента
// тогда мы начинаем проверять с отрезка, в котором есть хоть что-то.
var PrevLine = Line;
var PrevRange = Range;
while ( PrevLine >= 0 )
{
PrevRange--;
if ( PrevRange < 0 )
{
PrevLine--;
if ( PrevLine < 0 )
break;
PrevRange = this.Lines[PrevLine].Ranges.length - 1;
}
if ( true === this.Is_EmptyRange( PrevLine, PrevRange ) )
continue;
else
break;
}
if ( PrevLine < 0 )
{
PrevLine = Line;
PrevRange = Range;
}
var NextLine = Line;
var NextRange = Range;
var LinesCount = this.Lines.length;
while ( NextLine <= LinesCount - 1 )
{
NextRange++;
if ( NextRange > this.Lines[NextLine].Ranges.length - 1 )
{
NextLine++
if ( NextLine > LinesCount - 1 )
break;
NextRange = 0;
}
if ( true === this.Is_EmptyRange( NextLine, NextRange ) )
continue;
else
break;
}
if ( NextLine > LinesCount - 1 )
{
NextLine = Line;
NextRange = Range;
}
var CurLine = PrevLine;
var CurRange = PrevRange;
var Result;
while ( ( CurLine < NextLine ) || ( CurLine === NextLine && CurRange <= NextRange ) )
{
var TempResult = this.Recalculate_Fast_Range(CurLine, CurRange);
if ( -1 === TempResult )
return -1;
if ( CurLine === Line && CurRange === Range )
Result = TempResult;
CurRange++;
if ( CurRange > this.Lines[CurLine].Ranges.length - 1 )
{
CurLine++;
CurRange = 0;
}
}
// Во время пересчета сбрасываем привязку курсора к строке.
this.CurPos.Line = -1;
this.CurPos.Range = -1;
this.Internal_CheckSpelling();
return Result;
},
Recalculate_Fast_Range : function(_Line, _Range)
{
var PRS = this.m_oPRSW;
var XStart, YStart, XLimit, YLimit;
// Определим номер страницы
var CurLine = _Line;
var CurRange = _Range;
var CurPage = 0;
var PagesLen = this.Pages.length;
for ( var TempPage = 0; TempPage < PagesLen; TempPage++ )
{
var __Page = this.Pages[TempPage];
if ( CurLine <= __Page.EndLine && CurLine >= __Page.FirstLine )
{
CurPage = TempPage;
break;
}
}
if ( -1 === CurPage )
return -1;
var ParaPr = this.Get_CompiledPr2( false).ParaPr;
if ( 0 === CurPage )//|| ( undefined != this.Get_FramePr() && this.Parent instanceof CDocument ) )
{
XStart = this.X;
YStart = this.Y;
XLimit = this.XLimit;
YLimit = this.YLimit;
}
else
{
var PageStart = this.Parent.Get_PageContentStartPos( this.PageNum + CurPage, this.Index );
XStart = PageStart.X;
YStart = PageStart.Y;
XLimit = PageStart.XLimit;
YLimit = PageStart.YLimit;
}
PRS.XStart = XStart;
PRS.YStart = YStart;
PRS.XLimit = XLimit - ParaPr.Ind.Right;
PRS.YLimit = YLimit;
// Обнуляем параметры PRS для строки и отрезка
PRS.Reset_Line();
PRS.Page = 0;
PRS.Line = _Line;
PRS.Range = _Range;
PRS.RangesCount = this.Lines[CurLine].Ranges.length - 1;
PRS.Paragraph = this;
var RangesCount = PRS.RangesCount;
var Line = this.Lines[CurLine];
var Range = Line.Ranges[CurRange];
var StartPos = Range.StartPos;
var EndPos = Range.EndPos;
// Обновляем состояние пересчета
PRS.Reset_Range(Range.X, Range.XEnd);
var ContentLen = this.Content.length;
for ( var Pos = StartPos; Pos <= EndPos; Pos++ )
{
var Item = this.Content[Pos];
if ( para_Math === Item.Type )
{
// TODO: Надо бы перенести эту проверку на изменение контента параграфа
Item.MathPara = this.Check_MathPara(Pos);
}
PRS.Update_CurPos( Pos, 0 );
var SavedLines = Item.Save_RecalculateObject(true);
Item.Recalculate_Range( PRS, ParaPr, 1 );
if ( ( true === PRS.NewRange && Pos !== EndPos ) || ( Pos === EndPos && true !== PRS.NewRange ) )
return -1;
else if ( Pos === EndPos && true === PRS.NewRange && true === PRS.MoveToLBP )
{
Item.Recalculate_Set_RangeEndPos(PRS, PRS.LineBreakPos, 1);
}
// Нам нужно проверить только строку с номером CurLine
if ( false === SavedLines.Compare( _Line, _Range, Item ) )
return -1;
Item.Load_RecalculateObject(SavedLines, this);
}
// Recalculate_Lines_Width
var PRSC = this.m_oPRSC;
var StartPos = Range.StartPos;
var EndPos = Range.EndPos;
Range.Reset_Width();
PRSC.Reset( this, Range );
if ( true === this.Numbering.Check_Range(CurRange, CurLine) )
PRSC.Range.W += this.Numbering.WidthVisible;
for ( var Pos = StartPos; Pos <= EndPos; Pos++ )
{
var Item = this.Content[Pos];
Item.Recalculate_Range_Width( PRSC, CurLine, CurRange );
}
//------------------------------------------------
var RecalcResultAlign = this.Recalculate_Lines_Align(PRS, CurPage, ParaPr, true);
if ( recalcresult_NextElement !== RecalcResultAlign )
return -1;
return this.Get_StartPage_Absolute() + CurPage;
},
Start_FromNewPage : function()
{
this.Pages.length = 1;
......
Word/Editor/Paragraph_Recalculate.js 0 → 100644
View file @ 36fc14bd
"use strict";
/**
* User: Ilja.Kirillov
* Date: 16.09.14
* Time: 12:04
*/
/**
* Здесь мы пытаем быстро пересчитать текущий параграф. Если быстрый пересчет срабатывает, тогда возвращаются страницы,
* которые нужно перерисовать, в противном случае вовзращается пустой массив.
* @returns {*}
*/
Paragraph.prototype.Recalculate_Fast_WholeParagraph = function()
{
// Здесь мы отдельно обрабатываем случаи быстрого пересчета параграфов, которые были разбиты на 1-2
// страницы. Если параграф был разбит более чем на 2 страницы, то такое ускорение уже не имеет смысла.
if (1 === this.Pages.length)
{
// Если параграф был разбит на 1 страницу изначально, тогда мы проверяем, чтобы он после пересчета
// был также разбит на 1 страницу, кроме этого проверяем изменились ли границы параграфа, а во время пересчета
// смотрим изменяeтся ли положение flow-объектов, привязанных к данному параграфу, кроме того, если по какой-то
// причине пересчет возвращает не recalcresult_NextElement, тогда тоже отменяем быстрый пересчет
var PageNum = this.Get_StartPage_Absolute();
var OldBounds = this.Pages[0].Bounds;
var FastRecalcResult = this.Recalculate_Page(PageNum, true);
if (FastRecalcResult === recalcresult_NextElement && 1 === this.Pages.length && true === this.Pages[0].Bounds.Compare(OldBounds))
{
//console.log("Recalc Fast WholeParagraph 1 page");
return [PageNum];
}
}
else if (2 === this.Pages.length)
{
// Если параграф был разбит на 2 страницы изначально, тогда мы проверяем, чтобы он после пересчета
// был также разбит на 2 страницы, кроме этого проверяем изменились ли границы параграфа на каждой странице,
// а во время пересчета смотрим изменяeтся ли положение flow-объектов, привязанных к данному параграфу.
// Кроме того, если по какой-то причине пересчет возвращает не recalcresult_NextPage на первой странице, или не
// recalcresult_NextElement, тогда тоже отменяем быстрый пересчет.
var OldBounds_0 = this.Pages[0].Bounds;
var OldBounds_1 = this.Pages[1].Bounds;
// Чтобы защититься от неправильной работы, связанной с переносом параграфа на новую страницу,
// будем следить за тем, начинался ли изначально параграф с новой страницы, и начинается ли он с
// новой страницы сейчас.
var OldStartFromNewPage = this.Pages[0].StartLine < 0 ? true : false;
// Чтобы защититься от неправильной работой с висячими строками, будем следить за количеством строк
// если оно меньше либо равно 2 на какой-либо странице до/после пересчета.
var OldLinesCount_0 = this.Pages[0].EndLine - this.Pages[0].StartLine + 1;
var OldLinesCount_1 = this.Pages[1].EndLine - this.Pages[1].StartLine + 1;
var PageNum = this.Get_StartPage_Absolute();
var FastRecalcResult = this.Recalculate_Page(PageNum, true);
if (FastRecalcResult !== recalcresult_NextPage)
return [];
FastRecalcResult = this.Recalculate_Page(PageNum + 1);
if (FastRecalcResult !== recalcresult_NextElement)
return [];
// Сравниваем количество страниц (хотя оно должно быть 2 к данному моменту) и границы каждой страницы
if (2 !== this.Pages.length || true !== this.Pages[0].Bounds.Compare(OldBounds_0) || true !== this.Pages[1].Bounds.Compare(OldBounds_1))
return [];
// Проверяем пустую первую страницу
var StartFromNewPage = this.Pages[0].StartLine < 0 ? true : false;
if (StartFromNewPage !== OldStartFromNewPage)
return [];
// Если параграф начался с новой страницы, тогда у него не надо проверять висячие строки
if (true !== StartFromNewPage)
{
var LinesCount_0 = this.Pages[0].EndLine - this.Pages[0].StartLine + 1;
var LinesCount_1 = this.Pages[1].EndLine - this.Pages[1].StartLine + 1;
if ((OldLinesCount_0 <= 2 || LinesCount_0 <= 2) && OldLinesCount_0 !== LinesCount_0)
return [];
if ((OldLinesCount_1 <= 2 || LinesCount_1 <= 2) && OldLinesCount_1 !== LinesCount_1)
return [];
}
//console.log("Recalc Fast WholeParagraph 2 pages");
// Если параграф начинается с новой страницы, тогда не надо перерисовывать первую страницу, т.к. она
// изначально была пустая, и сейчас пустая.
if (true === StartFromNewPage)
return [PageNum + 1];
else
return [PageNum, PageNum + 1];
}
return [];
};
/**
* Пытаемся быстро рассчитать отрезок, в котором произошли изменения, и если ничего не съехало, тогда
* перерисовываем страницу, в противном случаем запускаем обычный пересчет.
* @param SimpleChanges
* @returns {*} -1 если быстрый пересчет не получился, либо номер страницы, которую нужно перерисовать
*/
Paragraph.prototype.Recalculate_Fast_Range = function(SimpleChanges)
{
if ( true === this.Parent.Is_HdrFtr(false) )
return -1;
var Run = SimpleChanges[0].Class;
var ParaPos = Run.Get_SimpleChanges_ParaPos(SimpleChanges);
if ( null === ParaPos )
return -1;
var Line = ParaPos.Line;
var Range = ParaPos.Range;
// TODO: Отключаем это ускорение в таблицах, т.к. в таблицах и так есть свое ускорение. Но можно и это ускорение
// подключить, для этого надо проверять изменились ли MinMax ширины и набираем ли мы в строке заголовков.
if ( undefined === this.Parent || true === this.Parent.Is_TableCellContent() )
return -1;
// Если мы находимся в строке, которая была полностью перенесена из-за обтекания, и мы добавляем пробел, или
// удаляем символ, тогда нам запускать обычный пересчет, т.к. первое слово может начать убираться в промежутках
// обтекания, которых у нас нет в отрезках строки
if ( true === this.Lines[Line].RangeY )
{
// TODO: Сделать проверку на добавление пробела и удаление
return -1;
}
// Если у нас есть PageBreak в строке, запускаем обычный пересчет, либо если это пустой параграф.
if ( this.Lines[Line].LineInfo & 1 || ( this.Lines[Line].LineInfo & 2 && this.Lines[Line].LineInfo & 4 ) )
return -1;
// Если у нас отрезок, в котором произошли изменения является отрезком с нумерацией, тогда надо запустить
// обычный пересчет.
var NumPr = this.Get_CompiledPr2(false).ParaPr.NumPr;
if ( null !== this.Numbering.Item && ( Line < this.Numbering.Line || ( Line === this.Numbering.Line && Range <= this.Numbering.Range ) ) && ( undefined !== NumPr && undefined !== NumPr.NumId && 0 !== NumPr.NumId && "0" !== NumPr.NumId ) )
{
// TODO: Сделать проверку на само изменение, переместилась ли нумерация
return -1;
}
if ( 0 === Line && 0 === Range && undefined !== this.Get_SectionPr() )
{
return -1;
}
// Если наш параграф является рамкой с авто шириной, тогда пересчитываем по обычному
// TODO: Улучишить данную проверку
if ( 1 === this.Lines.length && true !== this.Is_Inline() )
return -1;
// Мы должны пересчитать как минимум 3 отрезка: текущий, предыдущий и следующий, потому что при удалении элемента
// или добавлении пробела первое слово в данном отрезке может убраться в предыдущем отрезке, и кроме того при
// удалении возможен вариант, когда мы неправильно определили отрезок (т.е. более ранний взяли). Но возможен
// вариант, при котором предыдущий или/и следующий отрезки - пустые, т.е. там нет ни одного текстового элемента
// тогда мы начинаем проверять с отрезка, в котором есть хоть что-то.
var PrevLine = Line;
var PrevRange = Range;
while ( PrevLine >= 0 )
{
PrevRange--;
if ( PrevRange < 0 )
{
PrevLine--;
if ( PrevLine < 0 )
break;
PrevRange = this.Lines[PrevLine].Ranges.length - 1;
}
if ( true === this.Is_EmptyRange( PrevLine, PrevRange ) )
continue;
else
break;
}
if ( PrevLine < 0 )
{
PrevLine = Line;
PrevRange = Range;
}
var NextLine = Line;
var NextRange = Range;
var LinesCount = this.Lines.length;
while ( NextLine <= LinesCount - 1 )
{
NextRange++;
if ( NextRange > this.Lines[NextLine].Ranges.length - 1 )
{
NextLine++
if ( NextLine > LinesCount - 1 )
break;
NextRange = 0;
}
if ( true === this.Is_EmptyRange( NextLine, NextRange ) )
continue;
else
break;
}
if ( NextLine > LinesCount - 1 )
{
NextLine = Line;
NextRange = Range;
}
var CurLine = PrevLine;
var CurRange = PrevRange;
var Result;
while ( ( CurLine < NextLine ) || ( CurLine === NextLine && CurRange <= NextRange ) )
{
var TempResult = this.private_Recalculate_Fast_Range(CurLine, CurRange);
if ( -1 === TempResult )
return -1;
if ( CurLine === Line && CurRange === Range )
Result = TempResult;
CurRange++;
if ( CurRange > this.Lines[CurLine].Ranges.length - 1 )
{
CurLine++;
CurRange = 0;
}
}
// Во время пересчета сбрасываем привязку курсора к строке.
this.CurPos.Line = -1;
this.CurPos.Range = -1;
this.Internal_CheckSpelling();
//console.log("Recalc Fast Range");
return Result;
};
Paragraph.prototype.private_Recalculate_Fast_Range = function(_Line, _Range)
{
var PRS = this.m_oPRSW;
var XStart, YStart, XLimit, YLimit;
// Определим номер страницы
var CurLine = _Line;
var CurRange = _Range;
var CurPage = 0;
var PagesLen = this.Pages.length;
for ( var TempPage = 0; TempPage < PagesLen; TempPage++ )
{
var __Page = this.Pages[TempPage];
if ( CurLine <= __Page.EndLine && CurLine >= __Page.FirstLine )
{
CurPage = TempPage;
break;
}
}
if ( -1 === CurPage )
return -1;
var ParaPr = this.Get_CompiledPr2( false).ParaPr;
if ( 0 === CurPage )//|| ( undefined != this.Get_FramePr() && this.Parent instanceof CDocument ) )
{
XStart = this.X;
YStart = this.Y;
XLimit = this.XLimit;
YLimit = this.YLimit;
}
else
{
var PageStart = this.Parent.Get_PageContentStartPos( this.PageNum + CurPage, this.Index );
XStart = PageStart.X;
YStart = PageStart.Y;
XLimit = PageStart.XLimit;
YLimit = PageStart.YLimit;
}
PRS.XStart = XStart;
PRS.YStart = YStart;
PRS.XLimit = XLimit - ParaPr.Ind.Right;
PRS.YLimit = YLimit;
// Обнуляем параметры PRS для строки и отрезка
PRS.Reset_Line();
PRS.Page = 0;
PRS.Line = _Line;
PRS.Range = _Range;
PRS.RangesCount = this.Lines[CurLine].Ranges.length - 1;
PRS.Paragraph = this;
var RangesCount = PRS.RangesCount;
var Line = this.Lines[CurLine];
var Range = Line.Ranges[CurRange];
var StartPos = Range.StartPos;
var EndPos = Range.EndPos;
// Обновляем состояние пересчета
PRS.Reset_Range(Range.X, Range.XEnd);
var ContentLen = this.Content.length;
for ( var Pos = StartPos; Pos <= EndPos; Pos++ )
{
var Item = this.Content[Pos];
if ( para_Math === Item.Type )
{
// TODO: Надо бы перенести эту проверку на изменение контента параграфа
Item.MathPara = this.Check_MathPara(Pos);
}
PRS.Update_CurPos( Pos, 0 );
var SavedLines = Item.Save_RecalculateObject(true);
Item.Recalculate_Range( PRS, ParaPr, 1 );
if ( ( true === PRS.NewRange && Pos !== EndPos ) || ( Pos === EndPos && true !== PRS.NewRange ) )
return -1;
else if ( Pos === EndPos && true === PRS.NewRange && true === PRS.MoveToLBP )
{
Item.Recalculate_Set_RangeEndPos(PRS, PRS.LineBreakPos, 1);
}
// Нам нужно проверить только строку с номером CurLine
if ( false === SavedLines.Compare( _Line, _Range, Item ) )
return -1;
Item.Load_RecalculateObject(SavedLines, this);
}
// Recalculate_Lines_Width
var PRSC = this.m_oPRSC;
var StartPos = Range.StartPos;
var EndPos = Range.EndPos;
Range.Reset_Width();
PRSC.Reset( this, Range );
if ( true === this.Numbering.Check_Range(CurRange, CurLine) )
PRSC.Range.W += this.Numbering.WidthVisible;
for ( var Pos = StartPos; Pos <= EndPos; Pos++ )
{
var Item = this.Content[Pos];
Item.Recalculate_Range_Width( PRSC, CurLine, CurRange );
}
//------------------------------------------------
var RecalcResultAlign = this.Recalculate_Lines_Align(PRS, CurPage, ParaPr, true);
if ( recalcresult_NextElement !== RecalcResultAlign )
return -1;
return this.Get_StartPage_Absolute() + CurPage;
};
\ No newline at end of file
Word/Editor/Run.js
View file @ 36fc14bd
......@@ -2339,6 +2339,7 @@ ParaRun.prototype.Recalculate_Range_Spaces = function(PRSA, _CurLine, _CurRange,
// Тут мы должны сравнить положение картинок
var oRecalcObj = Item.Save_RecalculateObject();
var Page_abs = Para.Get_StartPage_Absolute() + CurPage;
Item.Update_Position( new CParagraphLayout( PRSA.X, PRSA.Y , Page_abs, PRSA.LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, Para.Pages[CurPage].Y + Para.Lines[CurLine].Y - Para.Lines[CurLine].Metrics.Ascent, Para.Pages[CurPage].Y), PageLimits);
if (Math.abs(Item.X - oRecalcObj.X) > 0.001 || Math.abs(Item.Y - oRecalcObj.Y) > 0.001 || Item.PageNum !== oRecalcObj.PageNum)
......
Word/TextEditor.html
View file @ 36fc14bd
......@@ -148,6 +148,7 @@
<script type="text/javascript" src="Editor/Run.js"></script>
<script type="text/javascript" src="Editor/Math.js"></script>
<script type="text/javascript" src="Editor/Paragraph.js"></script>
<script type="text/javascript" src="Editor/Paragraph_Recalculate.js"></script>
<script type="text/javascript" src="Editor/Sections.js"></script>
<script type="text/javascript" src="Editor/Numbering.js"></script>
<script type="text/javascript" src="Editor/HeaderFooter.js"></script>
......
Word/index.html
View file @ 36fc14bd
......@@ -164,6 +164,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Run.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Math.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Paragraph.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Paragraph_Recalculate.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Sections.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/HeaderFooter.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7