fixed wrong osc send data type check

adzialocha · Aug 10, 2014 · 8748778 · 8748778
1 parent 47b6d09
commit 8748778
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
  "name": "osc-js",
  "description": "OSC protocol interface with address pattern matching for javascript applications",
- "version": "0.1.0",
+ "version": "0.1.1",
  "authors": [
  "marmorkuchen.net <[email protected]>"
  ],

diff --git a/dist/osc.js b/dist/osc.js
@@ -1,4 +1,4 @@
-/*! osc-js - v0.1.0 - 2014-05-14 by marmorkuchen.net */
+/*! osc-js - v0.1.1 - 2014-08-10 by marmorkuchen.net */
 (function(window, undefined) {
  "use strict";
  var FLAGS = {
@@ -214,11 +214,15 @@
  }
  };
  OSCSocket.prototype.send = function(sData) {
- if (sData && sData instanceof ArrayBuffer) {
- this._socket.send(sData.buffer);
- return true;
+ if (this._socket) {
+ if (sData && sData.buffer && sData.buffer instanceof ArrayBuffer) {
+ this._socket.send(sData.buffer);
+ return true;
+ } else {
+ return false;
+ }
  } else {
- return false;
+ throw "OSCSocket Error: WebSocket is not ready to send OSC data";
  }
  };
  var OSCAtomic = {};

diff --git a/dist/osc.min.js b/dist/osc.min.js
diff --git a/dist/osc.min.map b/dist/osc.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "osc-js",
- "version": "0.1.0",
+ "version": "0.1.1",
  "dependencies": {},
  "devDependencies": {
  "grunt": "~0.4.4",

diff --git a/src/osc.js b/src/osc.js
@@ -310,11 +310,15 @@
  };
 
  OSCSocket.prototype.send = function(sData) {
- if (sData && sData instanceof ArrayBuffer) {
- this._socket.send(sData.buffer);
- return true;
+ if (this._socket) {
+ if (sData && sData.buffer && sData.buffer instanceof ArrayBuffer) {
+ this._socket.send(sData.buffer);
+ return true;
+ } else {
+ return false;
+ }
  } else {
- return false;
+ throw 'OSCSocket Error: WebSocket is not ready to send OSC data';
  }
  };