Commit c17e189

committed

Merge pull request #45 from vanishs/master

support arraybuffer

2 parents d1b2210 + fac7d45 commit c17e189Copy full SHA for c17e189

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`this.url = url \|\| 'Missing URL';`
`42`	`42`	`this.ssl = /(wss)/i.test(this.url);`
`43`	`43`
`44`		`- // this.binaryType = '';`
`45`	`44`	`// this.extensions = '';`
`46`	`45`	`// this.bufferedAmount = 0;`
`47`	`46`	`// this.trasnmitting = false;`
`@@ -54,6 +53,7 @@`
`54`	`53`	`this.initialTimeout = options && options.initialTimeout \|\| 500; // 500ms`
`55`	`54`	`this.maxTimeout = options && options.maxTimeout \|\| 5 * 60 * 1000; // 5 minutes`
`56`	`55`	`this.reconnectIfNotNormalClose = options && options.reconnectIfNotNormalClose \|\| false;`
	`56`	`+ this.binaryType = options && options.binaryType \|\| 'blob';`
`57`	`57`
`58`	`58`	`this._reconnectAttempts = 0;`
`59`	`59`	`this.sendQueue = [];`
`@@ -113,6 +113,7 @@`
`113`	`113`	`this.socket.onopen = angular.bind(this, this._onOpenHandler);`
`114`	`114`	`this.socket.onerror = angular.bind(this, this._onErrorHandler);`
`115`	`115`	`this.socket.onclose = angular.bind(this, this._onCloseHandler);`
	`116`	`+ this.socket.binaryType = this.binaryType;`
`116`	`117`	`}`
`117`	`118`	`};`
`118`	`119`
`@@ -121,7 +122,7 @@`
`121`	`122`	`var data = this.sendQueue.shift();`
`122`	`123`
`123`	`124`	`this.socket.send(`
`124`		`- isString(data.message) ? data.message : JSON.stringify(data.message)`
	`125`	`+ data.message`
`125`	`126`	`);`
`126`	`127`	`data.deferred.resolve();`
`127`	`128`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`this.url = url \|\| 'Missing URL';`
`42`	`42`	`this.ssl = /(wss)/i.test(this.url);`
`43`	`43`
`44`		`- // this.binaryType = '';`
`45`	`44`	`// this.extensions = '';`
`46`	`45`	`// this.bufferedAmount = 0;`
`47`	`46`	`// this.trasnmitting = false;`
`@@ -54,6 +53,7 @@`
`54`	`53`	`this.initialTimeout = options && options.initialTimeout \|\| 500; // 500ms`
`55`	`54`	`this.maxTimeout = options && options.maxTimeout \|\| 5 * 60 * 1000; // 5 minutes`
`56`	`55`	`this.reconnectIfNotNormalClose = options && options.reconnectIfNotNormalClose \|\| false;`
	`56`	`+ this.binaryType = options && options.binaryType \|\| 'blob';`
`57`	`57`
`58`	`58`	`this._reconnectAttempts = 0;`
`59`	`59`	`this.sendQueue = [];`
`@@ -113,6 +113,7 @@`
`113`	`113`	`this.socket.onopen = angular.bind(this, this._onOpenHandler);`
`114`	`114`	`this.socket.onerror = angular.bind(this, this._onErrorHandler);`
`115`	`115`	`this.socket.onclose = angular.bind(this, this._onCloseHandler);`
	`116`	`+ this.socket.binaryType = this.binaryType;`
`116`	`117`	`}`
`117`	`118`	`};`
`118`	`119`
`@@ -121,7 +122,7 @@`
`121`	`122`	`var data = this.sendQueue.shift();`
`122`	`123`
`123`	`124`	`this.socket.send(`
`124`		`- isString(data.message) ? data.message : JSON.stringify(data.message)`
	`125`	`+ data.message`
`125`	`126`	`);`
`126`	`127`	`data.deferred.resolve();`
`127`	`128`	`}`

Comments

(0)