smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,195 Commits 16 Branches 90 Tags
cb42c74a8d865d67a329af978e36aba52ef3a424
Commit Graph

1195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dolan
cb42c74a8d Make Paragraph declaritive 2019-06-12 01:03:36 +01:00
Dolan
5c1a731314 Version bump 5.0.0-rc2 2019-05-16 22:15:50 +01:00
Dolan
622331ad24 Merge pull request #324 from Scarface2013/master 
Fix merging of 3+ cells vertically
 2019-05-16 21:06:20 +01:00
Travis Fletcher
3a593a53d3 Fix tests 2019-05-16 11:15:20 -04:00
Travis Fletcher
31a9111667 Fix merging of 3+ cells vertically 2019-05-15 18:14:39 -04:00
Dolan
373c890354 Add docsify serve 2019-04-30 00:30:18 +01:00
Dolan
723d76d06f Merge pull request #314 from efx/fix-doc-links 
fix broken documentation links
 2019-04-29 12:08:27 +01:00
Eli Flanagan
a24d745d75 fix broken documentation links 2019-04-25 09:49:44 -04:00
Dolan
90891cfafd Merge pull request #310 from nickgeorgiou/feat/margin-spelling-fix 
Fix spelling of "margin"
 2019-04-18 17:10:00 +01:00
Nick Georgiou
29f890918c Fix spelling of "margin" 2019-04-18 13:55:18 +10:00
Dolan
b0f8f8ddbd Merge pull request #308 from filippomuscolino/master 
Update documentation
 2019-04-12 14:43:32 +01:00
fmuscolino
9c89c1ab59 Update docs 2019-04-12 13:46:05 +02:00
Dolan
7a9cb92955 Merge pull request #307 from brucehappy/features/xml_optimization 
Optimize XML output
 2019-04-11 22:50:10 +01:00
Bruce Duncan
77edf8862b Added constant EMPTY_OBJECT (an empty sealed object) that is used to indicate to the xml library that an empty XML element should be generated, and use it in the JSON hardcoded into the tests. 2019-04-10 13:47:38 -04:00
Bruce Duncan
bb1604cd8f Turn back on no-null-keyword. Use empty object instead of null to signal to the xml library that an empty element should be produced. Update the related tests. 
Related to #306
 2019-04-10 01:28:37 -04:00
Bruce Duncan
816cb54b14 Optimize XML output by properly constructing objects to send to the xml library so that it can produce proper empty elements. 
Rework the way attributes are stored in ImportedXmlComponent to match elsewhere (required allowing for a null xmlKeys in the XmlAttributeComponent interface).
Rework the way paragraphs get added to the end of table cells if needed.
The goal in both reworks is to not mess around with the objects output from `prepForXml` if we can avoid it.
Made the output of RunProperties, ParagraphProperties, TableCellProperties, TableRowProperties, and TableProperties all optional based on whether they contain any attributes or children.  Changed code in PageBorders, TableCellMargin, and TableCellBorders that implemented this same thing by overriding `prepForXml` so that it uses the new XmlComponent subclass instead.
Removed commented out code that attempted to fix-up XML output and make proper empty elements.
Fixed all affected tests.
Turn off `no-null-keyword` in the linter as we need to use null to signal to the `xml` library to create an empty element with no attributes (`undefined` will not work in its place).

Fixes #306
 2019-04-09 05:27:18 -04:00
Dolan
920bd3c175 Merge pull request #304 from brucehappy/issues/issue_303 
Fix table cell margin type XML attribute
 2019-04-08 20:30:54 +01:00
Bruce Duncan
a2a01edc24 Change table cell margin type attribute form w:sz to w:type as per http://officeopenxml.com/WPtableCellMargins.php 
Fixes #303
 2019-04-08 13:50:40 -04:00
Dolan
193d0c4239 Merge pull request #299 from filippomuscolino/fix-duplicated-section 
Fix: duplicated generation of last section properties
 2019-04-05 01:07:10 +01:00
Dolan
d8cc11c5ab Merge pull request #300 from efx/fix-typo 
fix minor typos
 2019-04-05 01:03:39 +01:00
Eli Flanagan
b874051f32 fix minor typos 2019-04-04 15:35:41 -04:00
fmuscolino
272e2496f4 Fix duplicated generation of last section properties 2019-04-04 17:43:54 +02:00
Dolan Miu
43c199c725 Version bump 5.0.0-rc1 2019-03-30 15:45:12 +00:00
Dolan
0e975b3d66 Merge pull request #292 from dolanmiu/feature/table-background 
Add shading (background color) for cell
 2019-03-21 01:33:11 +00:00
Dolan
c6ab47e838 Add shading 2019-03-21 01:06:07 +00:00
Dolan
48c17d51bb Merge pull request #288 from dolanmiu/feat/table 
Add margains, widths and floats to tables
 2019-03-19 00:19:55 +00:00
Dolan
df2315ae4a Disable e2e for demo 32 temporarily 2019-03-19 00:07:11 +00:00
Dolan
e67fd9cb2b Add tests and margain 2019-03-18 23:50:21 +00:00
Dolan
639842332f Change contribution guidelines 2019-03-13 23:13:10 +00:00
Dolan
2cb7d44a77 Work on new table API 2019-03-13 02:29:11 +00:00
Dolan
6cd62418a5 Update README.md 2019-03-12 20:26:39 +00:00
Dolan
f3ba11b21c Improving table api 2019-03-08 01:09:21 +00:00
Dolan
51b1e08a35 Merge pull request #284 from askoufis/numbering-docs-typo 
Fixes typo in numbering documentation
 2019-03-07 17:08:33 +00:00
askoufis
b0d0041ff9 Rewording and remove # 2019-03-07 15:36:06 +11:00
askoufis
55c5dd818a More typos 2019-03-07 15:33:32 +11:00
askoufis
3bebe0ad59 Found another typo 2019-03-07 15:32:16 +11:00
askoufis
c5c67fd92a Fixes typo in numbering documentation 2019-03-07 15:28:30 +11:00
Dolan
1486d3de56 Improve documentation 2019-03-07 01:01:01 +00:00
Dolan
6d8eea40be Merge branch 'master' of github.com:dolanmiu/docx 2019-03-06 22:53:23 +00:00
Dolan
0922d49cd3 Merge pull request #282 from filippomuscolino/fix/table-width 
Fix: table width in percentage should include '%'
 2019-03-06 13:52:49 +00:00
fmuscolino
f76471f553 Fix test 2019-03-06 13:33:50 +01:00
fmuscolino
973177676e fix: table width in percentage should include '%' 2019-03-06 12:21:15 +01:00
Dolan
5aa878b901 Fix invalid link 2019-03-06 02:12:41 +00:00
Dolan
b99d1fc129 correctly use include 2019-03-06 00:18:00 +00:00
Dolan
1590f9ac70 Merge pull request #274 from dolanmiu/feat/vertical-table-merge 
Add table column and vertical merging
 2019-03-05 23:53:12 +00:00
Dolan
6c772b956c Add examples to table documentation 2019-03-05 23:15:50 +00:00
Dolan
9d09ff3518 Update documentation 2019-03-05 21:57:31 +00:00
Dolan
d9ad69b7cd Merge pull request #278 from filippomuscolino/feat/style-improvements 
Add bold and italics to character style + customize hyperlink
 2019-03-05 20:59:21 +00:00
Dolan
e23d230acb Merge pull request #280 from filippomuscolino/feat/justify-line-break 
Add setting for not justify lines ending in soft line break
 2019-03-05 20:55:21 +00:00
Dolan
5ca872cb07 Merge pull request #279 from filippomuscolino/settings-fix 
Fix: settings are ignored by Word without relationship and content type
 2019-03-05 17:44:21 +00:00