Commit Graph

355 Commits

Author SHA1 Message Date
Pierre Renaux
fee4d39367 feat(Gruntfile.js): Added package-c task which creates a unified single header css-layout.h for use in C code ; 2015-08-13 16:56:41 +08:00
Pierre Renaux
3e0a3697df feat(Gruntfile.js): Updated for Windows build ; 2015-08-13 16:30:58 +08:00
Colin Eberhardt
0de0186fbd Merge pull request #106 from ColinEberhardt/build-process-continues
Build complete and integrated with Travis
2015-08-13 08:37:26 +01:00
Colin Eberhardt
6eaa12e0b8 Added the JAR file 2015-08-12 08:54:53 +01:00
Colin Eberhardt
fec329f800 Updated README and travis.yml 2015-08-12 08:45:41 +01:00
Colin Eberhardt
6714c36824 Trying out travis 2015-08-12 08:25:57 +01:00
Colin Eberhardt
6d10a623d0 Added Java to the build 2015-08-12 07:42:29 +01:00
Colin Eberhardt
50c9712acd Merge pull request #105 from ColinEberhardt/build-process
Added a grunt build process
2015-08-12 07:19:20 +01:00
Colin Eberhardt
8ba0d1c608 Added transpile and 'c' tests 2015-08-12 06:17:53 +01:00
Colin Eberhardt
5653e4ef82 Fixed build and added distribution files to the repo 2015-08-11 21:22:27 +01:00
Colin Eberhardt
7f9b3afe33 Updated documentation
(And added missing change from previous commit!)
2015-08-11 17:56:21 +01:00
Colin Eberhardt
3b406b30c2 Module pattern is now implemented via templating
Previously two modules were defined, Layout.js, which is the internal implementation, and main.js, which depended on Layout.js and performed the fill / extract functionality required for a public JavaScript API.

This simplifies the implementation by just exposing a single UMD module by directly including Layout.js within the module wrapper.

Fixes #103
2015-08-11 17:42:59 +01:00
Colin Eberhardt
401f473449 Added eslint to the build
Fixes #102
2015-08-11 16:52:57 +01:00
Colin Eberhardt
74925f4439 Added karma testing to the gruntfile 2015-08-11 14:42:21 +01:00
Colin Eberhardt
ffa64f6fd3 Added a grunt build
This copies Layout.js to a dist folder, minifies and source-maps.
2015-08-11 13:49:52 +01:00
Christopher Chedeau
a87e9e382f Merge pull request #99 from jaredly/flex-fix
Flex bug
2015-08-10 08:45:08 -07:00
Jared Forsyth
f7bab441e0 change to an xit 2015-08-06 12:35:12 -07:00
Jared Forsyth
3e9ac12d22 add failing test 2015-08-06 09:36:28 -07:00
Jared Forsyth
e1d99952f7 update const 2015-08-05 21:57:06 -07:00
Jared Forsyth
5221f3ab7e Merge pull request #96 from mkonicek/master
Fix a typo in CSSLayout.toString()
2015-08-05 16:00:29 -07:00
Martin Konicek
b8981485d4 Fix a typo in CSSLayout.toString 2015-07-30 12:22:14 +01:00
Andy Street
93d6f84d3a Merge pull request #95 from astreet/lazy_children
Lazy init children array in CSSNode, update removeChildAt to return removed child
2015-07-29 12:00:48 +01:00
Andy Street
7104f7c8eb Lazy init children ArrayList in CSSNode, update removeChildAt to return removed child 2015-07-29 11:39:42 +01:00
Christopher Chedeau
ae56a1d618 Merge pull request #92 from lucasr/get-style-direction
Add style direction getter to CSSNode
2015-05-27 19:04:16 -07:00
Lucas Rocha
3fc99b02ae Add style direction getter to CSSNode 2015-05-27 19:19:43 +01:00
Krzysztof Magiera
e932e4420d Update visibility of isDirty in CSSNode 2015-05-21 17:35:46 +01:00
Felix Oghină
9b79121875 Merge pull request #91 from lucasr/expose-direction
Expose the resolved direction in the node's layout
2015-05-20 14:10:34 +01:00
Lucas Rocha
524b44200a Expose the resolved direction in the node's layout 2015-05-20 11:35:01 +01:00
Christopher Chedeau
ee1cbacc30 Merge pull request #79 from prenaux/master
[Issue facebook/css-layout#78]: Implemented alignContent ;
2015-05-17 08:58:05 -07:00
Pierre Renaux
019fc9b88c Merge remote-tracking branch 'upstream/master' 2015-05-17 21:54:30 +08:00
Felix Oghină
ef47d8e318 Merge pull request #90 from foghina/getraw
[java] use getRaw to test if START/END were set
2015-05-15 17:57:07 +01:00
Felix Oghină
da98e234d7 [java] use getRaw to test if START/END were set 2015-05-15 16:52:57 +01:00
Christopher Chedeau
0e47d8a972 Merge pull request #89 from foghina/better_spacing
[java] simplify Spacing, reduce allocations
2015-05-15 07:07:57 -07:00
Felix Oghină
11f09d1a65 [java] simplify Spacing, reduce allocations 2015-05-15 14:13:25 +01:00
Christopher Chedeau
b5da5e4d7c Merge pull request #88 from lucasr/dimension-getters
Add getters for CSSNode's style width and height
2015-05-14 13:22:47 -07:00
Lucas Rocha
6d72f472f5 Add getters for CSSNode's style width and height 2015-05-14 20:59:14 +01:00
Christopher Chedeau
4036fa8c9e Merge pull request #86 from lucasr/start-end
Implement (padding|border|margin)-(start|end) support
2015-05-14 10:10:32 -07:00
Lucas Rocha
03dfe7bb17 Implement (padding|border|margin)-(start|end) support 2015-05-14 17:43:33 +01:00
Christopher Chedeau
c3a2ddcce7 Merge pull request #84 from lukasreichart/master
If the measure function is defined: only return from execution of lay…
2015-05-14 08:48:04 -07:00
Christopher Chedeau
9c9c74bb11 Merge pull request #87 from foghina/spacing
[java] implement proper spacing objects, with support for default spacing
2015-05-14 07:39:19 -07:00
Felix Oghină
bb8fdf57eb [java] implement proper spacing objects, with support for default spacing 2015-05-14 13:59:13 +01:00
Christopher Chedeau
ba879af8ae Merge pull request #85 from nicklockwood/master
Fixed spacing for wrapped elements
2015-05-13 18:10:34 -07:00
Nick Lockwood
9175721f07 Removed space before -- for consistency with code style. 2015-05-12 10:10:39 +01:00
Nick Lockwood
bf1d7eacfd Fixed spacing for wrapped elements 2015-05-12 09:54:02 +01:00
Christopher Chedeau
729f7d42b1 Merge pull request #82 from lucasr/rtl
Support RTL direction and ROW_REVERSE & COLUMN_REVERSE flex direction
2015-05-11 10:32:42 -07:00
Lucas Rocha
36a46673f9 Support ROW_REVERSE, COLUMN_REVERSE and RTL direction 2015-05-11 11:24:21 +01:00
Lukas Reichart
fca176109d If the measure function is defined: only return from execution of layoutNode, when the node has no children. 2015-05-10 17:46:48 +02:00
Pierre Renaux
a91566d6db [src/Layout.c & Layout-test-utils.c]: Don't define fmaxf/fminf if we're building with VC12+, its already declared from then on ; 2015-05-10 00:20:29 +08:00
Pierre Renaux
176bb6097b [Makefile]: Use cl (MSVC) on Windows ; 2015-05-10 00:20:29 +08:00
Pierre Renaux
09f0c12a8f [src/Layout.js]: Cleaner line loop in <Loop E> (alignContent layout) ; 2015-05-10 00:20:29 +08:00