Skip to content

Commit b0081b8

Browse files
committed
2 parents 8b75ae6 + c8b39f3 commit b0081b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+354
-259
lines changed

Gemfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,21 +204,23 @@ GEM
204204
rb-fsevent (~> 0.10, >= 0.10.3)
205205
rb-inotify (~> 0.9, >= 0.9.10)
206206
mercenary (0.3.6)
207-
mini_portile2 (2.4.0)
207+
mini_portile2 (2.5.0)
208208
minima (2.5.1)
209209
jekyll (>= 3.5, < 5.0)
210210
jekyll-feed (~> 0.9)
211211
jekyll-seo-tag (~> 2.1)
212212
minitest (5.14.2)
213213
multipart-post (2.1.1)
214-
nokogiri (1.10.10)
215-
mini_portile2 (~> 2.4.0)
214+
nokogiri (1.11.1)
215+
mini_portile2 (~> 2.5.0)
216+
racc (~> 1.4)
216217
octokit (4.18.0)
217218
faraday (>= 0.9)
218219
sawyer (~> 0.8.0, >= 0.5.3)
219220
pathutil (0.16.2)
220221
forwardable-extended (~> 2.6)
221222
public_suffix (3.1.1)
223+
racc (1.5.2)
222224
rb-fsevent (0.10.4)
223225
rb-inotify (0.10.1)
224226
ffi (~> 1.0)

_data/authors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ stompjs:
66
location:
77
email:
88
links:
9-
- label: stompjs@6.0.0
9+
- label: stompjs@6.1.2
1010
icon: fab fa-fw fa-github
1111
url: https://github.com/stomp-js/stompjs
12-
- label: rx-stomp@1.0.1
12+
- label: rx-stomp@1.1.4
1313
icon: fab fa-fw fa-github
1414
url: https://github.com/stomp-js/rx-stomp
1515

_data/versions/develop.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"stompjs": "6.0.0",
3-
"rx-stomp": "1.0.1",
2+
"stompjs": "6.1.2",
3+
"rx-stomp": "1.1.4",
44
"ng2-stompjs": "8.0.0"
55
}

_data/versions/master.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"stompjs": "6.0.0",
3-
"rx-stomp": "1.0.1",
2+
"stompjs": "6.1.2",
3+
"rx-stomp": "1.1.4",
44
"ng2-stompjs": "8.0.0"
55
}

api-docs/develop/classes/Client.html

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>stompjs@6.0.0, rx-stomp@1.0.1</title>
6+
<title>stompjs@6.1.2, rx-stomp@1.1.4</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -14,7 +14,7 @@
1414
<body>
1515

1616
<div class="navbar navbar-default navbar-fixed-top visible-xs">
17-
<a href="../" class="navbar-brand">stompjs@6.0.0, rx-stomp@1.0.1</a>
17+
<a href="../" class="navbar-brand">stompjs@6.1.2, rx-stomp@1.1.4</a>
1818
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
1919
</div>
2020

@@ -535,7 +535,7 @@ <h3 id="inputs">
535535
</tr>
536536
<tr>
537537
<td class="col-md-4">
538-
<i>Default value : </i><code>10000</code>
538+
<i>Default value : </i><code>0</code>
539539
</td>
540540
</tr>
541541
<tr>
@@ -547,7 +547,7 @@ <h3 id="inputs">
547547
<tr>
548548
<td class="col-md-4">
549549
<div class="io-description"><p>Will retry if Stomp connection is not established in specified milliseconds.
550-
Default 10,000ms, set to 0 to wait for ever.</p>
550+
Default 0, which implies wait for ever.</p>
551551
</div>
552552
</td>
553553
</tr>
@@ -1400,7 +1400,7 @@ <h3 id="methods">
14001400

14011401
<tr>
14021402
<td class="col-md-4">
1403-
<div class="io-line">Defined in <a href="" data-line="758" class="link-to-prism">consolidated/stompjs/src/client.ts:758</a></div>
1403+
<div class="io-line">Defined in <a href="" data-line="767" class="link-to-prism">consolidated/stompjs/src/client.ts:767</a></div>
14041404
</td>
14051405
</tr>
14061406

@@ -1478,7 +1478,7 @@ <h3 id="methods">
14781478

14791479
<tr>
14801480
<td class="col-md-4">
1481-
<div class="io-line">Defined in <a href="" data-line="775" class="link-to-prism">consolidated/stompjs/src/client.ts:775</a></div>
1481+
<div class="io-line">Defined in <a href="" data-line="784" class="link-to-prism">consolidated/stompjs/src/client.ts:784</a></div>
14821482
</td>
14831483
</tr>
14841484

@@ -1635,7 +1635,7 @@ <h3 id="methods">
16351635

16361636
<tr>
16371637
<td class="col-md-4">
1638-
<div class="io-line">Defined in <a href="" data-line="727" class="link-to-prism">consolidated/stompjs/src/client.ts:727</a></div>
1638+
<div class="io-line">Defined in <a href="" data-line="736" class="link-to-prism">consolidated/stompjs/src/client.ts:736</a></div>
16391639
</td>
16401640
</tr>
16411641

@@ -1710,7 +1710,7 @@ <h3 id="methods">
17101710

17111711
<tr>
17121712
<td class="col-md-4">
1713-
<div class="io-line">Defined in <a href="" data-line="743" class="link-to-prism">consolidated/stompjs/src/client.ts:743</a></div>
1713+
<div class="io-line">Defined in <a href="" data-line="752" class="link-to-prism">consolidated/stompjs/src/client.ts:752</a></div>
17141714
</td>
17151715
</tr>
17161716

@@ -1862,7 +1862,7 @@ <h3 id="methods">
18621862

18631863
<tr>
18641864
<td class="col-md-4">
1865-
<div class="io-line">Defined in <a href="" data-line="538" class="link-to-prism">consolidated/stompjs/src/client.ts:538</a></div>
1865+
<div class="io-line">Defined in <a href="" data-line="547" class="link-to-prism">consolidated/stompjs/src/client.ts:547</a></div>
18661866
</td>
18671867
</tr>
18681868

@@ -1908,7 +1908,7 @@ <h3 id="methods">
19081908

19091909
<tr>
19101910
<td class="col-md-4">
1911-
<div class="io-line">Defined in <a href="" data-line="580" class="link-to-prism">consolidated/stompjs/src/client.ts:580</a></div>
1911+
<div class="io-line">Defined in <a href="" data-line="589" class="link-to-prism">consolidated/stompjs/src/client.ts:589</a></div>
19121912
</td>
19131913
</tr>
19141914

@@ -1953,7 +1953,7 @@ <h3 id="methods">
19531953

19541954
<tr>
19551955
<td class="col-md-4">
1956-
<div class="io-line">Defined in <a href="" data-line="796" class="link-to-prism">consolidated/stompjs/src/client.ts:796</a></div>
1956+
<div class="io-line">Defined in <a href="" data-line="805" class="link-to-prism">consolidated/stompjs/src/client.ts:805</a></div>
19571957
</td>
19581958
</tr>
19591959

@@ -2065,7 +2065,7 @@ <h3 id="methods">
20652065

20662066
<tr>
20672067
<td class="col-md-4">
2068-
<div class="io-line">Defined in <a href="" data-line="630" class="link-to-prism">consolidated/stompjs/src/client.ts:630</a></div>
2068+
<div class="io-line">Defined in <a href="" data-line="639" class="link-to-prism">consolidated/stompjs/src/client.ts:639</a></div>
20692069
</td>
20702070
</tr>
20712071

@@ -2163,7 +2163,7 @@ <h3 id="methods">
21632163

21642164
<tr>
21652165
<td class="col-md-4">
2166-
<div class="io-line">Defined in <a href="" data-line="697" class="link-to-prism">consolidated/stompjs/src/client.ts:697</a></div>
2166+
<div class="io-line">Defined in <a href="" data-line="706" class="link-to-prism">consolidated/stompjs/src/client.ts:706</a></div>
21672167
</td>
21682168
</tr>
21692169

@@ -2285,7 +2285,7 @@ <h3 id="methods">
22852285

22862286
<tr>
22872287
<td class="col-md-4">
2288-
<div class="io-line">Defined in <a href="" data-line="717" class="link-to-prism">consolidated/stompjs/src/client.ts:717</a></div>
2288+
<div class="io-line">Defined in <a href="" data-line="726" class="link-to-prism">consolidated/stompjs/src/client.ts:726</a></div>
22892289
</td>
22902290
</tr>
22912291

@@ -2381,7 +2381,7 @@ <h3 id="methods">
23812381

23822382
<tr>
23832383
<td class="col-md-4">
2384-
<div class="io-line">Defined in <a href="" data-line="669" class="link-to-prism">consolidated/stompjs/src/client.ts:669</a></div>
2384+
<div class="io-line">Defined in <a href="" data-line="678" class="link-to-prism">consolidated/stompjs/src/client.ts:678</a></div>
23852385
</td>
23862386
</tr>
23872387

@@ -2772,9 +2772,9 @@ <h3 id="accessors">
27722772

27732773
/**
27742774
* Will retry if Stomp connection is not established in specified milliseconds.
2775-
* Default 10,000ms, set to 0 to wait for ever.
2775+
* Default 0, which implies wait for ever.
27762776
*/
2777-
public connectionTimeout: number &#x3D; 10000;
2777+
public connectionTimeout: number &#x3D; 0;
27782778

27792779
private _connectionWatcher: number; // Timer
27802780

@@ -3079,7 +3079,9 @@ <h3 id="accessors">
30793079
*/
30803080
public activate(): void {
30813081
if (this.state &#x3D;&#x3D;&#x3D; ActivationState.DEACTIVATING) {
3082-
this.debug(&#x27;Still DEACTIVATING, please await call to deactivate before trying to re-activate&#x27;);
3082+
this.debug(
3083+
&#x27;Still DEACTIVATING, please await call to deactivate before trying to re-activate&#x27;
3084+
);
30833085
throw new Error(&#x27;Still DEACTIVATING, can not activate now&#x27;);
30843086
}
30853087

@@ -3110,7 +3112,14 @@ <h3 id="accessors">
31103112

31113113
// setup connection watcher
31123114
if (this.connectionTimeout &gt; 0) {
3115+
// clear first
3116+
if (this._connectionWatcher) {
3117+
clearTimeout(this._connectionWatcher);
3118+
}
31133119
this._connectionWatcher &#x3D; setTimeout(() &#x3D;&gt; {
3120+
if (this.connected) {
3121+
return;
3122+
}
31143123
// Connection not established, close the underlying socket
31153124
// a reconnection will be attempted
31163125
this.debug(

api-docs/develop/classes/CompatClient.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>stompjs@6.0.0, rx-stomp@1.0.1</title>
6+
<title>stompjs@6.1.2, rx-stomp@1.1.4</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -14,7 +14,7 @@
1414
<body>
1515

1616
<div class="navbar navbar-default navbar-fixed-top visible-xs">
17-
<a href="../" class="navbar-brand">stompjs@6.0.0, rx-stomp@1.0.1</a>
17+
<a href="../" class="navbar-brand">stompjs@6.1.2, rx-stomp@1.1.4</a>
1818
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
1919
</div>
2020

@@ -575,7 +575,7 @@ <h3 id="inputs">
575575
</tr>
576576
<tr>
577577
<td class="col-md-4">
578-
<i>Default value : </i><code>10000</code>
578+
<i>Default value : </i><code>0</code>
579579
</td>
580580
</tr>
581581
<tr>
@@ -593,7 +593,7 @@ <h3 id="inputs">
593593
<tr>
594594
<td class="col-md-4">
595595
<div class="io-description"><p>Will retry if Stomp connection is not established in specified milliseconds.
596-
Default 10,000ms, set to 0 to wait for ever.</p>
596+
Default 0, which implies wait for ever.</p>
597597
</div>
598598
</td>
599599
</tr>
@@ -1886,7 +1886,7 @@ <h3 id="methods">
18861886
</tr>
18871887
<tr>
18881888
<td class="col-md-4">
1889-
<div class="io-line">Defined in Client:758</div>
1889+
<div class="io-line">Defined in Client:767</div>
18901890
</td>
18911891
</tr>
18921892

@@ -1970,7 +1970,7 @@ <h3 id="methods">
19701970
</tr>
19711971
<tr>
19721972
<td class="col-md-4">
1973-
<div class="io-line">Defined in Client:775</div>
1973+
<div class="io-line">Defined in Client:784</div>
19741974
</td>
19751975
</tr>
19761976

@@ -2139,7 +2139,7 @@ <h3 id="methods">
21392139
</tr>
21402140
<tr>
21412141
<td class="col-md-4">
2142-
<div class="io-line">Defined in Client:727</div>
2142+
<div class="io-line">Defined in Client:736</div>
21432143
</td>
21442144
</tr>
21452145

@@ -2220,7 +2220,7 @@ <h3 id="methods">
22202220
</tr>
22212221
<tr>
22222222
<td class="col-md-4">
2223-
<div class="io-line">Defined in Client:743</div>
2223+
<div class="io-line">Defined in Client:752</div>
22242224
</td>
22252225
</tr>
22262226

@@ -2384,7 +2384,7 @@ <h3 id="methods">
23842384
</tr>
23852385
<tr>
23862386
<td class="col-md-4">
2387-
<div class="io-line">Defined in Client:538</div>
2387+
<div class="io-line">Defined in Client:547</div>
23882388
</td>
23892389
</tr>
23902390

@@ -2436,7 +2436,7 @@ <h3 id="methods">
24362436
</tr>
24372437
<tr>
24382438
<td class="col-md-4">
2439-
<div class="io-line">Defined in Client:580</div>
2439+
<div class="io-line">Defined in Client:589</div>
24402440
</td>
24412441
</tr>
24422442

@@ -2487,7 +2487,7 @@ <h3 id="methods">
24872487
</tr>
24882488
<tr>
24892489
<td class="col-md-4">
2490-
<div class="io-line">Defined in Client:796</div>
2490+
<div class="io-line">Defined in Client:805</div>
24912491
</td>
24922492
</tr>
24932493

@@ -2605,7 +2605,7 @@ <h3 id="methods">
26052605
</tr>
26062606
<tr>
26072607
<td class="col-md-4">
2608-
<div class="io-line">Defined in Client:630</div>
2608+
<div class="io-line">Defined in Client:639</div>
26092609
</td>
26102610
</tr>
26112611

@@ -2709,7 +2709,7 @@ <h3 id="methods">
27092709
</tr>
27102710
<tr>
27112711
<td class="col-md-4">
2712-
<div class="io-line">Defined in Client:697</div>
2712+
<div class="io-line">Defined in Client:706</div>
27132713
</td>
27142714
</tr>
27152715

@@ -2837,7 +2837,7 @@ <h3 id="methods">
28372837
</tr>
28382838
<tr>
28392839
<td class="col-md-4">
2840-
<div class="io-line">Defined in Client:717</div>
2840+
<div class="io-line">Defined in Client:726</div>
28412841
</td>
28422842
</tr>
28432843

@@ -2939,7 +2939,7 @@ <h3 id="methods">
29392939
</tr>
29402940
<tr>
29412941
<td class="col-md-4">
2942-
<div class="io-line">Defined in Client:669</div>
2942+
<div class="io-line">Defined in Client:678</div>
29432943
</td>
29442944
</tr>
29452945

0 commit comments

Comments
 (0)