Skip to content

Commit

Permalink
Update mediaelement.js to v4.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@C-Lodder
C-Lodder committed May 24, 2017
1 parent a31500a commit 76e2ee2
Show file tree
Hide file tree
Showing 38 changed files with 21,003 additions and 12,824 deletions.
118 changes: 60 additions & 58 deletions administrator/components/com_media/views/media/tmpl/default.php
View file
Expand Up @@ -25,7 +25,7 @@

JFactory::getDocument()->addScriptDeclaration(
"
var basepath = '" . $base . "';
var basepath = '" . $base . "';
var viewstyle = '" . $style . "';
"
);
Expand Down Expand Up @@ -56,69 +56,71 @@
</div>
</div>

<div id="j-main-container" class="j-main-container" class="col-md-10">
<?php echo $this->loadTemplate('navigation'); ?>
<?php if (($user->authorise('core.create', 'com_media')) and $this->require_ftp) : ?>
<form action="index.php?option=com_media&amp;task=ftpValidate" name="ftpForm" id="ftpForm" method="post">
<fieldset title="<?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?>">
<legend><?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?></legend>
<?php echo JText::_('COM_MEDIA_DESCFTP'); ?>
<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<input type="text" id="username" name="username" size="70" value="">
<div class="col-md-10">
<div id="j-main-container" class="j-main-container">
<?php echo $this->loadTemplate('navigation'); ?>
<?php if (($user->authorise('core.create', 'com_media')) and $this->require_ftp) : ?>
<form action="index.php?option=com_media&amp;task=ftpValidate" name="ftpForm" id="ftpForm" method="post">
<fieldset title="<?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?>">
<legend><?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?></legend>
<?php echo JText::_('COM_MEDIA_DESCFTP'); ?>
<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
<input type="text" id="username" name="username" size="70" value="">

<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<input type="password" id="password" name="password" size="70" value="">
</fieldset>
<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
<input type="password" id="password" name="password" size="70" value="">
</fieldset>
</form>
<?php endif; ?>

<form action="index.php?option=com_media" name="adminForm" id="mediamanager-form" method="post" enctype="multipart/form-data">
<input type="hidden" name="task" value="">
<input type="hidden" name="cb1" id="cb1" value="0">
<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->state->folder; ?>">
</form>
<?php endif; ?>

<form action="index.php?option=com_media" name="adminForm" id="mediamanager-form" method="post" enctype="multipart/form-data">
<input type="hidden" name="task" value="">
<input type="hidden" name="cb1" id="cb1" value="0">
<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->state->folder; ?>">
</form>
<?php if ($user->authorise('core.create', 'com_media')) : ?>
<!-- File Upload Form -->
<div id="collapseUpload" class="collapse">
<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;format=html" id="uploadForm" class="form-inline" name="uploadForm" method="post" enctype="multipart/form-data">
<div id="uploadform">
<fieldset id="upload-noflash" class="actions">
<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
<input required type="file" id="upload-file" name="Filedata[]" multiple>
<button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
<p class="help-block">
<?php $cMax = (int) $this->config->get('upload_maxsize'); ?>
<?php $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); ?>
<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); ?>
</p>
</fieldset>
<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->state->folder; ?>">
<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media'); ?>
</div>
</form>
</div>
<div id="collapseFolder" class="collapse">
<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" class="form-inline" method="post">
<div class="path">
<input type="text" id="folderpath" readonly="readonly" class="form-control update-folder">
<input required type="text" class="form-control" id="foldername" name="foldername">
<input class="form-control update-folder" type="hidden" name="folderbase" id="folderbase" value="<?php echo $this->state->folder; ?>">
<button type="submit" class="btn btn-secondary"><span class="icon-folder-open"></span> <?php echo JText::_('COM_MEDIA_CREATE_FOLDER'); ?></button>
</div>
<?php echo JHtml::_('form.token'); ?>
</form>
</div>
<?php endif; ?>

<?php if ($user->authorise('core.create', 'com_media')) : ?>
<!-- File Upload Form -->
<div id="collapseUpload" class="collapse">
<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;format=html" id="uploadForm" class="form-inline" name="uploadForm" method="post" enctype="multipart/form-data">
<div id="uploadform">
<fieldset id="upload-noflash" class="actions">
<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
<input required type="file" id="upload-file" name="Filedata[]" multiple>
<button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
<p class="help-block">
<?php $cMax = (int) $this->config->get('upload_maxsize'); ?>
<?php $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); ?>
<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); ?>
</p>
</fieldset>
<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->state->folder; ?>">
<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media'); ?>
<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" method="post">
<div id="folderview">
<div class="view">
<iframe class="thumbnail" src="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder; ?>" id="folderframe" name="folderframe" width="100%" height="500px"marginwidth="0" marginheight="0" scrolling="auto"></iframe>
</div>
<?php echo JHtml::_('form.token'); ?>
</div>
</form>
</div>
<div id="collapseFolder" class="collapse">
<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" class="form-inline" method="post">
<div class="path">
<input type="text" id="folderpath" readonly="readonly" class="form-control update-folder">
<input required type="text" class="form-control" id="foldername" name="foldername">
<input class="form-control update-folder" type="hidden" name="folderbase" id="folderbase" value="<?php echo $this->state->folder; ?>">
<button type="submit" class="btn btn-secondary"><span class="icon-folder-open"></span> <?php echo JText::_('COM_MEDIA_CREATE_FOLDER'); ?></button>
</div>
<?php echo JHtml::_('form.token'); ?>
</form>
</div>
<?php endif; ?>

<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" method="post">
<div id="folderview">
<div class="view">
<iframe class="thumbnail" src="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder; ?>" id="folderframe" name="folderframe" width="100%" height="500px"marginwidth="0" marginheight="0" scrolling="auto"></iframe>
</div>
<?php echo JHtml::_('form.token'); ?>
</div>
</form>
</div>
<?php // Pre render all the bootstrap modals on the parent window

Expand All @@ -130,7 +132,7 @@
'footer' => '<a type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
),
'<div id="image" style="text-align:center;"><img id="imagePreviewSrc" src="../media/jui/img/alpha.png" alt="preview" style="max-width:100%; max-height:300px;"></div>'
'<div id="image" class="text-center"><img id="imagePreviewSrc" src="../media/jui/img/alpha.png" alt="preview" style="max-width:100%; max-height:300px;"></div>'
);

echo JHtml::_(
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/media/tmpl/default_folders.php
View file
Expand Up @@ -13,7 +13,7 @@
$ulTarget = str_replace('/', '-', $this->folders['data']->relative);

?>
<ul class="nav nav-list" id="collapseFolder-<?php echo $ulTarget; ?>">
<ul class="nav flex-column" id="collapseFolder-<?php echo $ulTarget; ?>">
<?php if (isset($this->folders['children'])) :
foreach ($this->folders['children'] as $folder) :
// Get a sanitised name for the target
Expand Down
2 changes: 1 addition & 1 deletion grunt-settings.yaml
View file
Expand Up @@ -26,7 +26,7 @@ vendors:
'version': '1.12.1'
'dependencies': 'jquery'
'mediaelement':
'version': '2.23.4'
'version': '4.1.1'
'dependencies': 'jquery'
'punycode':
'version': '1.4.1'
Expand Down
Binary file removed media/vendor/mediaelement/css/background.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/bigplay.fw.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/bigplay.png
View file
Binary file not shown.
14 changes: 0 additions & 14 deletions media/vendor/mediaelement/css/bigplay.svg
View file

This file was deleted.

Binary file removed media/vendor/mediaelement/css/controls-ted.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/controls-wmp-bg.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/controls-wmp.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/controls.fw.png
View file
Binary file not shown.
Binary file removed media/vendor/mediaelement/css/controls.png
View file
Binary file not shown.

0 comments on commit 76e2ee2

Please sign in to comment.