Skip to content

Commit

Permalink
npm packages 4.3.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
erolarkat committed Mar 31, 2021
1 parent 3d97766 commit 4cff57c
Show file tree
Hide file tree
Showing 82 changed files with 5,930 additions and 5,151 deletions.
20 changes: 10 additions & 10 deletions npm/ng-packs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"postinstall": "npm run compile:ivy"
},
"devDependencies": {
"@abp/ng.core": "~4.2.2",
"@abp/ng.feature-management": "~4.2.2",
"@abp/ng.identity": "~4.2.2",
"@abp/ng.permission-management": "~4.2.2",
"@abp/ng.schematics": "~4.2.2",
"@abp/ng.setting-management": "~4.2.2",
"@abp/ng.tenant-management": "~4.2.2",
"@abp/ng.theme.basic": "~4.2.2",
"@abp/ng.theme.shared": "~4.2.2",
"@abp/utils": "^4.2.2",
"@abp/ng.core": "~4.3.0-rc.1",
"@abp/ng.feature-management": "~4.3.0-rc.1",
"@abp/ng.identity": "~4.3.0-rc.1",
"@abp/ng.permission-management": "~4.3.0-rc.1",
"@abp/ng.schematics": "~4.3.0-rc.1",
"@abp/ng.setting-management": "~4.3.0-rc.1",
"@abp/ng.tenant-management": "~4.3.0-rc.1",
"@abp/ng.theme.basic": "~4.3.0-rc.1",
"@abp/ng.theme.shared": "~4.3.0-rc.1",
"@abp/utils": "^4.3.0-rc.1",
"@angular-builders/jest": "^10.0.0",
"@angular-devkit/build-angular": "~0.1101.0",
"@angular-devkit/build-ng-packagr": "~0.1001.2",
Expand Down
18 changes: 9 additions & 9 deletions templates/app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~4.2.2",
"@abp/ng.components": "~4.2.2",
"@abp/ng.core": "~4.2.2",
"@abp/ng.identity": "~4.2.2",
"@abp/ng.setting-management": "~4.2.2",
"@abp/ng.tenant-management": "~4.2.2",
"@abp/ng.theme.basic": "~4.2.2",
"@abp/ng.theme.shared": "~4.2.2",
"@abp/ng.account": "~4.3.0-rc.1",
"@abp/ng.components": "~4.3.0-rc.1",
"@abp/ng.core": "~4.3.0-rc.1",
"@abp/ng.identity": "~4.3.0-rc.1",
"@abp/ng.setting-management": "~4.3.0-rc.1",
"@abp/ng.tenant-management": "~4.3.0-rc.1",
"@abp/ng.theme.basic": "~4.3.0-rc.1",
"@abp/ng.theme.shared": "~4.3.0-rc.1",
"@angular/animations": "~11.1.0",
"@angular/common": "~11.1.0",
"@angular/compiler": "~11.1.0",
Expand All @@ -33,7 +33,7 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@abp/ng.schematics": "~4.2.2",
"@abp/ng.schematics": "~4.3.0-rc.1",
"@angular-devkit/build-angular": "~0.1101.0",
"@angular/cli": "~11.1.0",
"@angular/compiler-cli": "~11.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "^4.2.2",
"@abp/aspnetcore.components.server.basictheme": "^4.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "^4.3.0-rc.1",
"@abp/aspnetcore.components.server.basictheme": "^4.3.0-rc.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,13 @@ var abp = abp || {};
document.cookie = cookieValue;
}

/**
* Escape HTML to help prevent XSS attacks.
*/
abp.utils.htmlEscape = function (html) {
return typeof html === 'string' ? html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') : html;
}

/* SECURITY ***************************************/
abp.security = abp.security || {};
abp.security.antiForgery = abp.security.antiForgery || {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,28 @@ var abp = abp || {};
options.success = undefined;
options.error = undefined;

return $.Deferred(function ($dfd) {
$.ajax(options)
var xhr = null;
var promise = $.Deferred(function ($dfd) {
xhr = $.ajax(options)
.done(function (data, textStatus, jqXHR) {
$dfd.resolve(data);
userOptions.success && userOptions.success(data);
}).fail(function (jqXHR) {
if(jqXHR.status === 0 || jqXHR.statusText === 'abort') {
//ajax request is abort, ignore error handle.
return;
}
if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') {
abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd);
} else {
abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd);
}
});
});
}).promise();

promise['jqXHR'] = xhr;

return promise;
};

$.extend(abp.ajax, {
Expand Down
Loading

0 comments on commit 4cff57c

Please sign in to comment.