Skip to content

Commit 86b6b3a

Browse files
yekalkanyekalkan
committed
Bower-update
1 parent f2d5cb9 commit 86b6b3a

File tree

12 files changed

+34
-33
lines changed

12 files changed

+34
-33
lines changed

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/bower.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
"jquery-validation": "^1.15.0",
1414
"blockUI": "jquery.blockUI#*",
1515
"spin.js": "^2.3.2",
16-
"abp-web-resources": "^1.2.1"
17-
},
18-
"resolutions": {
19-
"abp-web-resources": "^0.11.1"
16+
"abp-web-resources": "^3.1.0"
2017
}
2118
}

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "1.2.1",
7+
"version": "3.1.0",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,14 +25,13 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "1.2.1",
28+
"_release": "3.1.0",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v1.2.1",
32-
"commit": "97439f0677644983851a77560d79627fb3453a55"
31+
"tag": "v3.1.0",
32+
"commit": "5aed49096426c5c1424fcc5c2eae6bad8910b69f"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^1.2.1",
36-
"_originalSource": "abp-web-resources",
37-
"_direct": true
35+
"_target": "^3.1.0",
36+
"_originalSource": "abp-web-resources"
3837
}

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454

5555
isDefault: boolean;
5656

57+
isDisabled: boolean;
58+
5759
}
5860

5961
interface ILocalizationSource {

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
//Current application root path (including virtual directory if exists).
77
abp.appPath = abp.appPath || '/';
8-
98
abp.pageLoadTime = new Date();
109

1110
//Converts given path to absolute path using abp.appPath variable.
@@ -36,7 +35,8 @@
3635
abp.multiTenancy.tenantIdCookieName,
3736
tenantId.toString(),
3837
new Date(new Date().getTime() + 5 * 365 * 86400000), //5 years
39-
abp.appPath
38+
abp.appPath,
39+
abp.domain
4040
);
4141
} else {
4242
abp.utils.deleteCookie(abp.multiTenancy.tenantIdCookieName, abp.appPath);
@@ -170,7 +170,7 @@
170170
abp.auth.tokenCookieName = 'Abp.AuthToken';
171171

172172
abp.auth.setToken = function (authToken, expireDate) {
173-
abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath);
173+
abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath, abp.domain);
174174
};
175175

176176
abp.auth.getToken = function () {
@@ -707,7 +707,7 @@
707707
* @param {Date} expireDate (optional). If not specified the cookie will expire at the end of session.
708708
* @param {string} path (optional)
709709
*/
710-
abp.utils.setCookieValue = function (key, value, expireDate, path) {
710+
abp.utils.setCookieValue = function (key, value, expireDate, path, domain) {
711711
var cookieValue = encodeURIComponent(key) + '=';
712712

713713
if (value) {
@@ -722,6 +722,10 @@
722722
cookieValue = cookieValue + "; path=" + path;
723723
}
724724

725+
if (domain) {
726+
cookieValue = cookieValue + "; domain=" + domain;
727+
}
728+
725729
document.cookie = cookieValue;
726730
};
727731

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
abp.ajax = function (userOptions) {
1313
userOptions = userOptions || {};
1414

15-
var options = $.extend({}, abp.ajax.defaultOpts, userOptions);
15+
var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
1616
options.success = undefined;
1717
options.error = undefined;
1818

@@ -39,7 +39,10 @@
3939
defaultOpts: {
4040
dataType: 'json',
4141
type: 'POST',
42-
contentType: 'application/json'
42+
contentType: 'application/json',
43+
headers: {
44+
'X-Requested-With': 'XMLHttpRequest'
45+
}
4346
},
4447

4548
defaultError: {

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
let autoConnect: boolean;
66

7-
function connect();
7+
function connect(): any;
88

99
namespace hubs {
1010

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
var opts = $.extend(
4747
{},
48-
abp.libs.sweetAlert.config.default,
48+
abp.libs.sweetAlert.config['default'],
4949
abp.libs.sweetAlert.config[type],
5050
{
5151
title: title,
@@ -89,7 +89,7 @@
8989

9090
var opts = $.extend(
9191
{},
92-
abp.libs.sweetAlert.config.default,
92+
abp.libs.sweetAlert.config['default'],
9393
abp.libs.sweetAlert.config.confirm,
9494
userOpts
9595
);
@@ -108,4 +108,4 @@
108108
abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
109109
});
110110

111-
})(jQuery);
111+
})(jQuery);

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/angularjs/abp.ng.js

+1-9
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
return {
126126

127127
'request': function (config) {
128-
if (endsWith(config.url, '.cshtml')) {
128+
if (config.url.indexOf('.cshtml') !== -1) {
129129
config.url = abp.appPath + 'AbpAppView/Load?viewUrl=' + config.url + '&_t=' + abp.pageLoadTime.getTime();
130130
}
131131

@@ -160,14 +160,6 @@
160160
}
161161
]);
162162

163-
function endsWith(str, suffix) {
164-
if (suffix.length > str.length) {
165-
return false;
166-
}
167-
168-
return str.indexOf(suffix, str.length - suffix.length) !== -1;
169-
}
170-
171163
abp.event.on('abp.dynamicScriptsInitialized', function () {
172164
abp.ng.http.defaultError.message = abp.localization.abpWeb('DefaultError');
173165
abp.ng.http.defaultError.details = abp.localization.abpWeb('DefaultErrorDetail');

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ bower:
1212
```bash
1313
bower install abp-web-resources --save
1414
```
15+
16+
## Contribution
17+
18+
Please send PRs to https://github.com/aspnetboilerplate/aspnetboilerplate repository since this is a copy of this folder: https://github.com/aspnetboilerplate/aspnetboilerplate/tree/dev/src/Abp.Web.Resources/Abp/Framework

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "v1.2.1",
7+
"version": "v3.1.0",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "abp-web-resources",
3-
"version": "1.2.1",
3+
"version": "3.1.0",
44
"description": "ASP.NET Boilerplate web resources",
55
"main": "Abp/Framework/scripts/abp.js",
66
"dependencies": {},

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp.Web.Resources" version="1.2.0.0" targetFramework="net452" />
3+
<package id="Abp.Web.Resources" version="3.1.0" targetFramework="net461" />
44
</packages>

0 commit comments

Comments
 (0)