Merge pull request #115 from bem/issue-114

eGavr · eGavr · commit c9927d518f5f · 2015-01-02T23:43:00.000+03:00
Issue 114
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 History of changes
 ==================
 
+1.0.6
+-----
+
+* Fixed _BEM preset_, set option **ignoreComments** to `false`.
+
 1.0.5
 -----
 
diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md
@@ -1,6 +1,11 @@
 История изменений
 =================
 
+1.0.6
+-----
+
+* Исправлен _BEM preset_, значение опции **ignoreComments** стало `false`.
+
 1.0.5
 -----
 
diff --git a/README.md b/README.md
@@ -225,7 +225,7 @@ var HtmlDiffer = require('html-differ').HtmlDiffer,
     htmlDiffer = new HtmlDiffer('bem');
 ```
 
-The options wiil be predefined:
+The options will be predefined:
 
 ```js
 {
@@ -236,7 +236,7 @@ The options wiil be predefined:
         { name: 'ondblclick', isFunction: true }
     ],
     ignoreWhitespaces: true,
-    ignoreComments: true,
+    ignoreComments: false,
     ignoreEndTags: false,
     ignoreDuplicateAttributes: false
 }
diff --git a/README.ru.md b/README.ru.md
@@ -236,7 +236,7 @@ var HtmlDiffer = require('html-differ').HtmlDiffer,
         { name: 'ondblclick', isFunction: true }
     ],
     ignoreWhitespaces: true,
-    ignoreComments: true,
+    ignoreComments: false,
     ignoreEndTags: false,
     ignoreDuplicateAttributes: false
 }
diff --git a/lib/utils/defaults.js b/lib/utils/defaults.js
@@ -21,7 +21,8 @@ var _ = require('lodash');
                     'data-bem',
                     { name: 'onclick', isFunction: true },
                     { name: 'ondblclick', isFunction: true }
-                ]
+                ],
+                ignoreComments: false
             };
         } else {
             console.error(options.bold.red + ' is an invalid preset name. Use ' + 'bem'.bold.green + ' instead.');
diff --git a/test/diff/fixtures/first/bem-preset.html b/test/diff/fixtures/first/bem-preset.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!-- comment -->
 <html>
 <head lang="en">
     <meta charset="UTF-8">
diff --git a/test/diff/fixtures/second/bem-preset.html b/test/diff/fixtures/second/bem-preset.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- comment -->
 <html>
 <head lang="en">
     <meta charset="UTF-8">

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ var HtmlDiffer = require('html-differ').HtmlDiffer,`
`236`	`236`	`{ name: 'ondblclick', isFunction: true }`
`237`	`237`	`],`
`238`	`238`	`ignoreWhitespaces: true,`
`239`		`- ignoreComments: true,`
	`239`	`+ ignoreComments: false,`
`240`	`240`	`ignoreEndTags: false,`
`241`	`241`	`ignoreDuplicateAttributes: false`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<!DOCTYPE html>`
	`2`	`+<!-- comment -->`
`2`	`3`	`<html>`
`3`	`4`	`<head lang="en">`
`4`	`5`	`<meta charset="UTF-8">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!DOCTYPE html><!-- comment -->`
`2`	`2`	`<html>`
`3`	`3`	`<head lang="en">`
`4`	`4`	`<meta charset="UTF-8">`