From 8bb7e94935efb2e3bcd35e1aad1786d6d568c917 Mon Sep 17 00:00:00 2001 From: Zoltan Horvath Date: Thu, 20 Jun 2013 15:32:25 -0700 Subject: [PATCH 1/4] Modify CSS Exclusions to CSS Shapes, since we split up the specification. Update references. --- feature-detects/css/shapes.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/feature-detects/css/shapes.js b/feature-detects/css/shapes.js index 3d60777672..15a8d9a51f 100644 --- a/feature-detects/css/shapes.js +++ b/feature-detects/css/shapes.js @@ -4,11 +4,14 @@ "property": "shapes", "tags": ["css"], "notes": [{ - "name": "Exclusions Spec", - "href": "http://www.w3.org/TR/css3-exclusions#shapes" + "name": "CSS Shapes W3C specification", + "href": "http://www.w3.org/TR/css-shapes" },{ - "name": "Example from Adobe", - "href": "http://html.adobe.com/webstandards/cssexclusions" + "name": "Examples from Adobe", + "href": "http://html.adobe.com/webplatform/layout/shapes" + }, { + "name": "Samples showcasing uses of Exclusions and Shapes", + "href": "http://codepen.io/collection/qFesk" }] } !*/ From 7c1a6d7621bc3633ba2dff2cc773b87dc5fcf3a6 Mon Sep 17 00:00:00 2001 From: Zoltan Horvath Date: Thu, 20 Jun 2013 15:39:39 -0700 Subject: [PATCH 2/4] Modify CSS Exclusions to CSS Shapes, since we split up the specification. Update references. --- feature-detects/css/shapes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature-detects/css/shapes.js b/feature-detects/css/shapes.js index 15a8d9a51f..22dc0bf4b9 100644 --- a/feature-detects/css/shapes.js +++ b/feature-detects/css/shapes.js @@ -10,7 +10,7 @@ "name": "Examples from Adobe", "href": "http://html.adobe.com/webplatform/layout/shapes" }, { - "name": "Samples showcasing uses of Exclusions and Shapes", + "name": "Samples showcasing uses of Shapes", "href": "http://codepen.io/collection/qFesk" }] } From 45122e175b82bf72e688cae868deb5ee29c8c162 Mon Sep 17 00:00:00 2001 From: Zoltan Horvath Date: Wed, 17 Jul 2013 17:10:15 -0700 Subject: [PATCH 3/4] Shape-inside's computed style now returns 6 parameters, since it includes the x any y-axis radius of the rounded rectangles. This change modifies the expected file to match with the new behavior. --- feature-detects/css/shapes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature-detects/css/shapes.js b/feature-detects/css/shapes.js index 3d60777672..fcec27bdcb 100644 --- a/feature-detects/css/shapes.js +++ b/feature-detects/css/shapes.js @@ -22,10 +22,10 @@ define(['Modernizr', 'createElement', 'docElement', 'prefixed', 'testStyles'], f var shapeInsideProperty = prefixedProperty.replace(/([A-Z])/g, function (str, m1) { return '-' + m1.toLowerCase(); }).replace(/^ms-/, '-ms-'); - return testStyles('#modernizr { ' + shapeInsideProperty + ':rectangle(0,0,0,0) }', function (elem) { + return testStyles('#modernizr { ' + shapeInsideProperty + ':rectangle(0,0,0,0,0,0) }', function (elem) { // Check against computed value var styleObj = window.getComputedStyle ? getComputedStyle(elem, null) : elem.currentStyle; - return styleObj[prefixed('shapeInside', docElement.style, false)] == 'rectangle(0px, 0px, 0px, 0px)'; + return styleObj[prefixed('shapeInside', docElement.style, false)] == 'rectangle(0px, 0px, 0px, 0px, 0px, 0px)'; }); }); }); From e42aa9f20bd511dcabedd95508d555465dbeccb7 Mon Sep 17 00:00:00 2001 From: Stu Cox Date: Thu, 1 Aug 2013 07:27:16 +0100 Subject: [PATCH 4/4] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 240927e8c379a7cc35822e4fb6c7724ef44bd0fb Author: Stu Cox Date: Thu Aug 1 07:26:31 2013 +0100 Correcting JSON typo commit 8729ddc22b1e6a91712ec939edb7e3bb3f8cc3e7 Author: Stu Cox Date: Thu Aug 1 07:19:58 2013 +0100 Squashed commit of the following: commit 273372b18f20a2b50a395d63aee56d18c7675748 Merge: 375aba0 901fc80 Author: Stu Cox Date: Thu Aug 1 07:18:25 2013 +0100 Merge branch 'supports' of https://github.com/Modernizr/Modernizr into supports Conflicts: feature-detects/css/flexbox.js commit 375aba0d7a2e8b6503b2c602c16170b9a9f494f5 Author: Stu Cox Date: Thu Aug 1 07:10:45 2013 +0100 Squashed commit of the following: commit 1a916b843e7896fe3ea71b4cb9d32f40bd41664f Merge: 901fc80 8cc5f1c Author: Stu Cox Date: Thu Aug 1 07:09:18 2013 +0100 Merge branch 'master' into supports Conflicts: feature-detects/css/flexbox.js commit 901fc805ec6397b99e3ea56c94a09f108a0809ca Author: Stu Cox Date: Mon May 20 08:15:49 2013 +0100 Added some comments about corner cases in `src/testProps` commit 29df5d9535d156f43f7e27fac2f2df867f566d75 Merge: ef920a5 98d877f Author: Stu Cox Date: Thu May 16 19:07:40 2013 +0100 Merge branch 'master' into supports Conflicts: feature-detects/css/resize.js feature-detects/css/userselect.js feature-detects/css/wrapflow.js commit ef920a51af7937f8b3ac36b1f6020b7b052ae655 Merge: 03fa4e0 3c46f00 Author: Stu Cox Date: Thu May 16 18:58:04 2013 +0100 Merge branch 'supports' of https://github.com/Modernizr/Modernizr into supports commit 03fa4e00703e558524cddc57de807f020b253f59 Author: Stu Cox Date: Thu May 16 18:57:44 2013 +0100 Revert "Revert "Added detect for