mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Prevent e-modal conflict with other modals. (also supports data-modal-target attribute)

Browse Source
This commit is contained in:
Cameron
2020-03-26 15:30:09 -07:00
parent f4b4ba61d5
commit 3173c9c173
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/form_handler.php
View File

@@ -4308,6 +4308,7 @@ var_dump($select_options);*/
$cnt = 0; $cnt = 0;
$text = ''; $text = '';
foreach ($fieldarray as $field => $data) foreach ($fieldarray as $field => $data)
{ {
@@ -4323,11 +4324,11 @@ var_dump($select_options);*/
*/ */
//Not found //Not found
if((!varset($data['forced']) && !in_array($field, $currentlist)) || varset($data['nolist'])) if((empty($data['forced']) && !in_array($field, $currentlist)) || !empty($data['nolist']))
{ {
continue; continue;
} }
elseif(vartrue($data['type']) != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL) elseif(vartrue($data['type']) != 'method' && empty($data['forced']) && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== null)
{ {
$text .= " $text .= "
<td> <td>

13
e107_web/js/core/admin.jquery.js
View File

@@ -30,16 +30,21 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
var url = $this.attr('href'); var url = $this.attr('href');
var caption = $this.attr('data-modal-caption'); var caption = $this.attr('data-modal-caption');
var height = ($(window).height() * 0.7) - 120; var height = ($(window).height() * 0.7) - 120;
var target = $this.attr('data-modal-target');
if(caption === undefined) if(caption === undefined)
{ {
caption = ''; caption = '';
} }
$('.modal-body').html('<div class="well"><iframe id="e-modal-iframe" width="100%" height="' + height + 'px" frameborder="0" scrolling="auto" style="display:block;background-color:transparent" allowtransparency="true" src="' + url + '"></iframe></div>'); if(target === undefined)
$('.modal-caption').html(caption + ' <i id="e-modal-loading" class="fa fa-spin fa-spinner"></i>'); {
$('.modal').modal('show'); target = '#uiModal';
}
$(target+' .modal-body').html('<div class="well"><iframe id="e-modal-iframe" width="100%" height="' + height + 'px" frameborder="0" scrolling="auto" style="display:block;background-color:transparent" allowtransparency="true" src="' + url + '"></iframe></div>');
$(target+' .modal-caption').html(caption + ' <i id="e-modal-loading" class="fa fa-spin fa-spinner"></i>');
$(target+'.modal').modal('show');
$("#e-modal-iframe").on("load", function () $("#e-modal-iframe").on("load", function ()
{ {