From faf1430f66a62e7e761519b676e599ee11cd7b3e Mon Sep 17 00:00:00 2001 From: yekalkan Date: Tue, 21 Nov 2017 09:30:36 +0300 Subject: [PATCH] Upgraded To abp 3.2.4 --- ...panyName.AbpProjectName.Application.csproj | 4 ++-- .../AbpCompanyName.AbpProjectName.Core.csproj | 2 +- ....AbpProjectName.EntityFrameworkCore.csproj | 2 +- .../AbpCompanyName.AbpProjectName.Web.csproj | 4 ++-- .../bower.json | 2 +- .../wwwroot/lib/abp-web-resources/.bower.json | 10 ++++---- .../Abp/Framework/scripts/libs/abp.jquery.js | 13 +++++++++- .../Framework/scripts/libs/abp.sweet-alert.js | 24 ++++++++----------- .../wwwroot/lib/abp-web-resources/bower.json | 2 +- .../lib/abp-web-resources/package.json | 2 +- .../lib/abp-web-resources/packages.config | 2 +- ...AbpCompanyName.AbpProjectName.Tests.csproj | 2 +- ...ompanyName.AbpProjectName.Web.Tests.csproj | 2 +- 13 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj index 002307e..aac2127 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj +++ b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index 3e24210..b2f7d0b 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj index 06637ff..d225238 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj +++ b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj index 36a5754..a778b12 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj +++ b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj @@ -49,8 +49,8 @@ All - - + + diff --git a/src/AbpCompanyName.AbpProjectName.Web/bower.json b/src/AbpCompanyName.AbpProjectName.Web/bower.json index 80d30b9..60dbe3b 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/bower.json +++ b/src/AbpCompanyName.AbpProjectName.Web/bower.json @@ -13,6 +13,6 @@ "jquery-validation": "^1.15.0", "blockUI": "jquery.blockUI#*", "spin.js": "^2.3.2", - "abp-web-resources": "^3.1.0" + "abp-web-resources": "^3.2.2" } } diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json index 1e1baa3..8f8c932 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json @@ -4,7 +4,7 @@ "authors": [ "Halil İbrahim Kalkan" ], - "version": "3.1.0", + "version": "3.2.3", "description": "Script and style resources for ASP.NET Boilerplate based web projects.", "main": "Abp/Framework/scripts/abp.js", "moduleType": [], @@ -25,13 +25,13 @@ ".nuget", "packages" ], - "_release": "3.1.0", + "_release": "3.2.3", "_resolution": { "type": "version", - "tag": "v3.1.0", - "commit": "5aed49096426c5c1424fcc5c2eae6bad8910b69f" + "tag": "v3.2.3", + "commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae" }, "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git", - "_target": "^3.1.0", + "_target": "^3.2.2", "_originalSource": "abp-web-resources" } \ No newline at end of file diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js index 1b74c06..2ff664a 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js @@ -13,6 +13,17 @@ userOptions = userOptions || {}; var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions); + var oldBeforeSendOption = options.beforeSend; + options.beforeSend = function(xhr) { + if (oldBeforeSendOption) { + oldBeforeSendOption(xhr); + } + + xhr.setRequestHeader("Pragma", "no-cache"); + xhr.setRequestHeader("Cache-Control", "no-cache"); + xhr.setRequestHeader("Expires", "Sat, 01 Jan 2000 00:00:00 GMT"); + }; + options.success = undefined; options.error = undefined; @@ -243,4 +254,4 @@ abp.ajax.defaultError404.details = abp.localization.abpWeb('DefaultErrorDetail404'); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js index ad7e653..e4090fb 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js @@ -13,24 +13,21 @@ }, info: { - type: 'info' + icon: 'info' }, success: { - type: 'success' + icon: 'success' }, warn: { - type: 'warning' + icon: 'warning' }, error: { - type: 'error' + icon: 'error' }, confirm: { - type: 'warning', + icon: 'warning', title: 'Are you sure?', - showCancelButton: true, - cancelButtonText: 'Cancel', - confirmButtonColor: "#DD6B55", - confirmButtonText: 'Yes' + buttons: ['Cancel', 'Yes'] } } }; @@ -54,7 +51,7 @@ ); return $.Deferred(function ($dfd) { - sweetAlert(opts, function () { + sweetAlert(opts).then(function () { $dfd.resolve(); }); }); @@ -95,7 +92,7 @@ ); return $.Deferred(function ($dfd) { - sweetAlert(opts, function (isConfirmed) { + sweetAlert(opts).then(function (isConfirmed) { callback && callback(isConfirmed); $dfd.resolve(isConfirmed); }); @@ -104,8 +101,7 @@ abp.event.on('abp.dynamicScriptsInitialized', function () { abp.libs.sweetAlert.config.confirm.title = abp.localization.abpWeb('AreYouSure'); - abp.libs.sweetAlert.config.confirm.cancelButtonText = abp.localization.abpWeb('Cancel'); - abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes'); + abp.libs.sweetAlert.config.confirm.buttons = [abp.localization.abpWeb('Cancel'), abp.localization.abpWeb('Yes')]; }); -})(jQuery); +})(jQuery); \ No newline at end of file diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json index d3b55ee..e3eddbe 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json @@ -4,7 +4,7 @@ "authors": [ "Halil İbrahim Kalkan" ], - "version": "v3.1.0", + "version": "v3.2.3", "description": "Script and style resources for ASP.NET Boilerplate based web projects.", "main": "Abp/Framework/scripts/abp.js", "moduleType": [], diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json index 914797a..d740404 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json @@ -1,6 +1,6 @@ { "name": "abp-web-resources", - "version": "3.1.0", + "version": "3.2.3", "description": "ASP.NET Boilerplate web resources", "main": "Abp/Framework/scripts/abp.js", "dependencies": {}, diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config index d4f1684..7ca31eb 100644 --- a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config +++ b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj index 266749a..adedc10 100644 --- a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj +++ b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj @@ -26,7 +26,7 @@ - + diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj index eda34ce..2fbe1af 100644 --- a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj +++ b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj @@ -26,7 +26,7 @@ - +