Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Formuladependence" #92

Merged
merged 1 commit into from
Dec 21, 2016
Merged

Revert "Formuladependence" #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/build-mobile.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cd $BASEDIR

echo npm install

grunt --level=WHITESPACE_ONLY --mobile=true --noclosure=true --formatting=PRETTY_PRINT
grunt --level=WHITESPACE_ONLY --mobile=true --noclosure=true
echo grunt --level=ADVANCED --mobile=true --noclosure=true

echo -n $'\r' > temp.txt
Expand All @@ -25,4 +25,4 @@ cat "../../web-apps/vendor/xregexp/xregexp-all-min.js" "temp.txt" "../../web-app
cat "banners.js" "../cell/sdk-all-min.js" "../cell/sdk-all.js" > "../../mobile-apps/ios/Vendor/ONLYOFFICE/SDKData/spreadsheets/script.bin"

rm -f -r "banners.js"
rm -f -r "temp.txt"
rm -f -r "temp.txt"
27 changes: 3 additions & 24 deletions build/configs/nativeword.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
"../common/downloaderfiles.js",
"../common/commonDefines.js",
"../common/editorscommon.js",
"../common/HistoryCommon.js",
"../common/TableId.js",
"../common/TableIdChanges.js",
"../common/Private/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",
Expand Down Expand Up @@ -79,57 +77,38 @@

"../word/Editor/CollaborativeEditing.js",
"../word/Editor/Comments.js",
"../word/Editor/CommentsChanges.js",
"../word/Editor/History.js",
"../word/Editor/Styles.js",
"../word/Editor/StylesChanges.js",
"../word/Editor/Styles.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Paragraph/ParaTextPr.js",
"../word/Editor/Paragraph/ParaTextPrChanges.js",
"../word/Editor/Paragraph/ParaDrawing.js",
"../word/Editor/Paragraph/ParaDrawingChanges.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/HyperlinkChanges.js",
"../word/Editor/Field.js",
"../word/Editor/FieldChanges.js",
"../word/Editor/Run.js",
"../word/Editor/RunChanges.js",
"../word/Editor/Math.js",
"../word/Editor/MathChanges.js",
"../word/Editor/Paragraph.js",
"../word/Editor/ParagraphChanges.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/SectionsChanges.js",
"../word/Editor/Numbering.js",
"../word/Editor/NumberingChanges.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/DocumentContentBase.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentChanges.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/DocumentContentChanges.js",
"../word/Editor/DocumentControllerBase.js",
"../word/Editor/LogicDocumentController.js",
"../word/Editor/DrawingsController.js",
"../word/Editor/HeaderFooterController.js",
"../word/Editor/Common.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableChanges.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableRowChanges.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Table/TableCellChanges.js",
"../word/Editor/Serialize2.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Editor/Footnotes.js",
"../word/Editor/FootnotesChanges.js",
"../word/Editor/FootEndNote.js",
"../word/Drawing/Graphics.js",
"../common/Overlay.js",
Expand Down
29 changes: 4 additions & 25 deletions build/configs/webexcel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/HistoryCommon.js",
"../common/TableId.js",
"../common/TableIdChanges.js",
"../common/AdvancedOptions.js",
"../common/AdvancedOptions.js",
"../cell/apiDefines.js",
"../cell/utils/utils.js",
"../cell/view/HandlerList.js",
Expand Down Expand Up @@ -45,6 +42,7 @@
"../common/Drawings/ArcTo.js",
"../common/Drawings/ColorArray.js",

"../common/Drawings/Format/Constants.js",
"../common/Drawings/CommonController.js",
"../common/Drawings/States.js",
"../common/Drawings/Format/CreateGeometry.js",
Expand Down Expand Up @@ -82,7 +80,7 @@
"../common/Drawings/HatchPattern.js",

"../common/scroll.js",
"../common/Scrolls/iscroll.js",
"../cell/view/iscroll.js",

"../common/wordcopypaste.js",

Expand Down Expand Up @@ -129,54 +127,35 @@
"../cell/model/DrawingObjects/Format/ChartSpacePrototype.js",

"../word/Editor/Comments.js",
"../word/Editor/CommentsChanges.js",
"../word/Editor/Styles.js",
"../word/Editor/StylesChanges.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Paragraph/ParaTextPr.js",
"../word/Editor/Paragraph/ParaTextPrChanges.js",
"../word/Editor/Paragraph/ParaDrawing.js",
"../word/Editor/Paragraph/ParaDrawingChanges.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/HyperlinkChanges.js",
"../word/Editor/Field.js",
"../word/Editor/FieldChanges.js",
"../word/Editor/Run.js",
"../word/Editor/RunChanges.js",
"../word/Editor/Math.js",
"../word/Editor/MathChanges.js",
"../word/Editor/Paragraph.js",
"../word/Editor/ParagraphChanges.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/SectionsChanges.js",
"../word/Editor/Numbering.js",
"../word/Editor/NumberingChanges.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/DocumentContentBase.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentChanges.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/DocumentContentChanges.js",
"../word/Editor/DocumentControllerBase.js",
"../word/Editor/LogicDocumentController.js",
"../word/Editor/DrawingsController.js",
"../word/Editor/HeaderFooterController.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableChanges.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableRowChanges.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Table/TableCellChanges.js",
"../word/Editor/Serialize2.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Editor/Footnotes.js",
"../word/Editor/FootnotesChanges.js",
"../word/Editor/FootEndNote.js",
"../word/Editor/GraphicObjects/WrapManager.js",
"../word/Editor/Common.js",
Expand Down Expand Up @@ -249,7 +228,7 @@
"../common/FontsFreeType/TextMeasurer.js",
"../cell/model/DrawingObjects/Graphics.js",
"../common/Drawings/TextDrawer.js",
"../common/Scrolls/iscroll.js"
"../cell/view/iscroll.js"
],
"dst": "../cell",
"externs": [
Expand Down
24 changes: 2 additions & 22 deletions build/configs/webpowerpoint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/HistoryCommon.js",
"../common/TableId.js",
"../common/TableIdChanges.js",
"../common/AdvancedOptions.js",
"../common/AdvancedOptions.js",
"../slide/apiDefines.js",
"../common/CollaborativeEditingBase.js",
"../slide/Editor/CollaborativeEditing.js",
Expand Down Expand Up @@ -44,6 +41,7 @@
"../common/Drawings/ArcTo.js",
"../common/Drawings/ColorArray.js",

"../common/Drawings/Format/Constants.js",
"../common/Drawings/CommonController.js",
"../common/Drawings/States.js",
"../common/Drawings/Format/CreateGeometry.js",
Expand Down Expand Up @@ -102,16 +100,12 @@
"../word/Drawing/GraphicsEvents.js",
"../word/Drawing/Rulers.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableChanges.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableRowChanges.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Table/TableCellChanges.js",
"../word/Editor/Common.js",
"../word/Editor/Sections.js",
"../word/Editor/SectionsChanges.js",

"../word/Drawing/Graphics.js",
"../word/Drawing/ShapeDrawer.js",
Expand All @@ -126,21 +120,12 @@
"../slide/Editor/Format/Layout.js",
"../slide/Editor/Format/Comments.js",
"../word/Editor/Styles.js",
"../word/Editor/StylesChanges.js",
"../word/Editor/Numbering.js",
"../word/Editor/NumberingChanges.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Paragraph/ParaTextPr.js",
"../word/Editor/Paragraph/ParaTextPrChanges.js",
"../word/Editor/Paragraph/ParaDrawing.js",
"../word/Editor/Paragraph/ParaDrawingChanges.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/HyperlinkChanges.js",
"../word/Editor/Field.js",
"../word/Editor/FieldChanges.js",
"../word/Editor/Run.js",
"../word/Editor/RunChanges.js",
"../word/Math/mathTypes.js",
"../word/Math/mathText.js",
"../word/Math/mathContent.js",
Expand All @@ -156,23 +141,18 @@
"../word/Math/borderBox.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/Paragraph.js",
"../word/Editor/ParagraphChanges.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/DocumentContentBase.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentChanges.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/DocumentContentChanges.js",
"../word/Editor/DocumentControllerBase.js",
"../word/Editor/LogicDocumentController.js",
"../word/Editor/DrawingsController.js",
"../word/Editor/HeaderFooterController.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/Math.js",
"../word/Editor/MathChanges.js",
"../word/Editor/Spelling.js",
"../word/Editor/Footnotes.js",
"../word/Editor/FootnotesChanges.js",
"../word/Editor/FootEndNote.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
Expand Down
25 changes: 2 additions & 23 deletions build/configs/webword.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
"../common/apiCommon.js",
"../common/SerializeCommonWordExcel.js",
"../common/editorscommon.js",
"../common/HistoryCommon.js",
"../common/TableId.js",
"../common/TableIdChanges.js",
"../common/AdvancedOptions.js",
"../common/AdvancedOptions.js",
"../word/apiDefines.js",
"../common/CollaborativeEditingBase.js",
"../word/Editor/CollaborativeEditing.js",
Expand Down Expand Up @@ -47,6 +44,7 @@
"../common/Drawings/ArcTo.js",
"../common/Drawings/ColorArray.js",

"../common/Drawings/Format/Constants.js",
"../common/Drawings/CommonController.js",
"../word/Editor/GraphicObjects/DrawingStates.js",
"../common/Drawings/Format/CreateGeometry.js",
Expand Down Expand Up @@ -102,56 +100,37 @@
"../word/Editor/GraphicObjects/GraphicPage.js",
"../word/Editor/GraphicObjects/WrapManager.js",
"../word/Editor/Comments.js",
"../word/Editor/CommentsChanges.js",
"../word/Editor/Styles.js",
"../word/Editor/StylesChanges.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Paragraph/ParaTextPr.js",
"../word/Editor/Paragraph/ParaTextPrChanges.js",
"../word/Editor/Paragraph/ParaDrawing.js",
"../word/Editor/Paragraph/ParaDrawingChanges.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/HyperlinkChanges.js",
"../word/Editor/Field.js",
"../word/Editor/FieldChanges.js",
"../word/Editor/Run.js",
"../word/Editor/RunChanges.js",
"../word/Editor/Math.js",
"../word/Editor/MathChanges.js",
"../word/Editor/Paragraph.js",
"../word/Editor/ParagraphChanges.js",
"../word/Editor/Paragraph_Recalculate.js",
"../word/Editor/Sections.js",
"../word/Editor/SectionsChanges.js",
"../word/Editor/Numbering.js",
"../word/Editor/NumberingChanges.js",
"../word/Editor/HeaderFooter.js",
"../word/Editor/DocumentContentBase.js",
"../word/Editor/Document.js",
"../word/Editor/DocumentChanges.js",
"../word/Editor/DocumentContent.js",
"../word/Editor/DocumentContentChanges.js",
"../word/Editor/DocumentControllerBase.js",
"../word/Editor/LogicDocumentController.js",
"../word/Editor/DrawingsController.js",
"../word/Editor/HeaderFooterController.js",
"../word/Editor/Common.js",
"../word/Editor/Table.js",
"../word/Editor/Table/TableChanges.js",
"../word/Editor/Table/TableRecalculate.js",
"../word/Editor/Table/TableDraw.js",
"../word/Editor/Table/TableRow.js",
"../word/Editor/Table/TableRowChanges.js",
"../word/Editor/Table/TableCell.js",
"../word/Editor/Table/TableCellChanges.js",
"../word/Editor/Serialize2.js",
"../word/Editor/Search.js",
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Editor/Footnotes.js",
"../word/Editor/FootnotesChanges.js",
"../word/Editor/FootEndNote.js",

"../word/Drawing/Graphics.js",
Expand Down
2 changes: 1 addition & 1 deletion cell/.unit-tests/FormulaTests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<script type="text/javascript" src="../../../web-apps/apps/spreadsheeteditor/sdk_dev_scripts.js"></script>
<script>
window.sdk_dev_scrpipts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item.substring('../'.length) + '"><\/script>');
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
});
</script>

Expand Down
Loading