Skip to content

Commit 17e3086

Browse files
ismcagdasismcagdas
committed
resolved #149
1 parent a175882 commit 17e3086

File tree

99 files changed

+435
-8620
lines changed

Some content is hidden

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

99 files changed

+435
-8620
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<link href="~/fonts/material-icons/materialicons.css" rel="stylesheet" asp-append-version="true" />
3030
<link href="~/lib/bootstrap/dist/css/bootstrap.css" rel="stylesheet" asp-append-version="true" />
3131
<link href="~/lib/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
32-
<link href="~/lib/sweetalert/dist/sweetalert.css" rel="stylesheet" asp-append-version="true" />
3332
<link href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css" rel="stylesheet" asp-append-version="true" />
3433
<link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" asp-append-version="true" />
3534
<link href="~/lib/Waves/dist/waves.css" rel="stylesheet" asp-append-version="true" />
@@ -86,7 +85,7 @@
8685
<script src="~/lib/jquery-validation/dist/jquery.validate.js" asp-append-version="true"></script>
8786
<script src="~/lib/blockUI/jquery.blockUI.js" asp-append-version="true"></script>
8887
<script src="~/lib/toastr/toastr.js" asp-append-version="true"></script>
89-
<script src="~/lib/sweetalert/dist/sweetalert-dev.js" asp-append-version="true"></script>
88+
<script src="~/lib/sweetalert/dist/sweetalert.min.js" asp-append-version="true"></script>
9089
<script src="~/lib/spin.js/spin.js" asp-append-version="true"></script>
9190
<script src="~/lib/spin.js/jquery.spin.js" asp-append-version="true"></script>
9291
<script src="~/lib/Waves/dist/waves.js" asp-append-version="true"></script>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<link href="~/lib/bootstrap/dist/css/bootstrap.css" rel="stylesheet" asp-append-version="true" />
4343
<link href="~/lib/bootstrap-select/dist/css/bootstrap-select.css" rel="stylesheet" asp-append-version="true" />
4444
<link href="~/lib/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
45-
<link href="~/lib/sweetalert/dist/sweetalert.css" rel="stylesheet" asp-append-version="true" />
4645
<link href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css" rel="stylesheet" asp-append-version="true" />
4746
<link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" asp-append-version="true" />
4847
<link href="~/lib/Waves/dist/waves.css" rel="stylesheet" asp-append-version="true" />
@@ -158,7 +157,7 @@
158157
<script src="~/lib/jquery-validation/dist/jquery.validate.js" asp-append-version="true"></script>
159158
<script src="~/lib/blockUI/jquery.blockUI.js" asp-append-version="true"></script>
160159
<script src="~/lib/toastr/toastr.js" asp-append-version="true"></script>
161-
<script src="~/lib/sweetalert/dist/sweetalert-dev.js" asp-append-version="true"></script>
160+
<script src="~/lib/sweetalert/dist/sweetalert.min.js" asp-append-version="true"></script>
162161
<script src="~/lib/spin.js/spin.js" asp-append-version="true"></script>
163162
<script src="~/lib/spin.js/jquery.spin.js" asp-append-version="true"></script>
164163
<script src="~/lib/bootstrap-select/dist/js/bootstrap-select.js" asp-append-version="true"></script>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"bootstrap": "3.3.6",
66
"jquery": "2.2.0",
77
"toastr": "^2.1.2",
8-
"sweetalert": "^1.1.3",
98
"famfamfam-flags": "^1.0.0",
109
"font-awesome": "^4.7.0",
1110
"json2": "*",

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"wwwroot/fonts/material-icons/materialicons.css",
77
"wwwroot/lib/bootstrap/dist/css/bootstrap.css",
88
"wwwroot/lib/toastr/toastr.css",
9-
"wwwroot/lib/sweetalert/dist/sweetalert.css",
109
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
1110
"wwwroot/lib/font-awesome/css/font-awesome.css",
1211
"wwwroot/lib/Waves/dist/waves.css",
@@ -26,7 +25,7 @@
2625
"wwwroot/lib/jquery-validation/dist/jquery.validate.js",
2726
"wwwroot/lib/blockUI/jquery.blockUI.js",
2827
"wwwroot/lib/toastr/toastr.js",
29-
"wwwroot/lib/sweetalert/dist/sweetalert-dev.js",
28+
"wwwroot/lib/sweetalert/dist/sweetalert.min.js",
3029
"wwwroot/lib/spin.js/spin.js",
3130
"wwwroot/lib/spin.js/jquery.spin.js",
3231
"wwwroot/lib/Waves/dist/waves.js",
@@ -48,7 +47,6 @@
4847
"wwwroot/lib/bootstrap/dist/css/bootstrap.css",
4948
"wwwroot/lib/bootstrap-select/dist/css/bootstrap-select.css",
5049
"wwwroot/lib/toastr/toastr.css",
51-
"wwwroot/lib/sweetalert/dist/sweetalert.css",
5250
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
5351
"wwwroot/lib/font-awesome/css/font-awesome.css",
5452
"wwwroot/lib/Waves/dist/waves.css",
@@ -69,7 +67,7 @@
6967
"wwwroot/lib/jquery-validation/dist/jquery.validate.js",
7068
"wwwroot/lib/blockUI/jquery.blockUI.js",
7169
"wwwroot/lib/toastr/toastr.js",
72-
"wwwroot/lib/sweetalert/dist/sweetalert-dev.js",
70+
"wwwroot/lib/sweetalert/dist/sweetalert.min.js",
7371
"wwwroot/lib/spin.js/spin.js",
7472
"wwwroot/lib/spin.js/jquery.spin.js",
7573
"wwwroot/lib/bootstrap-select/dist/js/bootstrap-select.js",

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/style.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8026,3 +8026,6 @@ html.ie11 .dropdown-menu ul.menu li a {
80268026
html.ie11 .bs-searchbox .form-control {
80278027
width: 90%; }
80288028

8029+
.swal-footer {
8030+
text-align: center;
8031+
}

‎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": "2.2.1",
7+
"version": "3.2.3",
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": "2.2.1",
28+
"_release": "3.2.3",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v2.2.1",
32-
"commit": "31ec5d18b18d0d61073c05813af93604562fd9a4"
31+
"tag": "v3.2.3",
32+
"commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^2.2.1",
35+
"_target": "^3.1.0",
3636
"_originalSource": "abp-web-resources"
3737
}

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

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

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@
1313
userOptions = userOptions || {};
1414

1515
var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
16+
var oldBeforeSendOption = options.beforeSend;
17+
options.beforeSend = function(xhr) {
18+
if (oldBeforeSendOption) {
19+
oldBeforeSendOption(xhr);
20+
}
21+
22+
xhr.setRequestHeader("Pragma", "no-cache");
23+
xhr.setRequestHeader("Cache-Control", "no-cache");
24+
xhr.setRequestHeader("Expires", "Sat, 01 Jan 2000 00:00:00 GMT");
25+
};
26+
1627
options.success = undefined;
1728
options.error = undefined;
1829

@@ -243,4 +254,4 @@
243254
abp.ajax.defaultError404.details = abp.localization.abpWeb('DefaultErrorDetail404');
244255
});
245256

246-
})(jQuery);
257+
})(jQuery);

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,21 @@
1313

1414
},
1515
info: {
16-
type: 'info'
16+
icon: 'info'
1717
},
1818
success: {
19-
type: 'success'
19+
icon: 'success'
2020
},
2121
warn: {
22-
type: 'warning'
22+
icon: 'warning'
2323
},
2424
error: {
25-
type: 'error'
25+
icon: 'error'
2626
},
2727
confirm: {
28-
type: 'warning',
28+
icon: 'warning',
2929
title: 'Are you sure?',
30-
showCancelButton: true,
31-
cancelButtonText: 'Cancel',
32-
confirmButtonColor: "#DD6B55",
33-
confirmButtonText: 'Yes'
30+
buttons: ['Cancel', 'Yes']
3431
}
3532
}
3633
};
@@ -54,7 +51,7 @@
5451
);
5552

5653
return $.Deferred(function ($dfd) {
57-
sweetAlert(opts, function () {
54+
sweetAlert(opts).then(function () {
5855
$dfd.resolve();
5956
});
6057
});
@@ -95,7 +92,7 @@
9592
);
9693

9794
return $.Deferred(function ($dfd) {
98-
sweetAlert(opts, function (isConfirmed) {
95+
sweetAlert(opts).then(function (isConfirmed) {
9996
callback && callback(isConfirmed);
10097
$dfd.resolve(isConfirmed);
10198
});
@@ -104,8 +101,7 @@
104101

105102
abp.event.on('abp.dynamicScriptsInitialized', function () {
106103
abp.libs.sweetAlert.config.confirm.title = abp.localization.abpWeb('AreYouSure');
107-
abp.libs.sweetAlert.config.confirm.cancelButtonText = abp.localization.abpWeb('Cancel');
108-
abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
104+
abp.libs.sweetAlert.config.confirm.buttons = [abp.localization.abpWeb('Cancel'), abp.localization.abpWeb('Yes')];
109105
});
110106

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

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

Lines changed: 1 addition & 9 deletions
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');

0 commit comments

Comments
 (0)