Skip to content

Commit b949abc

Browse files
[chore] Release 3.1.1
1 parent 11f3fdd commit b949abc

File tree

3 files changed

+52
-43
lines changed

3 files changed

+52
-43
lines changed

History.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
3.1.1 / 2017-05-19
3+
===================
4+
5+
* [test] Launch browser tests on localhost by default (#571)
6+
* [chore] Unpin debug version (#568)
7+
28
3.1.0 / 2017-04-28
39
===================
410

engine.io.js

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3364,20 +3364,20 @@ return /******/ (function(modules) { // webpackBootstrap
33643364
// NB: In an Electron preload script, document will be defined but not fully
33653365
// initialized. Since we know we're in Chrome, we'll just detect this case
33663366
// explicitly
3367-
if (typeof window !== 'undefined' && window && typeof window.process !== 'undefined' && window.process.type === 'renderer') {
3367+
if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
33683368
return true;
33693369
}
33703370

33713371
// is webkit? http://stackoverflow.com/a/16459606/376773
33723372
// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
3373-
return (typeof document !== 'undefined' && document && 'WebkitAppearance' in document.documentElement.style) ||
3373+
return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
33743374
// is firebug? http://stackoverflow.com/a/398120/376773
3375-
(typeof window !== 'undefined' && window && window.console && (console.firebug || (console.exception && console.table))) ||
3375+
(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
33763376
// is firefox >= v31?
33773377
// https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
3378-
(typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
3378+
(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
33793379
// double check webkit in userAgent just in case we are in a worker
3380-
(typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
3380+
(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
33813381
}
33823382

33833383
/**
@@ -3916,11 +3916,11 @@ return /******/ (function(modules) { // webpackBootstrap
39163916
* Helpers.
39173917
*/
39183918

3919-
var s = 1000
3920-
var m = s * 60
3921-
var h = m * 60
3922-
var d = h * 24
3923-
var y = d * 365.25
3919+
var s = 1000;
3920+
var m = s * 60;
3921+
var h = m * 60;
3922+
var d = h * 24;
3923+
var y = d * 365.25;
39243924

39253925
/**
39263926
* Parse or format the given `val`.
@@ -3936,18 +3936,19 @@ return /******/ (function(modules) { // webpackBootstrap
39363936
* @api public
39373937
*/
39383938

3939-
module.exports = function (val, options) {
3940-
options = options || {}
3941-
var type = typeof val
3939+
module.exports = function(val, options) {
3940+
options = options || {};
3941+
var type = typeof val;
39423942
if (type === 'string' && val.length > 0) {
3943-
return parse(val)
3943+
return parse(val);
39443944
} else if (type === 'number' && isNaN(val) === false) {
3945-
return options.long ?
3946-
fmtLong(val) :
3947-
fmtShort(val)
3945+
return options.long ? fmtLong(val) : fmtShort(val);
39483946
}
3949-
throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val))
3950-
}
3947+
throw new Error(
3948+
'val is not a non-empty string or a valid number. val=' +
3949+
JSON.stringify(val)
3950+
);
3951+
};
39513952

39523953
/**
39533954
* Parse the given `str` and return milliseconds.
@@ -3958,53 +3959,55 @@ return /******/ (function(modules) { // webpackBootstrap
39583959
*/
39593960

39603961
function parse(str) {
3961-
str = String(str)
3962-
if (str.length > 10000) {
3963-
return
3962+
str = String(str);
3963+
if (str.length > 100) {
3964+
return;
39643965
}
3965-
var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str)
3966+
var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
3967+
str
3968+
);
39663969
if (!match) {
3967-
return
3970+
return;
39683971
}
3969-
var n = parseFloat(match[1])
3970-
var type = (match[2] || 'ms').toLowerCase()
3972+
var n = parseFloat(match[1]);
3973+
var type = (match[2] || 'ms').toLowerCase();
39713974
switch (type) {
39723975
case 'years':
39733976
case 'year':
39743977
case 'yrs':
39753978
case 'yr':
39763979
case 'y':
3977-
return n * y
3980+
return n * y;
39783981
case 'days':
39793982
case 'day':
39803983
case 'd':
3981-
return n * d
3984+
return n * d;
39823985
case 'hours':
39833986
case 'hour':
39843987
case 'hrs':
39853988
case 'hr':
39863989
case 'h':
3987-
return n * h
3990+
return n * h;
39883991
case 'minutes':
39893992
case 'minute':
39903993
case 'mins':
39913994
case 'min':
39923995
case 'm':
3993-
return n * m
3996+
return n * m;
39943997
case 'seconds':
39953998
case 'second':
39963999
case 'secs':
39974000
case 'sec':
39984001
case 's':
3999-
return n * s
4002+
return n * s;
40004003
case 'milliseconds':
40014004
case 'millisecond':
40024005
case 'msecs':
40034006
case 'msec':
40044007
case 'ms':
4005-
return n
4008+
return n;
40064009
default:
4007-
return undefined
4010+
return undefined;
40084011
}
40094012
}
40104013

@@ -4018,18 +4021,18 @@ return /******/ (function(modules) { // webpackBootstrap
40184021

40194022
function fmtShort(ms) {
40204023
if (ms >= d) {
4021-
return Math.round(ms / d) + 'd'
4024+
return Math.round(ms / d) + 'd';
40224025
}
40234026
if (ms >= h) {
4024-
return Math.round(ms / h) + 'h'
4027+
return Math.round(ms / h) + 'h';
40254028
}
40264029
if (ms >= m) {
4027-
return Math.round(ms / m) + 'm'
4030+
return Math.round(ms / m) + 'm';
40284031
}
40294032
if (ms >= s) {
4030-
return Math.round(ms / s) + 's'
4033+
return Math.round(ms / s) + 's';
40314034
}
4032-
return ms + 'ms'
4035+
return ms + 'ms';
40334036
}
40344037

40354038
/**
@@ -4045,7 +4048,7 @@ return /******/ (function(modules) { // webpackBootstrap
40454048
plural(ms, h, 'hour') ||
40464049
plural(ms, m, 'minute') ||
40474050
plural(ms, s, 'second') ||
4048-
ms + ' ms'
4051+
ms + ' ms';
40494052
}
40504053

40514054
/**
@@ -4054,12 +4057,12 @@ return /******/ (function(modules) { // webpackBootstrap
40544057

40554058
function plural(ms, n, name) {
40564059
if (ms < n) {
4057-
return
4060+
return;
40584061
}
40594062
if (ms < n * 1.5) {
4060-
return Math.floor(ms / n) + ' ' + name
4063+
return Math.floor(ms / n) + ' ' + name;
40614064
}
4062-
return Math.ceil(ms / n) + ' ' + name + 's'
4065+
return Math.ceil(ms / n) + ' ' + name + 's';
40634066
}
40644067

40654068

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "engine.io-client",
33
"description": "Client for the realtime Engine",
44
"license": "MIT",
5-
"version": "3.1.0",
5+
"version": "3.1.1",
66
"homepage": "https://github.com/socketio/engine.io-client",
77
"contributors": [
88
{

0 commit comments

Comments
 (0)