Skip to content

Commit a201bd0

Browse files
ismcagdasismcagdas
authored
Merge pull request #501 from acjh/patch-28
Update abp-web-resources package
2 parents 66a0dcf + 517baa3 commit a201bd0

35 files changed

+191
-135
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"chart.js": "chartjs#^2.6.0",
2626
"jquery-sparkline": "^2.1.3",
2727
"Flot": "jquery-flot#^0.8.3",
28-
"abp-web-resources": "^4.2.0"
28+
"abp-web-resources": "^5.1.1"
2929
},
3030
"resolutions": {
3131
"jquery": ">=1.6.3"

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "4.2.0",
7+
"version": "5.1.1",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,13 +25,13 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "4.2.0",
28+
"_release": "5.1.1",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v4.2.0",
32-
"commit": "db5593861ad4ffa44587e0be3a1e153735c6e699"
31+
"tag": "v5.1.1",
32+
"commit": "e2e62bc140c54362bd33c8494cc2f1e33b1a2004"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^4.2.0",
35+
"_target": "^5.1.1",
3636
"_originalSource": "abp-web-resources"
3737
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare namespace abp {
1+
declare namespace abp {
22

33
let appPath: string;
44

@@ -465,4 +465,4 @@
465465

466466
}
467467

468-
}
468+
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(function (define) {
1+
(function (define) {
22
define(['jquery'], function ($) {
33
return (function () {
44
var abp = abp || {};
@@ -177,27 +177,27 @@
177177
abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath, abp.domain);
178178
};
179179

180-
abp.auth.getToken = function () {
181-
return abp.utils.getCookieValue(abp.auth.tokenCookieName);
182-
}
180+
abp.auth.getToken = function() {
181+
return abp.utils.getCookieValue(abp.auth.tokenCookieName);
182+
};
183183

184-
abp.auth.clearToken = function () {
185-
abp.auth.setToken();
186-
}
184+
abp.auth.clearToken = function() {
185+
abp.auth.setToken();
186+
};
187187

188188
abp.auth.refreshTokenCookieName = 'Abp.AuthRefreshToken';
189189

190190
abp.auth.setRefreshToken = function (refreshToken, expireDate) {
191-
abp.utils.setCookieValue(abp.auth.refreshTokenCookieName, refreshToken, expireDate, abp.appPath, abp.domain);
191+
abp.utils.setCookieValue(abp.auth.refreshTokenCookieName, refreshToken, expireDate, abp.appPath, abp.domain);
192192
};
193193

194-
abp.auth.getRefreshToken = function () {
195-
return abp.utils.getCookieValue(abp.auth.refreshTokenCookieName);
196-
}
194+
abp.auth.getRefreshToken = function() {
195+
return abp.utils.getCookieValue(abp.auth.refreshTokenCookieName);
196+
};
197197

198-
abp.auth.clearRefreshToken = function () {
199-
abp.auth.setRefreshToken();
200-
}
198+
abp.auth.clearRefreshToken = function() {
199+
abp.auth.setRefreshToken();
200+
};
201201

202202
/* FEATURE SYSTEM *********************************************/
203203
//Implements Features API that simplifies usage of feature scripts generated by Abp.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var abp = abp || {};
1+
var abp = abp || {};
22
(function () {
33

44
if (!$.blockUI) {

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare namespace abp {
1+
declare namespace abp {
22

33
//TODO: Gets JQuery.AjaxOptions and returns JQuery.Promise
44

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(function (define) {
1+
(function (define) {
22
define(['jquery', 'abp-web-resources'], function ($, abp) {
33
return (function () {
44

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var abp = abp || {};
1+
var abp = abp || {};
22
(function () {
33
if (!moment || !moment.tz) {
44
return;

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,33 @@ var abp = abp || {};
99
// Create namespaces
1010
abp.signalr = abp.signalr || {};
1111
abp.signalr.hubs = abp.signalr.hubs || {};
12+
abp.signalr.reconnectTime = abp.signalr.reconnectTime || 5000;
13+
abp.signalr.maxTries = abp.signalr.maxTries || 8;
1214

1315
// Configure the connection for abp.signalr.hubs.common
1416
function configureConnection(connection) {
1517
// Set the common hub
1618
abp.signalr.hubs.common = connection;
1719

20+
let tries = 1;
21+
let reconnectTime = abp.signalr.reconnectTime;
22+
1823
// Reconnect loop
19-
function start() {
20-
connection.start().catch(function () {
21-
setTimeout(function () {
22-
start();
23-
}, 5000);
24-
});
24+
function tryReconnect() {
25+
if (tries > abp.signalr.maxTries) {
26+
return;
27+
} else {
28+
connection.start()
29+
.then(() => {
30+
reconnectTime = abp.signalr.reconnectTime;
31+
tries = 1;
32+
console.log('Reconnected to SignalR server!');
33+
}).catch(() => {
34+
tries += 1;
35+
reconnectTime *= 2;
36+
setTimeout(() => tryReconnect(), reconnectTime);
37+
});
38+
}
2539
}
2640

2741
// Reconnect if hub disconnects
@@ -36,7 +50,7 @@ var abp = abp || {};
3650
return;
3751
}
3852

39-
start();
53+
tryReconnect();
4054
});
4155

4256
// Register to get notifications
@@ -83,6 +97,7 @@ var abp = abp || {};
8397
var connection = new signalR.HubConnectionBuilder()
8498
.withUrl(url, transport)
8599
.build();
100+
86101
if (configureConnection && typeof configureConnection === 'function') {
87102
configureConnection(connection);
88103
}
@@ -110,5 +125,4 @@ var abp = abp || {};
110125
if (abp.signalr.autoConnect && !abp.signalr.hubs.common) {
111126
abp.signalr.connect();
112127
}
113-
114128
})();

0 commit comments

Comments
 (0)