Skip to content

Commit 6de250f

Browse files
authored
Merge pull request #23 from aspnetboilerplate/pr/5306
updated from Abp.Web.Resources v5.2
2 parents 2babd20 + 7bdd589 commit 6de250f

25 files changed

+35
-30
lines changed

Abp/Framework/scripts/abp.d.ts

Lines changed: 4 additions & 4 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

@@ -82,7 +82,7 @@ declare namespace abp {
8282

8383
function localize(key: string, sourceName: string): string;
8484

85-
function getSource(sourceName: string): (key: string) => string;
85+
function getSource(sourceName: string): (...key: string[]) => string;
8686

8787
function isCurrentCulture(name: string): boolean;
8888
}
@@ -215,7 +215,7 @@ declare namespace abp {
215215
READ
216216
}
217217

218-
//TODO: We can extend this interface to define built-in notification types, like ILocalizableMessageNotificationData
218+
//TODO: We can extend this interface to define built-in notification types, like ILocalizableMessageNotificationData
219219
interface INotificationData {
220220

221221
type: string;
@@ -372,7 +372,7 @@ declare namespace abp {
372372
* This is a simple implementation created to be used by ABP.
373373
* Please use a complete cookie library if you need.
374374
* @param {string} key
375-
* @param {string} value
375+
* @param {string} value
376376
* @param {Date} expireDate (optional). If not specified the cookie will expire at the end of session.
377377
* @param {string} path (optional)
378378
*/

Abp/Framework/scripts/abp.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
(function (define) {
1+
(function (define) {
22
define(['jquery'], function ($) {
33
return (function () {
4-
var abp = abp || {};
4+
var abp = window.abp || {};
55

66
/* Application paths *****************************************/
77

@@ -942,4 +942,4 @@
942942
} else {
943943
window.abp = factory(window.jQuery);
944944
}
945-
}));
945+
}));

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) {

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

Abp/Framework/scripts/libs/abp.jquery.js

Lines changed: 3 additions & 3 deletions
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

@@ -19,9 +19,9 @@
1919

2020
var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
2121
var oldBeforeSendOption = options.beforeSend;
22-
options.beforeSend = function (xhr) {
22+
options.beforeSend = function (xhr, settings) {
2323
if (oldBeforeSendOption) {
24-
oldBeforeSendOption(xhr);
24+
oldBeforeSendOption(xhr, settings);
2525
}
2626

2727
xhr.setRequestHeader("Pragma", "no-cache");

Abp/Framework/scripts/libs/abp.jquery.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.

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;

Abp/Framework/scripts/libs/abp.signalr-client.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ var abp = abp || {};
1111
abp.signalr.hubs = abp.signalr.hubs || {};
1212
abp.signalr.reconnectTime = abp.signalr.reconnectTime || 5000;
1313
abp.signalr.maxTries = abp.signalr.maxTries || 8;
14+
abp.signalr.increaseReconnectTime = abp.signalr.increaseReconnectTime || function (time) {
15+
return time * 2;
16+
};
1417

1518
// Configure the connection for abp.signalr.hubs.common
1619
function configureConnection(connection) {
@@ -32,7 +35,7 @@ var abp = abp || {};
3235
console.log('Reconnected to SignalR server!');
3336
}).catch(() => {
3437
tries += 1;
35-
reconnectTime *= 2;
38+
reconnectTime = abp.signalr.increaseReconnectTime(reconnectTime);
3639
setTimeout(() => tryReconnect(), reconnectTime);
3740
});
3841
}

Abp/Framework/scripts/libs/abp.signalr-client.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.

Abp/Framework/scripts/libs/abp.signalr.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
namespace signalr {
44

0 commit comments

Comments
 (0)