Skip to content

[4.0] Fix media field fails in subform #24362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Arpit-24 wants to merge 10 commits into from
Closed

[4.0] Fix media field fails in subform #24362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86115e9
Merge pull request #1 from joomla/4.0-dev
Arpit-24 Mar 23, 2019
5df490b
Fix overlap of editor and options
Arpit-24 Mar 24, 2019
8e99112
Move tinymce change to it own file
Arpit-24 Mar 25, 2019
618b947
Move tinymce change to it own file
Arpit-24 Mar 25, 2019
c64bf2d
Merge branch '4.0-dev' into 4.0-dev
infograf768 Mar 25, 2019
e6d3c7d
Restore original file
Arpit-24 Mar 25, 2019
7deff97
Restore file
Arpit-24 Mar 25, 2019
c3a814c
Fix modal show and hide
Arpit-24 Mar 26, 2019
d3a6a27
Render iframe
Arpit-24 Mar 26, 2019
2ae5ae7
Merge branch '4.0-dev' into 4.0-media-file
Arpit-24 Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/templates/atum/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
// Quickicon specific
.message-alert {
text-align: right !important;
}
}
4 changes: 2 additions & 2 deletions build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
}

show() {
this.querySelector('[role="dialog"]').open();
$('#' + this.querySelector('[role="dialog"]').id).modal('show');

this.querySelector(this.buttonSaveSelected).addEventListener('click', this.onSelected);
}
Expand All @@ -194,7 +194,7 @@
const input = this.querySelector(this.input);
Joomla.getImage(Joomla.selectedFile, input, this);

Joomla.Modal.getCurrent().close();
$('#' + $('.modal.fade.in')[0].getAttribute('id')).modal('hide');
}

setValue(value) {
Expand Down
3 changes: 3 additions & 0 deletions layouts/joomla/modal/body.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

defined('JPATH_BASE') or die;

use Joomla\CMS\Layout\LayoutHelper;

extract($displayData);

/**
Expand Down Expand Up @@ -42,5 +44,6 @@
}
?>
<div class="<?php echo $bodyClass; ?>">
<?php echo LayoutHelper::render('joomla.modal.iframe', $displayData); ?>
<?php echo $body; ?>
</div>