File tree 3 files changed +19
-17
lines changed
3 files changed +19
-17
lines changed Original file line number Diff line number Diff line change 1
- function canCleanWhitespace ( node ) {
2
- if ( node . type !== 'Operator ') {
3
- return false ;
1
+ module . exports = function cleanWhitespace ( node , item , list ) {
2
+ if ( node . value === '+' || node . value === '- ') {
3
+ return ;
4
4
}
5
5
6
- return node . value !== '+' && node . value !== '-' ;
7
- }
8
-
9
- module . exports = function cleanWhitespace ( node , item , list ) {
10
- var prev = item . prev && item . prev . data ;
11
- var next = item . next && item . next . data ;
6
+ if ( item . prev !== null && item . prev . data . type === 'Space' ) {
7
+ list . remove ( item . prev ) ;
8
+ }
12
9
13
- if ( canCleanWhitespace ( prev ) || canCleanWhitespace ( next ) ) {
14
- list . remove ( item ) ;
10
+ if ( item . next !== null && item . next . data . type === 'Space' ) {
11
+ list . remove ( item . next ) ;
15
12
}
16
13
} ;
Original file line number Diff line number Diff line change 2
2
module . exports = function cleanType ( node , item , list ) {
3
3
var name = item . data . name ;
4
4
5
- // check it's a universal selector
6
- if ( name . charAt ( name . length - 1 ) !== '*' ) {
5
+ // check it's a non-namespaced universal selector
6
+ if ( name !== '*' ) {
7
7
return ;
8
8
}
9
9
10
- // remove when universal selector isn't last or before combinator
11
- if ( item . next !== null && item . next . data . type !== 'Combinator' ) {
10
+ // remove when universal selector before other selectors
11
+ var nextType = item . next && item . next . data . type ;
12
+ if ( nextType === 'IdSelector' ||
13
+ nextType === 'ClassSelector' ||
14
+ nextType === 'AttributeSelector' ||
15
+ nextType === 'PseudoClassSelector' ||
16
+ nextType === 'PseudoElementSelector' ) {
12
17
list . remove ( item ) ;
13
18
}
14
19
} ;
Original file line number Diff line number Diff line change 1
1
var walk = require ( 'css-tree' ) . walkUp ;
2
2
var handlers = {
3
- Space : require ( './Space' ) ,
4
3
Atrule : require ( './Atrule' ) ,
5
4
Rule : require ( './Rule' ) ,
6
5
Declaration : require ( './Declaration' ) ,
7
6
TypeSelector : require ( './TypeSelector' ) ,
8
- Comment : require ( './Comment' )
7
+ Comment : require ( './Comment' ) ,
8
+ Operator : require ( './Space' )
9
9
} ;
10
10
11
11
module . exports = function ( ast , usageData ) {
You can’t perform that action at this time.
0 commit comments