No toArrayBuffer() method provided in old browsers

diff --git a/index.js b/index.js
index f0aa5e8c048f1741eb4f9afade978e94c2b469e5..76564ef80e428b1adb9d30d45123f9026fe6cb88 100644 (file)
--- a/index.js
+++ b/index.js
@@ -971,6 +971,8 @@ var ProxyHandler = {
 
 function augment (arr) {
   if (browserSupport) {
+    arr._isBuffer = true
+
     // Augment the Uint8Array *instance* (not the class!) with Buffer methods
     arr.write = BufferWrite
     arr.toString = BufferToString
@@ -1008,8 +1010,11 @@ function augment (arr) {
     arr.writeDoubleBE = BufferWriteDoubleBE
     arr.fill = BufferFill
     arr.inspect = BufferInspect
-    arr.toArrayBuffer = BufferToArrayBuffer
-    arr._isBuffer = true
+
+    // Only add `toArrayBuffer` if we're using an augmented native Uint8Array
+    if (xUint8Array !== TA.Uint8Array) {
+      arr.toArrayBuffer = BufferToArrayBuffer
+    }
 
     if (arr.byteLength !== 0)
       arr._dataview = new xDataView(arr.buffer, arr.byteOffset, arr.byteLength)

diff --git a/test/basic.js b/test/basic.js
index 091f610a905dc537a18734ed6eb92d33155b06ee..8af68cc45322e696ae16ffb4ce938b39b7e495ff 100644 (file)
--- a/test/basic.js
+++ b/test/basic.js
@@ -1,10 +1,5 @@
 var B = require('../index.js').Buffer
 var test = require('tape')
-var TA = require('typedarray')
-var xUint16Array = typeof Uint16Array === 'undefined'
-  ? TA.Uint16Array : Uint16Array
-var xUint8Array = typeof Uint8Array === 'undefined'
-  ? TA.Uint8Array : Uint8Array
 
 test('new buffer from array', function (t) {
     t.plan(1)
@@ -25,17 +20,20 @@ test('new buffer from string', function (t) {
 })
 
 function arraybufferToString (arraybuffer) {
-  return String.fromCharCode.apply(null, new xUint16Array(arraybuffer))
+  return String.fromCharCode.apply(null, new Uint16Array(arraybuffer))
 }
 
 test('buffer toArrayBuffer()', function (t) {
-    t.plan(1)
-    var data = [1, 2, 3, 4, 5, 6, 7, 8]
+  var data = [1, 2, 3, 4, 5, 6, 7, 8]
+  if (typeof (new B(data)).toArrayBuffer === 'function') {
     t.equal(
         arraybufferToString(new B(data).toArrayBuffer()),
-        arraybufferToString(new xUint8Array(data).buffer)
+        arraybufferToString(new Uint8Array(data).buffer)
     )
-    t.end()
+  } else {
+    t.pass('No toArrayBuffer() method provided in old browsers')
+  }
+  t.end()
 })
 
 test('buffer toJSON()', function (t) {