From 2fe18ee5854c6a1dffcae14dfe4742c9228ffeea Mon Sep 17 00:00:00 2001 From: Jakub Pawlowicz Date: Sun, 15 Jan 2017 12:08:19 +0100 Subject: [PATCH] See #290 - disables `animation` shorthand overriding. Why: * It's a shorthand property, so not straightforward to implement in shorthand/override compacting; * pending in #860. --- lib/optimizer/level-2/compacting/optimize.js | 32 ------------------- .../compacting/longhand-overriding-test.js | 8 ----- 2 files changed, 40 deletions(-) diff --git a/lib/optimizer/level-2/compacting/optimize.js b/lib/optimizer/level-2/compacting/optimize.js index 687e61772..5b60cfdb9 100644 --- a/lib/optimizer/level-2/compacting/optimize.js +++ b/lib/optimizer/level-2/compacting/optimize.js @@ -14,38 +14,6 @@ var OptimizationLevel = require('../../../options/optimization-level').Optimizat var serializeProperty = require('../../../writer/one-time').property; var shorthands = { - 'animation-delay': ['animation'], - 'animation-direction': ['animation'], - 'animation-duration': ['animation'], - 'animation-fill-mode': ['animation'], - 'animation-iteration-count': ['animation'], - 'animation-name': ['animation'], - 'animation-play-state': ['animation'], - 'animation-timing-function': ['animation'], - '-moz-animation-delay': ['-moz-animation'], - '-moz-animation-direction': ['-moz-animation'], - '-moz-animation-duration': ['-moz-animation'], - '-moz-animation-fill-mode': ['-moz-animation'], - '-moz-animation-iteration-count': ['-moz-animation'], - '-moz-animation-name': ['-moz-animation'], - '-moz-animation-play-state': ['-moz-animation'], - '-moz-animation-timing-function': ['-moz-animation'], - '-o-animation-delay': ['-o-animation'], - '-o-animation-direction': ['-o-animation'], - '-o-animation-duration': ['-o-animation'], - '-o-animation-fill-mode': ['-o-animation'], - '-o-animation-iteration-count': ['-o-animation'], - '-o-animation-name': ['-o-animation'], - '-o-animation-play-state': ['-o-animation'], - '-o-animation-timing-function': ['-o-animation'], - '-webkit-animation-delay': ['-webkit-animation'], - '-webkit-animation-direction': ['-webkit-animation'], - '-webkit-animation-duration': ['-webkit-animation'], - '-webkit-animation-fill-mode': ['-webkit-animation'], - '-webkit-animation-iteration-count': ['-webkit-animation'], - '-webkit-animation-name': ['-webkit-animation'], - '-webkit-animation-play-state': ['-webkit-animation'], - '-webkit-animation-timing-function': ['-webkit-animation'], 'border-color': ['border'], 'border-style': ['border'], 'border-width': ['border'], diff --git a/test/optimizer/level-2/compacting/longhand-overriding-test.js b/test/optimizer/level-2/compacting/longhand-overriding-test.js index e1c0eceb8..b57d05fae 100644 --- a/test/optimizer/level-2/compacting/longhand-overriding-test.js +++ b/test/optimizer/level-2/compacting/longhand-overriding-test.js @@ -98,14 +98,6 @@ function overrideContext(longhands) { vows.describe(optimize) .addBatch( overrideContext({ - 'animation-delay': ['animation'], - 'animation-direction': ['animation'], - 'animation-duration': ['animation'], - 'animation-fill-mode': ['animation'], - 'animation-iteration-count': ['animation'], - 'animation-name': ['animation'], - 'animation-play-state': ['animation'], - 'animation-timing-function': ['animation'], 'background-attachment': ['background'], 'background-clip': ['background'], 'background-color': ['background'],