lint + add test for open[i] === close[i] cases

Author: etpinard

src/traces/ohlc/helpers.js

@@ -95,19 +95,21 @@ exports.makeTransform = function(traceIn, state, direction) {
 };
 
 exports.getFilterFn = function(direction) {
+    return new _getFilterFn(direction);
+};
 
-    var fn;
+function _getFilterFn(direction) {
     var isPrevThisDirection = null;
-    var oprev = null;
-    var cprev = null;
+    var cPrev = null;
+    var fn;
 
     switch(direction) {
         case 'increasing':
-            var fn = function(o, c) {
+            fn = function(o, c) {
                 if(o === c) {
-                    if(c > cprev) {
+                    if(c > cPrev) {
                         return true; // increasing
-                    } else if(c < cprev) {
+                    } else if(c < cPrev) {
                         return false; // decreasing
                     } else {
                         if(isPrevThisDirection === true) {
@@ -124,11 +126,11 @@ exports.getFilterFn = function(direction) {
             break;
 
         case 'decreasing':
-            var fn = function(o, c) {
+            fn = function(o, c) {
                 if(o === c) {
-                    if(c > cprev) {
+                    if(c > cPrev) {
                         return false; // increasing
-                    } else if(c < cprev) {
+                    } else if(c < cPrev) {
                         return true; // decreasing
                     } else {
                         if(isPrevThisDirection === true) {
@@ -142,18 +144,17 @@ exports.getFilterFn = function(direction) {
                 }
                 return o > c;
             };
-            break
+            break;
     }
-    
+
     return function(o, c) {
         var out = fn(o, c);
         isPrevThisDirection = !!out;
-        oprev = o;
-        cprev = c;
+        cPrev = c;
         return out;
     };
+}
 
-};
 exports.addRangeSlider = function(data, layout) {
     var hasOneVisibleTrace = false;
 

test/jasmine/tests/finance_test.js

@@ -704,6 +704,45 @@ describe('finance charts calc transforms:', function() {
         expect(out[1].x).toEqual([]);
         expect(out[3].x).toEqual([]);
     });
+
+    it('should handle cases where \'open\' and \'close\' entries are equal', function() {
+        var out = _calc([{
+            type: 'ohlc',
+            open: [0, 1, 0, 2, 1, 1, 2, 2],
+            high: [3, 3, 3, 3, 3, 3, 3, 3],
+            low: [-1, -1, -1, -1, -1, -1, -1, -1],
+            close: [0, 2, 0, 1, 1, 1, 2, 2],
+            tickwidth: 0
+        }, {
+            type: 'candlestick',
+            open: [0, 2, 0, 1],
+            high: [3, 3, 3, 3],
+            low: [-1, -1, -1, -1],
+            close: [0, 1, 0, 2]
+        }]);
+
+        expect(out[0].x).toEqual([
+            0, 0, 0, 0, 0, 0, null,
+            1, 1, 1, 1, 1, 1, null,
+            6, 6, 6, 6, 6, 6, null,
+            7, 7, 7, 7, 7, 7, null
+        ]);
+        expect(out[1].x).toEqual([
+            2, 2, 2, 2, 2, 2, null,
+            3, 3, 3, 3, 3, 3, null,
+            4, 4, 4, 4, 4, 4, null,
+            5, 5, 5, 5, 5, 5, null
+        ]);
+
+        expect(out[2].x).toEqual([
+            0, 0, 0, 0, 0, 0,
+            3, 3, 3, 3, 3, 3
+        ]);
+        expect(out[3].x).toEqual([
+            1, 1, 1, 1, 1, 1,
+            2, 2, 2, 2, 2, 2
+        ]);
+    });
 });
 
 describe('finance charts updates:', function() {