Browse Source
Merge pull request #7565 from abpframework/auto-merge/rel-4-2/145
Merge branch dev with rel-4.2
pull/7574/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
7 additions and
2 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js
|
|
|
@ -39,7 +39,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f |
|
|
|
var _$modal = null; |
|
|
|
var _$form = null; |
|
|
|
|
|
|
|
var _modalId = 'Modal_' + (Math.floor((Math.random() * 1000000))) + new Date().getTime(); |
|
|
|
var _modalId = 'Abp_Modal_' + (Math.floor((Math.random() * 1000000))) + new Date().getTime(); |
|
|
|
var _modalObject = null; |
|
|
|
|
|
|
|
var _publicApi = null; |
|
|
|
@ -56,7 +56,12 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f |
|
|
|
function _createContainer() { |
|
|
|
_removeContainer(); |
|
|
|
_$modalContainer = $('<div id="' + _modalId + 'Container' + '"></div>'); |
|
|
|
$('body').prepend(_$modalContainer); |
|
|
|
var existsModals = $('[id^="Abp_Modal_"]'); |
|
|
|
if (existsModals.length) { |
|
|
|
existsModals.last().after(_$modalContainer) |
|
|
|
} else { |
|
|
|
$('body').prepend(_$modalContainer); |
|
|
|
} |
|
|
|
return _$modalContainer; |
|
|
|
} |
|
|
|
|
|
|
|
|
