Skip to content

Commit c9927d5

Browse files
committed
Merge pull request #115 from bem/issue-114
Issue 114
2 parents 2ce6702 + b9cc230 commit c9927d5

File tree

7 files changed

+17
-5
lines changed

7 files changed

+17
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
History of changes
22
==================
33

4+
1.0.6
5+
-----
6+
7+
* Fixed _BEM preset_, set option **ignoreComments** to `false`.
8+
49
1.0.5
510
-----
611

CHANGELOG.ru.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
История изменений
22
=================
33

4+
1.0.6
5+
-----
6+
7+
* Исправлен _BEM preset_, значение опции **ignoreComments** стало `false`.
8+
49
1.0.5
510
-----
611

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ var HtmlDiffer = require('html-differ').HtmlDiffer,
225225
htmlDiffer = new HtmlDiffer('bem');
226226
```
227227

228-
The options wiil be predefined:
228+
The options will be predefined:
229229

230230
```js
231231
{
@@ -236,7 +236,7 @@ The options wiil be predefined:
236236
{ name: 'ondblclick', isFunction: true }
237237
],
238238
ignoreWhitespaces: true,
239-
ignoreComments: true,
239+
ignoreComments: false,
240240
ignoreEndTags: false,
241241
ignoreDuplicateAttributes: false
242242
}

README.ru.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ var HtmlDiffer = require('html-differ').HtmlDiffer,
236236
{ name: 'ondblclick', isFunction: true }
237237
],
238238
ignoreWhitespaces: true,
239-
ignoreComments: true,
239+
ignoreComments: false,
240240
ignoreEndTags: false,
241241
ignoreDuplicateAttributes: false
242242
}

lib/utils/defaults.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ var _ = require('lodash');
2121
'data-bem',
2222
{ name: 'onclick', isFunction: true },
2323
{ name: 'ondblclick', isFunction: true }
24-
]
24+
],
25+
ignoreComments: false
2526
};
2627
} else {
2728
console.error(options.bold.red + ' is an invalid preset name. Use ' + 'bem'.bold.green + ' instead.');

test/diff/fixtures/first/bem-preset.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!DOCTYPE html>
2+
<!-- comment -->
23
<html>
34
<head lang="en">
45
<meta charset="UTF-8">

test/diff/fixtures/second/bem-preset.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html><!-- comment -->
22
<html>
33
<head lang="en">
44
<meta charset="UTF-8">

0 commit comments

Comments
 (0)