Fix some bugs

bem · Jul 15, 2014 · 13ce98d · 13ce98d
1 parent b0e63f9
commit 13ce98d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/diff-logger.js b/lib/diff-logger.js
@@ -20,7 +20,7 @@ function getDiffText(diff, options) {
     var charsAroundDiff = options.charsAroundDiff,
         output = '';
 
-    if (charsAroundDiff > 0) {
+    if (charsAroundDiff < 0) {
         charsAroundDiff = 20;
     }
 
@@ -35,7 +35,7 @@ function getDiffText(diff, options) {
         if (part.removed) color = 'red';
 
         if (color !== 'grey') {
-            output += (!index ? '\n' : '') +  partValue[color];
+            output += (!index ? '\n' : '') + partValue[color];
 
             return;
         }

diff --git a/lib/index.js b/lib/index.js
@@ -142,6 +142,8 @@ HtmlDiffer.prototype.diffHtml = function(html1, html2, options) {
         console.warn('WARNING! The third param of "diffHtml" method is deprecated!');
     }
 
+    options = _.defaults(this.options, options);
+
     var htmlDiffer = new HtmlDiff(options);
 
     return htmlDiffer.diff(html1, html2);

diff --git a/lib/utils.js b/lib/utils.js
@@ -38,7 +38,7 @@ exports.parseAttr = function(val, isClick) {
 };
 
 /**
- * Sorts the gieven CSS class attribute
+ * Sorts the given CSS class attribute
  * @param {String} cssClasses
  * @returns {String}
  */