improve isTypedArray

- by making sure it returns false on instances of DataView

Author: etpinard

.eslintrc

@@ -17,6 +17,7 @@
     "Int16Array": true,
     "Int32Array": true,
     "ArrayBuffer": true,
+    "DataView": true,
     "SVGElement": false
   },
   "rules": {

src/lib/is_array.js

@@ -8,13 +8,20 @@
 
 'use strict';
 
-// IE9 fallback
+// IE9 fallbacks
+
 var ab = (typeof ArrayBuffer === 'undefined' || !ArrayBuffer.isView) ?
     {isView: function() { return false; }} :
     ArrayBuffer;
 
-exports.isTypedArray = ab.isView;
+var dv = (typeof DataView === 'undefined') ?
+    function() {} :
+    DataView;
+
+exports.isTypedArray = function(a) {
+    return ab.isView(a) && !(a instanceof dv);
+};
 
 exports.isArrayOrTypedArray = function(a) {
-    return Array.isArray(a) || ab.isView(a);
+    return Array.isArray(a) || exports.isTypedArray(a);
 };

test/jasmine/assets/ie9_mock.js

@@ -6,3 +6,4 @@ delete window.Float32Array;
 delete window.Float64Array;
 delete window.Int16Array;
 delete window.Int32Array;
+delete window.DataView;

test/jasmine/bundle_tests/ie9_test.js

@@ -18,12 +18,13 @@ var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 
 describe('Bundle with IE9 supported trace types:', function() {
-
     afterEach(destroyGraphDiv);
 
-    it(' check that ie9_mock.js did its job', function() {
+    it('check that ie9_mock.js did its job', function() {
         expect(function() { return ArrayBuffer; })
             .toThrow(new ReferenceError('ArrayBuffer is not defined'));
+        expect(function() { return DataView; })
+            .toThrow(new ReferenceError('DataView is not defined'));
         expect(function() { return Uint8Array; })
             .toThrow(new ReferenceError('Uint8Array is not defined'));
     });

test/jasmine/tests/is_array_test.js

@@ -3,6 +3,9 @@ var Lib = require('@src/lib');
 describe('isArrayOrTypedArray', function() {
     function A() {}
 
+    var buffer = new ArrayBuffer(2);
+    var dv = new DataView(buffer);
+
     var shouldPass = [
         [],
         new Array(10),
@@ -26,7 +29,8 @@ describe('isArrayOrTypedArray', function() {
         '\n',
         new Date(),
         new RegExp('foo'),
-        new String('string')
+        new String('string'),
+        dv
     ];
 
     shouldPass.forEach(function(obj) {
@@ -45,6 +49,9 @@ describe('isArrayOrTypedArray', function() {
 describe('isTypedArray', function() {
     function A() {}
 
+    var buffer = new ArrayBuffer(2);
+    var dv = new DataView(buffer);
+
     var shouldPass = [
         new Float32Array(1),
         new Int32Array([1, 2, 3])
@@ -68,7 +75,8 @@ describe('isTypedArray', function() {
         '\n',
         new Date(),
         new RegExp('foo'),
-        new String('string')
+        new String('string'),
+        dv
     ];
 
     shouldPass.forEach(function(obj) {